Skip to content

[stable30] fix: Use sha256 to hash arguments of background jobs #47778

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
blizzz merged 2 commits into from
Sep 5, 2024
Merged

[stable30] fix: Use sha256 to hash arguments of background jobs #47778

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94d307c
fix: Use sha256 to hash arguments of background jobs
artonge Aug 28, 2024
14a2eff
fix: Migrate existing bg jobs to use sha256
artonge Aug 28, 2024
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
fix: Use sha256 to hash arguments of background jobs 
This is to prevent collision as we are sometime hashing user input, yet using that hash to target the background job in the database.

Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge @backportbot
artonge authored and backportbot[bot] committed Sep 5, 2024
commit 94d307c3312a1b149f9c85f941ec54a2d4129ddb
9 changes: 4 additions & 5 deletions lib/private/BackgroundJob/JobList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
use Psr\Log\LoggerInterface;
use function get_class;
use function json_encode;
use function md5;
use function strlen;

class JobList implements IJobList {
Expand Down Expand Up @@ -50,7 +49,7 @@ public function add($job, $argument = null, ?int $firstCheck = null): void {
->values([
'class' => $query->createNamedParameter($class),
'argument' => $query->createNamedParameter($argumentJson),
'argument_hash' => $query->createNamedParameter(md5($argumentJson)),
'argument_hash' => $query->createNamedParameter(hash('sha256', $argumentJson)),
'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT),
'last_checked' => $query->createNamedParameter($firstCheck, IQueryBuilder::PARAM_INT),
]);
Expand All @@ -60,7 +59,7 @@ public function add($job, $argument = null, ?int $firstCheck = null): void {
->set('last_checked', $query->createNamedParameter($firstCheck, IQueryBuilder::PARAM_INT))
->set('last_run', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT))
->where($query->expr()->eq('class', $query->createNamedParameter($class)))
->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argumentJson))));
->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argumentJson))));
}
$query->executeStatement();
}
Expand All @@ -81,7 +80,7 @@ public function remove($job, $argument = null): void {
->where($query->expr()->eq('class', $query->createNamedParameter($class)));
if (!is_null($argument)) {
$argumentJson = json_encode($argument);
$query->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argumentJson))));
$query->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argumentJson))));
}

// Add galera safe delete chunking if using mysql
Expand Down Expand Up @@ -122,7 +121,7 @@ public function has($job, $argument): bool {
$query->select('id')
->from('jobs')
->where($query->expr()->eq('class', $query->createNamedParameter($class)))
->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argument))))
->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(hash('sha256', $argument))))
->setMaxResults(1);

$result = $query->executeQuery();
Expand Down