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

Fix the security vulnerability from jackcon databind #15665

Merged
merged 2 commits into from
Jun 7, 2022
Merged

Fix the security vulnerability from jackcon databind #15665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e39d1a4
Fix the security vulnerability from jackcon databind
beinan Jun 3, 2022
5863c4f
Exclude null or empty values for xml encoding
beinan Jun 4, 2022
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
2 changes: 2 additions & 0 deletions core/server/proxy/src/main/java/alluxio/proxy/s3/CompleteMultipartUploadResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

package alluxio.proxy.s3;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
Expand All @@ -24,6 +25,7 @@
*/
@JacksonXmlRootElement(localName = "CompleteMultipartUploadResult")
@JsonPropertyOrder({ "Location", "Bucket", "Key", "ETag" })
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None of the available fields for CompleteMultipartUpload seem be fields which are intended to be empty strings, so I'm okay with this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact <Code/> and <Message/> belong to error responses and not CompleteMultipartUpload directly. Again, change should be fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @ZhuTopher ! If you saw any abnormal ser/deser results of json or xml, just let me know, thx!

public class CompleteMultipartUploadResult {
/* The URI that identifies the newly created object. */
private String mLocation;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<protobuf.version>3.19.2</protobuf.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>1.7.30</slf4j.version>
<jackson.version>2.11.1</jackson.version>
<jackson.version>2.13.3</jackson.version>
<hadoop-cos.version>3.1.0-5.8.5</hadoop-cos.version>
<cos_api.version>5.6.19</cos_api.version>
<surefire.forkCount>2</surefire.forkCount>
Expand Down