This repository has been archived by the owner on Apr 18, 2018. It is now read-only.
Fixed handling of null chars in arguments. No 'ascii' checks. #26
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
The protocol says;
"Arguments given in the data part are separated by a NULL byte, and
the last argument is determined by the size of data after the last
NULL byte separator. All job handle arguments must not be longer than
64 bytes, including NULL terminator."
This adds a check to ensure that all arguments, but the last, do
not contain \0.
I do not check the args pass encode('ascii'). It would make sense,
since it's not known what will happen inside the bowels of gearmand.
It uses memcmp for the most part, and we have to assume the
queue storage can handle utf8, as long as it does not contain
\0.
|
|
||
| # Assert we check for NULLs in all but the "last" argument, where last depends on the cmd_type. | ||
| cmd_type = protocol.GEARMAN_COMMAND_SUBMIT_JOB | ||
| cmd_args = dict(task='function', data='abcd', unique='123\x0045') |
There was a problem hiding this comment.
Nope, the order of arguments is based on keys, and decided in protocol.py. Hence the "quotes" around last.
There was a problem hiding this comment.
I still don't understand why "unique" isn't last, then.
There was a problem hiding this comment.
Never mind, eskil explained this to me. I am just bad at reading.
|
shipit |
eskil
added a commit
that referenced
this pull request
Sep 6, 2012
Fixed handling of null chars in arguments. No 'ascii' checks.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The protocol says;
"Arguments given in the data part are separated by a NULL byte, and
the last argument is determined by the size of data after the last
NULL byte separator. All job handle arguments must not be longer than
64 bytes, including NULL terminator."
This adds a check to ensure that all arguments, but the last, do
not contain \0.
I do not check the args pass encode('ascii'). It would make sense,
since it's not known what will happen inside the bowels of gearmand.
It uses memcmp for the most part, and we have to assume the
queue storage can handle utf8, as long as it does not contain
\0.