[SPARK-37090][BUILD] Upgrade `libthrift` to 0.16.0 to avoid security vulnerabilities by wangyum · Pull Request #34362 · apache/spark

wangyum · 2021-10-22T01:07:03Z

What changes were proposed in this pull request?

This PR ported HIVE-21498, HIVE-25098 and upgraded libthrift to 0.16.0.

The CHANGES list for libthrift 0.16.0 is available at: https://github.com/apache/thrift/blob/v0.16.0/CHANGES.md

Why are the changes needed?

To address CVE-2020-13949.

Does this PR introduce any user-facing change?

No.

How was this patch tested?

Existing test.

wangyum · 2021-10-22T01:10:22Z

cc @HyukjinKwon @juliuszsompolski We can upgrade to 0.13.0 first. If 0.16.0 is released, we can upgrade to 0.16.0 because we need this patch.

HyukjinKwon · 2021-10-22T01:12:37Z

cc
@srowen and @dongjoon-hyun too FYI

SparkQA · 2021-10-22T02:32:05Z

Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/48993/

SparkQA · 2021-10-22T03:15:01Z

Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/48993/

SparkQA · 2021-10-22T04:22:49Z

Test build #144522 has finished for PR 34362 at commit 8d9e375.

This patch passes all tests.
This patch merges cleanly.
This patch adds no public classes.

srowen · 2021-10-22T04:49:06Z

Minor but legitimate thing we should do: update LICENSE-binary to add a line about the licensing of this, which is dual licensed as CDDL 1.1 and GPL + classpath. Just add one line around...
Common Development and Distribution License (CDDL) 1.1 ------------------------------------------------------ javax.el:javax.el-api https://javaee.github.io/uel-ri/ javax.servlet.jsp:jsp-api
I suppose we need a copy of the license text in licenses-binary too, ideally
https://github.com/javaee/javax.annotation/blob/master/LICENSE

I have removed javax.annotation-api-1.3.2.jar. It seems we do not need it:
LM-SHC-16508156:thrift yumwang$ grep -ER "javax.annotation" . ./lib/java/gradle/environment.gradle:ext.javaxAnnotationVersion = property('javax.annotation.version') ./lib/java/gradle/environment.gradle: compile "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}" Binary file ./lib/java/.gradle/5.6.4/executionHistory/executionHistory.bin matches Binary file ./lib/java/.gradle/5.6.4/javaCompile/classAnalysis.bin matches Binary file ./lib/java/.gradle/5.6.4/javaCompile/taskHistory.bin matches ./lib/java/gradle.properties:javax.annotation.version=1.3.2 ./lib/java/build/poms/pom-default.xml: <groupId>javax.annotation</groupId> ./lib/java/build/poms/pom-default.xml: <artifactId>javax.annotation-api</artifactId> Binary file ./lib/java/build/deps/javax.annotation-api-1.3.2.jar matches ./lib/java/build/tmp/javadoc/javadoc.options:-classpath '/Users/yumwang/opensource/thrift/lib/java/build/classes/java/main:/Users/yumwang/opensource/thrift/lib/java/build/resources/main:/Users/yumwang/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.28/2cd9b264f76e3d087ee21bfc99305928e1bdb443/slf4j-api-1.7.28.jar:/Users/yumwang/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.5.10/7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5/httpclient-4.5.10.jar:/Users/yumwang/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.4.12/21ebaf6d532bc350ba95bd81938fa5f0e511c132/httpcore-4.4.12.jar:/Users/yumwang/.gradle/caches/modules-2/files-2.1/javax.servlet/javax.servlet-api/4.0.1/a27082684a2ff0bf397666c3943496c44541d1ca/javax.servlet-api-4.0.1.jar:/Users/yumwang/.gradle/caches/modules-2/files-2.1/javax.annotation/javax.annotation-api/1.3.2/934c04d3cfef185a8008e7bf34331b79730a9d43/javax.annotation-api-1.3.2.jar:/Users/yumwang/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/4bfc12adfe4842bf07b657f0369c4cb522955686/commons-logging-1.2.jar:/Users/yumwang/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.11/3acb4705652e16236558f0f4f2192cc33c3bd189/commons-codec-1.11.jar' ./compiler/cpp/src/thrift/generate/t_java_generator.cc: indent(out) << "@javax.annotation.Generated(value = \"" << autogen_summary() << "\"";

