Fix broken serialization of binary http uploads #241
Closed
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
Conal-Tuohy
commented
Sep 20, 2016
|
|
||
| try { | ||
| if ("base64".equals(encoding)) { | ||
| String charset = body.getAttributeValue(_charset); |
There was a problem hiding this comment.
The base64-encoded data would typically be non-textual in nature, but even if it is in fact text (which has been base64-encoded for some reason), and being text, does have a charset, this charset would still be irrelevant to the task at hand which is just to upload the raw byte stream.
Conal-Tuohy
commented
Sep 20, 2016
| @@ -561,28 +563,25 @@ private void doPutOrPostSinglepart(HttpEntityEnclosingRequest method, XdmNode bo | |||
| if (encoding != null && !"base64".equals(encoding)) { | |||
| throw XProcException.stepError(52); | |||
| } | |||
|
|
|||
| HttpEntity requestEntity = null; | |||
There was a problem hiding this comment.
The requestEntity variable's type is now declared to be the interface HttpEntity rather than a StringEntity. The concrete instance will be either a ByteArrayEntity, if encoding="base64", or a StringEntity otherwise.
1 similar comment
ndw
added a commit
that referenced
this pull request
Dec 16, 2016
ndw
added a commit
that referenced
this pull request
Dec 16, 2016
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.
This commit fixes a bug which can corrupt the entity body of binary http uploads.
Previously, binary content was treated as text with a particular character encoding, but in fact a base64-encoded
c:bodydoes not have a 'character encoding' since it represents a sequence of bytes, not characters.I discovered this while trying to upload a PDF file, which was read from a file: URI successfully using
p:http-request, and could be saved withp:storeto produce an identical file, but which was corrupted when PUT to an http: URI usingp:http-request.I tested this using curl, a web service that accepts PUT, and a logging TCP tunnel; by comparing the HTTP request made by curl with the request made by my pipeline I was able to identify the underlying problem in the
http-requeststep's implementation. However, I struggled to build a test case for this using Calabash's test framework.