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.

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

HIVE-28751: Upgrade curator version from 5.2.0 to 5.7.1 to fix CVE-2023-2976 #5640

Merged
merged 1 commit into from
Feb 12, 2025

Conversation

KiranVelumuri
Copy link
Contributor

@KiranVelumuri KiranVelumuri commented Feb 10, 2025

What changes were proposed in this pull request?

Upgrade curator.version in pom.xml from 5.2.0 to 5.7.1
CVE mentioned in mvn repo: CVE-2023-2976

Why are the changes needed?

HIVE-28751

Does this PR introduce any user-facing change?

No

Is the change a dependency upgrade?

Yes
tree.txt

How was this patch tested?

mvn dependency:tree

@KiranVelumuri
Copy link
Contributor Author

KiranVelumuri commented Feb 10, 2025

@okumin Could you please review this? Thank you.

@KiranVelumuri
Copy link
Contributor Author

Occurences of older curator-client-5.2.0.jar have been updated with the upgraded version:

located at packaging/target/apache-hive-4.0.0.3.4.0-SNAPSHOT-bin.tar.gz/apache-hive-4.0.0.3.4.0-SNAPSHOT-bin/lib
image

located at standalone-metastore/metastore-server/target/apache-hive-standalone-metastore-server-4.0.0.3.4.0-SNAPSHOT-bin.tar.gz/apache-hive-metastore-4.0.0.3.4.0-SNAPSHOT-bin/lib
image

Our current version of ZK is 3.8.4 which lies in the specified range and so is compatible with curator 5.6.0
image

@okumin
Copy link
Contributor

okumin commented Feb 11, 2025

I compared the diff between the parent revision(35589d7) and this branch. All are expected

893,906c893,906
< [INFO]    org.apache.curator:apache-curator:pom:5.2.0:compile
< [INFO]    org.apache.curator:apache-curator:pom:5.2.0:provided
< [INFO]    org.apache.curator:apache-curator:pom:5.2.0:test
< [INFO]    org.apache.curator:curator-client:jar:5.2.0:compile -- module curator.client (auto)
< [INFO]    org.apache.curator:curator-client:jar:5.2.0:provided -- module curator.client (auto)
< [INFO]    org.apache.curator:curator-client:jar:5.2.0:test -- module curator.client (auto)
< [INFO]    org.apache.curator:curator-framework:jar:5.2.0:compile -- module curator.framework (auto)
< [INFO]    org.apache.curator:curator-framework:jar:5.2.0:provided -- module curator.framework (auto)
< [INFO]    org.apache.curator:curator-framework:jar:5.2.0:test -- module curator.framework (auto)
< [INFO]    org.apache.curator:curator-recipes:jar:5.2.0:compile -- module curator.recipes (auto)
< [INFO]    org.apache.curator:curator-recipes:jar:5.2.0:provided -- module curator.recipes (auto)
< [INFO]    org.apache.curator:curator-recipes:jar:5.2.0:runtime -- module curator.recipes (auto)
< [INFO]    org.apache.curator:curator-recipes:jar:5.2.0:test -- module curator.recipes (auto)
< [INFO]    org.apache.curator:curator-test:jar:5.2.0:test -- module curator.test (auto)
---
> [INFO]    org.apache.curator:apache-curator:pom:5.6.0:compile
> [INFO]    org.apache.curator:apache-curator:pom:5.6.0:provided
> [INFO]    org.apache.curator:apache-curator:pom:5.6.0:test
> [INFO]    org.apache.curator:curator-client:jar:5.6.0:compile -- module curator.client (auto)
> [INFO]    org.apache.curator:curator-client:jar:5.6.0:provided -- module curator.client (auto)
> [INFO]    org.apache.curator:curator-client:jar:5.6.0:test -- module curator.client (auto)
> [INFO]    org.apache.curator:curator-framework:jar:5.6.0:compile -- module curator.framework (auto)
> [INFO]    org.apache.curator:curator-framework:jar:5.6.0:provided -- module curator.framework (auto)
> [INFO]    org.apache.curator:curator-framework:jar:5.6.0:test -- module curator.framework (auto)
> [INFO]    org.apache.curator:curator-recipes:jar:5.6.0:compile -- module curator.recipes (auto)
> [INFO]    org.apache.curator:curator-recipes:jar:5.6.0:provided -- module curator.recipes (auto)
> [INFO]    org.apache.curator:curator-recipes:jar:5.6.0:runtime -- module curator.recipes (auto)
> [INFO]    org.apache.curator:curator-recipes:jar:5.6.0:test -- module curator.recipes (auto)
> [INFO]    org.apache.curator:curator-test:jar:5.6.0:test -- module curator.test (auto)
1956c1956

