Skip to content
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

[8.x] Fix retry command for encrypted jobs #36334

Merged
merged 4 commits into from
Feb 21, 2021
Merged

[8.x] Fix retry command for encrypted jobs #36334

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef3080d
Fix retry command for encrypted jobs
willbrowningme Feb 21, 2021
0e136df
Fix formatting
willbrowningme Feb 21, 2021
a78aa12
Fix case when command not encrypted
willbrowningme Feb 21, 2021
0dc9d84
Fix style
willbrowningme Feb 21, 2021
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
13 changes: 12 additions & 1 deletion src/Illuminate/Queue/Console/RetryCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

use DateTimeInterface;
use Illuminate\Console\Command;
use Illuminate\Contracts\Encryption\Encrypter;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use RuntimeException;

class RetryCommand extends Command
{
Expand Down Expand Up @@ -131,7 +134,15 @@ protected function refreshRetryUntil($payload)
return json_encode($payload);
}

$instance = unserialize($payload['data']['command']);
if (Str::startsWith($payload['data']['command'], 'O:')) {
$instance = unserialize($payload['data']['command']);
} elseif (app()->bound(Encrypter::class)) {
$instance = unserialize(app()->make(Encrypter::class)->decrypt($payload['data']['command']));
}

if (! isset($instance)) {
throw new RuntimeException('Unable to extract job payload.');
}

if (is_object($instance) && method_exists($instance, 'retryUntil')) {
$retryUntil = $instance->retryUntil();
Expand Down