Skip to content

Make sure ResetTokenBackgroundJob doesn't execute if config is read-only #32584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kesselb merged 3 commits into from
Jun 15, 2022
Merged

Make sure ResetTokenBackgroundJob doesn't execute if config is read-only #32584

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47ea43e
Make sure ResetTokenBackgroundJob doesn't execute if config is read-only
tcitworld May 25, 2022
56727ba
Use OCP version of TimedJob instead of OC for ResetTokenBackgroundJob
tcitworld May 25, 2022
956d895
Update tests after ResetTokenBackgroundJob changes
tcitworld May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make sure ResetTokenBackgroundJob doesn't execute if config is read-only 
No need to try to delete the config key in config.php if we aren't
allowed to.

Signed-off-by: Thomas Citharel <[email protected]>
  • Loading branch information
@tcitworld
tcitworld committed Jun 15, 2022
commit 47ea43ea49e63129c0a731d8ac29e38920eda6ac
2 changes: 1 addition & 1 deletion apps/updatenotification/lib/ResetTokenBackgroundJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function __construct(IConfig $config,
*/
protected function run($argument) {
// Delete old tokens after 2 days
if ($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) {
if ($this->config->getSystemValueBool('config_is_read_only') === false && $this->timeFactory->getTime() - (int) $this->config->getAppValue('core', 'updater.secret.created', (string) $this->timeFactory->getTime()) >= 172800) {
$this->config->deleteSystemValue('updater.secret');
}
}
Expand Down