fix(updater): Stop expiring secret prematurely #49578
Open
+102
−23
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joshtrichards
force-pushed
the
fix-updater-secret
branch
2 times, most recently
from
9e53b31
to
232970e
Compare
|
/backport to stable30 |
|
/backport to stable29 |
joshtrichards
force-pushed
the
fix-updater-secret
branch
8 times, most recently
from
6ee7f8c
to
b77688a
Compare
Signed-off-by: Josh Richards <[email protected]>
joshtrichards
force-pushed
the
fix-updater-secret
branch
from
b77688a
to
3785f09
Compare
nickvergessen
requested changes
Dec 1, 2024
| } | ||
|
|
||
| /** | ||
| * @param $argument | ||
| */ | ||
| protected function run($argument) { | ||
| if ($this->config->getSystemValueBool('config_is_read_only')) { | ||
| $this->logger->debug('Skipping `updater.secret` reset since config_is_read_only is set', ['app' => 'updatenotification']); | ||
| return; | ||
| } | ||
|
|
||
| $secretCreated = $this->appConfig->getValueInt('core', 'updater.secret.created', $this->time->getTime()); |
There was a problem hiding this comment.
Suggested change
| $secretCreated = $this->appConfig->getValueInt('core', 'updater.secret.created', $this->time->getTime()); | |
| $secretCreated = $this->appConfig->getValueInt('core', 'updater.secret.created'); | |
| if ($secretCreated === 0) { | |
| ... |
Should handle the "does not even exist" case.
Or should we even always try the delete of the updater.secret, when the timestamp is missing?
| return; | ||
| } | ||
|
|
||
| $secretCreated = $this->appConfig->getValueInt('core', 'updater.secret.created', $this->time->getTime()); | ||
| // Delete old tokens after 2 days | ||
| if ($secretCreated >= 172800) { |
|
|
||
| static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]); | ||
| $this->invokePrivate($this->resetTokenBackgroundJob, 'run', [null]); |
There was a problem hiding this comment.
Suggested change
| $this->invokePrivate($this->resetTokenBackgroundJob, 'run', [null]); | |
| static::invokePrivate($this->resetTokenBackgroundJob, 'run', [null]); |
Static is the correct/new stuff. $this->invokePrivate actually generates a warning in IDEs?
Ref ffb3a3e
| ); | ||
| } | ||
|
|
||
| public function testRunWithNotExpiredToken(): void { | ||
| public function testRunWithNotExpiredToken(): void { // Affirm if updater.secret.created <48 hours ago then `updater.secret` is left alone |
There was a problem hiding this comment.
Make the comment part of the function name, so the failing test explains it right away without diving into test code,
Otherwise at least make it a proper doc block above the test case
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
updater.secretcreation and expiration #45714Summary
#43967 introduced a regression in the handling of the expiration of
updater.secret. The result is thatupdater.secretis expired at the next job interval (~10 minutes). If the web Updater takes >10 minutes this prevents it from continuing.updater.secret.createdvalue when we expire a secretconfig_is_read_onlyin theAdminControllerResetTokenbackground job unit tests to catch the scenario addressed by this PRResetTokenbackground job unit test coverage in generalAdminControllerunit test coverage in generalTODO
staticused in theResetTokentest since it didn't seem to serve a purpose but I may have broken it so may require another look)Checklist