pom.xml Outdated Show resolved Hide resolved
@okumin
Copy link
Contributor

okumin commented Feb 11, 2025

The latest diff

% diff /tmp/before.txt /tmp/after.txt
893,906c893,906
< [INFO]    org.apache.curator:apache-curator:pom:5.2.0:compile
< [INFO]    org.apache.curator:apache-curator:pom:5.2.0:provided
< [INFO]    org.apache.curator:apache-curator:pom:5.2.0:test
< [INFO]    org.apache.curator:curator-client:jar:5.2.0:compile -- module curator.client (auto)
< [INFO]    org.apache.curator:curator-client:jar:5.2.0:provided -- module curator.client (auto)
< [INFO]    org.apache.curator:curator-client:jar:5.2.0:test -- module curator.client (auto)
< [INFO]    org.apache.curator:curator-framework:jar:5.2.0:compile -- module curator.framework (auto)
< [INFO]    org.apache.curator:curator-framework:jar:5.2.0:provided -- module curator.framework (auto)
< [INFO]    org.apache.curator:curator-framework:jar:5.2.0:test -- module curator.framework (auto)
< [INFO]    org.apache.curator:curator-recipes:jar:5.2.0:compile -- module curator.recipes (auto)
< [INFO]    org.apache.curator:curator-recipes:jar:5.2.0:provided -- module curator.recipes (auto)
< [INFO]    org.apache.curator:curator-recipes:jar:5.2.0:runtime -- module curator.recipes (auto)
< [INFO]    org.apache.curator:curator-recipes:jar:5.2.0:test -- module curator.recipes (auto)
< [INFO]    org.apache.curator:curator-test:jar:5.2.0:test -- module curator.test (auto)
---
> [INFO]    org.apache.curator:apache-curator:pom:5.7.1:compile
> [INFO]    org.apache.curator:apache-curator:pom:5.7.1:provided
> [INFO]    org.apache.curator:apache-curator:pom:5.7.1:test
> [INFO]    org.apache.curator:curator-client:jar:5.7.1:compile -- module curator.client (auto)
> [INFO]    org.apache.curator:curator-client:jar:5.7.1:provided -- module curator.client (auto)
> [INFO]    org.apache.curator:curator-client:jar:5.7.1:test -- module curator.client (auto)
> [INFO]    org.apache.curator:curator-framework:jar:5.7.1:compile -- module curator.framework (auto)
> [INFO]    org.apache.curator:curator-framework:jar:5.7.1:provided -- module curator.framework (auto)
> [INFO]    org.apache.curator:curator-framework:jar:5.7.1:test -- module curator.framework (auto)
> [INFO]    org.apache.curator:curator-recipes:jar:5.7.1:compile -- module curator.recipes (auto)
> [INFO]    org.apache.curator:curator-recipes:jar:5.7.1:provided -- module curator.recipes (auto)
> [INFO]    org.apache.curator:curator-recipes:jar:5.7.1:runtime -- module curator.recipes (auto)
> [INFO]    org.apache.curator:curator-recipes:jar:5.7.1:test -- module curator.recipes (auto)
> [INFO]    org.apache.curator:curator-test:jar:5.7.1:test -- module curator.test (auto)

Copy link
Contributor

@okumin okumin left a comment

Choose a reason for hiding this comment

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

LGTM.

TODO

  • Wait for CI and 24 hours
  • Update the title of this PR
  • Update the title of the JIRA ticket

@KiranVelumuri
Copy link
Contributor Author

LGTM.

TODO

  • Wait for CI and 24 hours
  • Update the title of this PR
  • Update the title of the JIRA ticket

The failing test TestPartitionManagement#testPartitionDiscoveryTransactionalTable passed locally and so seems flaky in the Jenkins run. Re-triggered for green build. Updated commit message earlier, will update title and PR post green build.

image

@KiranVelumuri KiranVelumuri changed the title HIVE-28751: Upgrade curator version from 5.2.0 to 5.6.0 to fix CVE-2023-2976 HIVE-28751: Upgrade curator version from 5.2.0 to 5.7.1 to fix CVE-2023-2976 Feb 11, 2025
@KiranVelumuri
Copy link
Contributor Author

LGTM.

TODO

  • Wait for CI and 24 hours
  • Update the title of this PR
  • Update the title of the JIRA ticket

The CI is green now. Updated titles.

@okumin okumin merged commit 0759352 into apache:master Feb 12, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants