Support encryption, avoid double __unserialize call #62
Conversation
This file contains hidden or 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
|
I actually see there is another call to |
|
Thanks for the PR! Will you be updating it to fix the other |
Laravel uses the magic method `__unserialize()` in the `SerializesModels` trait, which does a bunch of work to rehydrate models attached to jobs. This gets called every time the job is unserialized. The addition of an `unserialize()` call in the constructor to get the `queue` property causes it to run twice because of the original call to `unserialize()` is in `\Illuminate\Queue\CallQueuedHandler->getCommand()`. `CallQueuedHandler->getCommand()` also implements support for encrypted command payloads. This change brings over the encryption support logic from `CallQueuedHandler->getCommand()` and passed `['allowed_classes' => false]` to the `unserialize()` call. This will make it _not_ hydrate to the original job object, but instead to an instance of `__PHP_Incomplete_Class` avoiding the unnecessary call to `__unserialize()` with this `unserialize()` call. We then cast to an `(array)` to access the `queue` property without issue.
|
@marickvantuil Updated the PR to avoid the |
|
Thanks! Released a new version |
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.
Laravel uses the magic method
__unserialize()in theSerializesModelstrait, which does a bunch of work to rehydrate models attached to jobs. This gets called every time the job is unserialized. The addition of anunserialize()call in the constructor to get thequeueproperty causes it to run twice because of the original call tounserialize()is in\Illuminate\Queue\CallQueuedHandler->getCommand().CallQueuedHandler->getCommand()also implements support for encrypted command payloads.This change brings over the encryption support logic from
CallQueuedHandler->getCommand()and passed['allowed_classes' => false]to theunserialize()call. This will make it not hydrate to the original job object, but instead to an instance of__PHP_Incomplete_Classavoiding the unnecessary call to__unserialize()with thisunserialize()call. We then cast to an(array)to access thequeueproperty without issue.