Skip to content

Upgrade jackson-databind to 2.13.4.2 to address CVEs #13244

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

Closed
kfaraz wants to merge 3 commits into from
Closed

Upgrade jackson-databind to 2.13.4.2 to address CVEs #13244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
346df74
Fix cves
kfaraz Oct 20, 2022
d2378fb
Use correct version for jackson-bom
kfaraz Oct 20, 2022
0044688
Remove usage of method deleted in latest jackson-databind
kfaraz Oct 20, 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
4 changes: 2 additions & 2 deletions core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ public Object findInjectableValueId(AnnotatedMember m)
if (m instanceof AnnotatedMethod) {
throw new IAE("Annotated methods don't work very well yet...");
}
return Key.get(m.getGenericType());
return Key.get(m.getType());
}
return Key.get(m.getGenericType(), guiceAnnotation);
return Key.get(m.getType(), guiceAnnotation);
}

Comment on lines +63 to 65
Copy link
Copy Markdown

@CookieAroundTheBend CookieAroundTheBend Nov 21, 2022

Choose a reason for hiding this comment

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

Suggested change
return Key.get(m.getType(), guiceAnnotation);
}
return Key.get(getParamType(m), guiceAnnotation);
}
private Type getParamType(AnnotatedMember m) {
if(m.getType().isContainerType()){
return Types.newParameterizedType(m.getType().getRawClass(), m.getType().getContentType().getRawClass());
}
return m.getRawType();
}

This seems to work for me (and of course changing the Key.get(m.getType()); to Key.get(getParamType(m)); on line 61.

But this was on version 0.22.1 and I'm not sure if this is as robust handling that could be needed.

Copy link
Copy Markdown

@CookieAroundTheBend CookieAroundTheBend Nov 21, 2022

Choose a reason for hiding this comment

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

This is needed for the changes for the StorageSelection
https://github.com/apache/druid/pull/10363/files#diff-6bf786a6df7322201eee2b85d1a1857fc89af11af98c47be9c97449627d0673f

Copy link
Copy Markdown
Contributor Author

@kfaraz kfaraz Dec 1, 2022

Choose a reason for hiding this comment

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

Thanks for the suggestion, @CookieAroundTheBend ! I will try to spend some time on this and get it resolved soon.

/**
Expand Down
4 changes: 2 additions & 2 deletions licenses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ name: Jackson
license_category: binary
module: java-core
license_name: Apache License version 2.0
version: 2.10.5
version: 2.13.4
libraries:
- com.fasterxml.jackson.core: jackson-annotations
- com.fasterxml.jackson.core: jackson-core
Expand Down Expand Up @@ -278,7 +278,7 @@ name: Jackson
license_category: binary
module: java-core
license_name: Apache License version 2.0
version: 2.10.5.1
version: 2.13.4.2
libraries:
- com.fasterxml.jackson.core: jackson-databind
notice: |
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 @@ -98,7 +98,7 @@
<hamcrest.version>1.3</hamcrest.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<jersey.version>1.19.4</jersey.version>
<jackson.version>2.10.5.20201202</jackson.version>
<jackson.version>2.13.4.20221013</jackson.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<log4j.version>2.18.0</log4j.version>
<mysql.version>5.1.49</mysql.version>
Expand Down