OK, I'm sure we don't use it directly, but that doesn't mean thrift doesn't need it.
That said, it's just a set of annotations, which are usually optional.
We exclude this elsewhere, so I think this is OK.

SparkQA · 2021-10-22T06:31:47Z

Kubernetes integration test starting
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/49000/

SparkQA · 2021-10-22T07:08:19Z

Kubernetes integration test status failure
URL: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder-K8s/49000/

SparkQA · 2021-10-22T08:26:24Z

Test build #144529 has finished for PR 34362 at commit affe2f6.

This patch passes all tests.
This patch merges cleanly.
This patch adds no public classes.

yaooqinn · 2021-10-22T09:32:15Z

Interesting, Thrift 0.13.0 does not work with JDK8 per https://issues.apache.org/jira/browse/THRIFT-5274

srowen · 2021-10-22T13:44:48Z

Hm, looks like our Java 8 tests pass though. It might not affect Spark, but that makes me uneasy.
I suppose we can wait for 0.16.0, but not sure how many months away that is.
I wouldn't oppose merging this to move forward a bit

dongjoon-hyun · 2021-10-25T07:07:09Z

Thank you for pinging me, @HyukjinKwon .
cc @sunchao

dongjoon-hyun · 2021-11-04T06:36:14Z

Let's wait for a while since this is not for Apache Spark 3.2.1.
To prevent accidental merging, I converted this PR to the draft, @wangyum .

srowen

This seems OK if tests all pass this time

srowen

@wangyum if you're OK with this, you can mark it as ready to merge. Looks OK to me

dongjoon-hyun · 2022-01-30T04:01:59Z

I converted it back to Ready for Review because I did it before before Apache Spark 3.2.1 release.

dongjoon-hyun

The last commit failed with the following. Could you re-trigger the tests, @wangyum ?

