-
Notifications
You must be signed in to change notification settings - Fork 9.1k
HADOOP-19578: Upgrade esdk-obs-java to resolve CVE-2023-3635 #7707
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.
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
base: trunk
Are you sure you want to change the base?
HADOOP-19578: Upgrade esdk-obs-java to resolve CVE-2023-3635 #7707
Conversation
💔 -1 overall
This message was automatically generated. |
@@ -29,7 +29,7 @@ | |||
<properties> | |||
<file.encoding>UTF-8</file.encoding> | |||
<downloadSources>true</downloadSources> | |||
<esdk.version>3.20.4.2</esdk.version> | |||
<esdk.version>3.25.4</esdk.version> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[ERROR] Dependency convergence error for com.squareup.okio:okio:jar:3.6.0 paths to dependency are:
[ERROR] +-org.apache.hadoop:hadoop-huaweicloud:jar:3.5.0-SNAPSHOT
[ERROR] +-com.huaweicloud:esdk-obs-java:jar:3.25.4:compile
[ERROR] +-com.squareup.okhttp3:okhttp:jar:4.12.0:compile
[ERROR] +-com.squareup.okio:okio:jar:3.6.0:compile
[ERROR] and
[ERROR] +-org.apache.hadoop:hadoop-huaweicloud:jar:3.5.0-SNAPSHOT
[ERROR] +-com.huaweicloud:esdk-obs-java:jar:3.25.4:compile
[ERROR] +-com.squareup.okio:okio:jar:3.8.0:compile
We need to resolve this compilation error.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@slfan1989 this is an internal dependency "issue" with the esdk-obj-java
library -
It uses OkHttp 4.12.0 which declares OkIo 3.6.0,
But it also uses OkIo 3.8.0 directly, overriding OkHttp's version of choice.
If this discrepancy is contained within a single (and external) part of the dependency tree, can this warning be suppressed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the pom dependency declarations will need to explicitly exclude the 3.6 versoin; look for the many other uses of to see this in use
c3f593b
to
c4c7bfa
Compare
c4c7bfa
to
1027e19
Compare
💔 -1 overall
This message was automatically generated. |
1027e19
to
e556bde
Compare
🎊 +1 overall
This message was automatically generated. |
@steveloughran I've used dependencyManagement instead of exclusion - |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
comments; do those and we can merge.
@YanivKunda if you can get this done ASAP we can target 3.4.2
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3AFSMainOperations.java
Outdated
Show resolved
Hide resolved
...azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemMainOperation.java
Outdated
Show resolved
Hide resolved
e556bde
to
1bb0d6c
Compare
1bb0d6c
to
9561b9f
Compare
💔 -1 overall
This message was automatically generated. |
💔 -1 overall
This message was automatically generated. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
did a build and maven dependencies on hadoop-cloud module,
all looks good
[INFO] +- org.apache.hadoop:hadoop-huaweicloud:jar:3.5.0-SNAPSHOT:compile
[INFO] | \- com.huaweicloud:esdk-obs-java:jar:3.25.5:compile
[INFO] | +- com.squareup.okhttp3:okhttp:jar:4.12.0:compile
[INFO] | | \- org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.21:compile
[INFO] | | +- org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.21:compile
[INFO] | | | \- org.jetbrains:annotations:jar:13.0:compile
[INFO] | | \- org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.21:compile
[INFO] | \- com.squareup.okio:okio:jar:3.8.0:compile
[INFO] | \- com.squareup.okio:okio-jvm:jar:3.8.0:compile
[INFO] \- org.apache.hadoop:hadoop-tos:jar:3.5.0-SNAPSHOT:compile
now, does esdk-obs-java get bundled in our binary releases? I don't see that being the case, so there's no need to updatee LICENSE-binary.
@YanivKunda you've retested this, yes? If so check the box on the PR definition above (I restored it...), and say which service endpoint you ran the integration tests against
+1 pending this test result
@steveloughran I verified the distribution doesn't contain this jar (interestingly, it does contain the Aliyun SDK jars). |
@steveloughran I see the original code was contributed by a "zhongjun" 5 years ago, |
well, we don't distribute it, but unless anybody is set up to test it, we have to choose between "used to work but has cve" and "more secure but may not work" |
Description of PR
Upgrade esdk-obs-java (in hadoop-huaweicloud) to resolve CVE-2023-3635
How was this patch tested?
Ran existing tests.
For code changes:
LICENSE
,LICENSE-binary
,NOTICE-binary
files?