Error: Failed to execute goal on project spark-hive_2.12: Could not resolve dependencies for project org.apache.spark:spark-hive_2.12:jar:spark-975225:
Could not find artifact org.apache.thrift:libthrift:jar:0.16.0 in gcs-maven-central-mirror (https://maven-central.storage-download.googleapis.com/maven2/) -> [Help 1]

dongjoon-hyun

Pending CIs. And, please make the PR description up-to-date.

This pr backport HIVE-21498 to upgrade libthrift to 0.13.0.

srowen · 2022-02-06T21:47:20Z

Ah I see the tests passing but did not all applicable tests run? Is it because the tests need to be enabled to run in the submitter's acct?

dongjoon-hyun · 2022-02-08T05:50:57Z

No, no tests ran. It was a build error due to Could not find artifact org.apache.thrift:libthrift:jar:0.16.0 as I wrote in the previous comment.
When you cannot check the result in Apache Spark repo, you need to visit their branch because sometimes GitHub Action notification doesn't work properly. In this PR, the following is his branch. And, you can see the actual GitHub Action result at the commit.
- https://github.com/wangyum/spark/tree/SPARK-37090

wangyum · 2022-02-14T02:38:12Z

Sorry. I was on Chinese new year holiday last 2 weeks. I used to test Thrift 0.16-rc0, Thrift 0.16 has not been officially released.

dongjoon-hyun · 2022-02-16T08:55:55Z

No problem. Please let us know when the PR is ready, @wangyum .

14:53:54.715 WARN org.apache.hadoop.util.NativeCodeLoader: Unable to load native-hadoop library for your platform... using builtin-java classes where applicable Exception in thread "HiveServer2-Handler-Pool: Thread-164" java.lang.NoClassDefFoundError: org/apache/thrift/transport/TFramedTransport | => hat java.lang.Class.forName0(Native Method) at java.lang.Class.forName(Class.java:348) at org.apache.hadoop.hive.metastore.MetaStoreUtils.getClass(MetaStoreUtils.java:1708) at org.apache.hadoop.hive.metastore.RetryingMetaStoreClient.getProxy(RetryingMetaStoreClient.java:131) at org.apache.hadoop.hive.metastore.RetryingMetaStoreClient.getProxy(RetryingMetaStoreClient.java:104) at org.apache.hadoop.hive.ql.metadata.Hive.createMetaStoreClient(Hive.java:3607) at org.apache.hadoop.hive.ql.metadata.Hive.getMSC(Hive.java:3659) at org.apache.hadoop.hive.ql.metadata.Hive.getMSC(Hive.java:3639) at org.apache.hadoop.hive.ql.metadata.Hive.getAllFunctions(Hive.java:3901) at org.apache.hadoop.hive.ql.metadata.Hive.reloadFunctions(Hive.java:248) at org.apache.hadoop.hive.ql.metadata.Hive.registerAllFunctionsOnce(Hive.java:231) at org.apache.hadoop.hive.ql.metadata.Hive.<init>(Hive.java:395) at org.apache.hadoop.hive.ql.metadata.Hive.create(Hive.java:339) at org.apache.hadoop.hive.ql.metadata.Hive.getInternal(Hive.java:319) at org.apache.hadoop.hive.ql.metadata.Hive.get(Hive.java:288)

wangyum · 2022-02-18T07:27:58Z

+ * This is based on libthrift-0.12.0 {@link org.apache.thrift.transport.TFramedTransport}.
+ * To fix class of org.apache.thrift.transport.TFramedTransport not found after upgrading libthrift.
+ *
+ * TFramedTransport is a buffered TTransport that ensures a fully read message
+ * every time by preceding messages with a 4-byte frame size.
+ */


Origin Java class: https://github.com/apache/thrift/blob/0.12.0/lib/java/src/org/apache/thrift/transport/TFramedTransport.java

srowen · 2022-02-18T17:12:51Z

Looks like librthrift 0.16.0 was released and this passes, so should be good to go. Thoughts about backporting this to 3.2 and 3.1? (3.0, I presume, is EOL now). I guess I'm inclined to unless there is a non-trivial risk of breaking something, like Hadoop 2 compatibility

wangyum · 2022-02-20T02:36:55Z

This is for branch 3.2 and 3.1:
https://github.com/apache/spark/compare/branch-3.2...wangyum:SPARK-37090-branch-3.2?expand=1
https://github.com/apache/spark/compare/branch-3.1...wangyum:SPARK-37090-branch-3.1?expand=1

srowen · 2022-02-20T20:23:14Z

One last check from @dongjoon-hyun maybe; this and backports looks OK

dongjoon-hyun · 2022-02-20T20:27:50Z

Thank you for asking, @srowen . Sounds reasonable. No objection for backporting from my side.

srowen · 2022-02-20T20:38:40Z

Merged to master. I'll look at the backports next

srowen · 2022-02-20T20:39:33Z

Oh @wangyum do you have pull requests for the backports? the content looks OK, just bears testing

### _Why are the changes needed?_ Upgrade libthrift to 0.16.0 due to [CVE-2020-13949](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-13949) and the coming upstream change of Spark apache/spark#34362 ### _What changed in this PR?_ - Upgrade libthrift to 0.16.0 - Shade and relocate `thrift` and `hive-service-rpc` classes in `kyuubi-spark-engine`, it's necessary to avoide conflicting with old thrift libs bundled in Spark binary releases. - Due to thrift change the method signature, the subclasses those interfaces in Kyuubi also need to modify to pass compile. We rely on Hive 2.3.9 jars in some components, e.g. `kyuubi-hive-jdbc`, `LocalMetaServer` in `kyuubi-server` test classes. Some classes in Hive jars compiled against old thrift interfaces which are not compatible with thrift 0.16.0, it causes runtime link error, we found the following classes which breaks the test and copied them with necessary modification to make it work with thrift 0.16.0. - `TFramedTransport` - `TFilterTransport` - `TUGIAssumingTransport` - `TUGIContainingTransport` - Next Steps, I think it's worth to do in separated PRs. - Recover the `HiveDelegationTokenProviderSuite`, one approach is use an isolate classloader to load HMS classes and thrift 0.9.3 classes from Maven, this approach can also be used for the planed Zoopkeeper upgrading to help us verficating the compatibility of Zookeeper Server 3.4.x. - Rewrite `kyuubi-hive-jdbc` to make it decouple with Hive jars, because there maybe other places which may not work with thrift 0.16.0 but the UTs does not cover. ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes#1953 from SteNicholas/KYUUBI-1948. Closes#1948 de5d1ea [SteNicholas] [KYUUBI #1948] Upgrade thrift version to 0.16.0 898effc [SteNicholas] [KYUUBI #1948] Upgrade thrift version to 0.16.0 803e270 [SteNicholas] [KYUUBI #1948] Upgrade thrift version to 0.16.0 Authored-by: SteNicholas <programgeek@163.com> Signed-off-by: Kent Yao <yao@apache.org>

…ty vulnerabilities This is a backport of #34362 to branch 3.2. ### What changes were proposed in this pull request? This PR ported HIVE-21498, HIVE-25098 and upgraded libthrift to 0.16.0. The CHANGES list for libthrift 0.16.0 is available at: https://github.com/apache/thrift/blob/v0.16.0/CHANGES.md ### Why are the changes needed? To address [CVE-2020-13949](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-13949). ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing test. Closes#35646 from wangyum/SPARK-37090-branch-3.2. Authored-by: Yuming Wang <yumwang@ebay.com> Signed-off-by: Sean Owen <srowen@gmail.com>

…ty vulnerabilities This is a backport of #34362 to branch 3.1. ### What changes were proposed in this pull request? This PR ported HIVE-21498, HIVE-25098 and upgraded libthrift to 0.16.0. The CHANGES list for libthrift 0.16.0 is available at: https://github.com/apache/thrift/blob/v0.16.0/CHANGES.md ### Why are the changes needed? To address [CVE-2020-13949](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-13949). ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Existing test. Closes#35647 from wangyum/SPARK-37090-branch-3.1. Authored-by: Yuming Wang <yumwang@ebay.com> Signed-off-by: Sean Owen <srowen@gmail.com>

dongjoon-hyun · 2022-03-02T06:33:55Z

Hi, All. This is reverted from all branches due to the regression.
Please see #35646

…ty vulnerabilities This is a backport of apache#34362 to branch 3.2. This PR ported HIVE-21498, HIVE-25098 and upgraded libthrift to 0.16.0. The CHANGES list for libthrift 0.16.0 is available at: https://github.com/apache/thrift/blob/v0.16.0/CHANGES.md To address [CVE-2020-13949](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-13949). No. Existing test. Closesapache#35646 from wangyum/SPARK-37090-branch-3.2. Authored-by: Yuming Wang <yumwang@ebay.com> Signed-off-by: Sean Owen <srowen@gmail.com>

github-actionsBot added BUILD SQL labels Oct 22, 2021

HyukjinKwon approved these changes Oct 22, 2021
View reviewed changes

srowen reviewed Oct 22, 2021
View reviewed changes

Comment threadsql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java Outdated

dongjoon-hyun marked this pull request as draft November 4, 2021 06:34

wangyum added 3 commits January 25, 2022 19:50

Backport HIVE-21498
8d108ad

Remove javax.annotation-api
d0e7777

0.16.0
017f937

srowen reviewed Jan 28, 2022
View reviewed changes

HyukjinKwon approved these changes Jan 30, 2022
View reviewed changes

srowen reviewed Jan 30, 2022
View reviewed changes

dongjoon-hyun marked this pull request as ready for review January 30, 2022 04:01

dongjoon-hyun reviewed Jan 30, 2022
View reviewed changes

dongjoon-hyun requested changes Jan 30, 2022
View reviewed changes

dongjoon-hyun changed the title ~~[SPARK-37090][BUILD] Upgrade libthrift to avoid security vulnerabilities~~[SPARK-37090][BUILD] Upgrade libthrift to 0.16.0 to avoid security vulnerabilitiesJan 30, 2022

dongjoon-hyun changed the title ~~[SPARK-37090][BUILD] Upgrade libthrift to 0.16.0 to avoid security vulnerabilities~~[SPARK-37090][BUILD] Upgrade libthrift to 0.16.0 to avoid security vulnerabilitiesJan 30, 2022

wangyum marked this pull request as draft February 14, 2022 02:38

Merge branch 'apache:master' intoSPARK-37090
c7d6c6a

wangyum marked this pull request as ready for review February 18, 2022 06:21

wangyum added 3 commits February 18, 2022 14:54

Port HIVE-25098
ccc25d0

Init
476958f

wangyum commented Feb 18, 2022
View reviewed changes

srowen closed this in 4789e1fFeb 20, 2022

This was referenced Feb 21, 2022
[SPARK-37090][BUILD][3.2] Upgrade libthrift to 0.16.0 to avoid security vulnerabilities #35587
Closed
[SPARK-37090][BUILD][3.1] Upgrade libthrift to 0.16.0 to avoid security vulnerabilities #35588
Closed

pan3793 mentioned this pull request Feb 23, 2022
[KYUUBI #1948] Upgrade thrift version to 0.16.0 apache/kyuubi#1953
Closed
3 tasks

This was referenced Feb 24, 2022
[SPARK-37090][BUILD][3.2] Upgrade libthrift to 0.16.0 to avoid security vulnerabilities #35646
Closed
[SPARK-37090][BUILD][3.1] Upgrade libthrift to 0.16.0 to avoid security vulnerabilities #35647
Closed

pan3793 mentioned this pull request Dec 12, 2025
backport libthrift update to fix CVE-2019-0205 & CVE-2020-13949 #53429
Closed

Uh oh!

Conversation

wangyum commented Oct 22, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What changes were proposed in this pull request?

Why are the changes needed?

Does this PR introduce any user-facing change?

How was this patch tested?

Uh oh!

wangyum commented Oct 22, 2021

Uh oh!

HyukjinKwon commented Oct 22, 2021

Uh oh!

SparkQA commented Oct 22, 2021

Uh oh!

SparkQA commented Oct 22, 2021

Uh oh!

SparkQA commented Oct 22, 2021

Uh oh!

srowenOct 22, 2021

Choose a reason for hiding this comment

Uh oh!

wangyumOct 22, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

srowenOct 22, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

SparkQA commented Oct 22, 2021

Uh oh!

SparkQA commented Oct 22, 2021

Uh oh!

SparkQA commented Oct 22, 2021

Uh oh!

yaooqinn commented Oct 22, 2021

Uh oh!

srowen commented Oct 22, 2021

Uh oh!

dongjoon-hyun commented Oct 25, 2021

Uh oh!

dongjoon-hyun commented Nov 4, 2021

Uh oh!

srowen left a comment

Choose a reason for hiding this comment

Uh oh!

srowen left a comment

Choose a reason for hiding this comment

Uh oh!

dongjoon-hyun commented Jan 30, 2022

Uh oh!

dongjoon-hyun left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dongjoon-hyun left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

srowen commented Feb 6, 2022

Uh oh!

dongjoon-hyun commented Feb 8, 2022

Uh oh!

wangyum commented Feb 14, 2022

Uh oh!

dongjoon-hyun commented Feb 16, 2022

Uh oh!

wangyumFeb 18, 2022

Choose a reason for hiding this comment

Uh oh!

srowen commented Feb 18, 2022

Uh oh!

wangyum commented Feb 20, 2022

Uh oh!

srowen commented Feb 20, 2022

Uh oh!

dongjoon-hyun commented Feb 20, 2022

Uh oh!

srowen commented Feb 20, 2022

wangyum commented Oct 22, 2021•
edited
Loading

wangyumOct 22, 2021•
edited
Loading

dongjoon-hyun left a comment •
edited
Loading

dongjoon-hyun left a comment •
edited
Loading