This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 74aa894 Revert "[SPARK-37090][BUILD][3.2] Upgrade libthrift to 0.16.0
to avoid security vulnerabilities"
74aa894 is described below
commit 74aa894246bc1953a6b72476fd3907b6707e72ce
Author: Dongjoon Hyun <dongj...@apache.org>
AuthorDate: Tue Mar 1 22:21:10 2022 -0800
Revert "[SPARK-37090][BUILD][3.2] Upgrade libthrift to 0.16.0 to avoid
security vulnerabilities"
This reverts commit 286891b8601844ba4e484ab46a9fcad740d7c939.
---
dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 2 +-
dev/deps/spark-deps-hadoop-3.2-hive-2.3 | 2 +-
pom.xml | 6 +-
.../apache/hive/service/auth/HiveAuthFactory.java | 2 +-
.../hive/service/auth/KerberosSaslHelper.java | 5 +-
.../apache/hive/service/auth/PlainSaslHelper.java | 3 +-
.../hive/service/auth/TSetIpAddressProcessor.java | 5 +-
.../service/cli/thrift/ThriftBinaryCLIService.java | 6 +
.../hive/service/cli/thrift/ThriftCLIService.java | 10 --
.../apache/thrift/transport/TFramedTransport.java | 200 ---------------------
10 files changed, 15 insertions(+), 226 deletions(-)
diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3
b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
index 4ff9cb5..c2882bd 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
@@ -178,7 +178,7 @@
kubernetes-model-storageclass/5.4.1//kubernetes-model-storageclass-5.4.1.jar
lapack/2.2.1//lapack-2.2.1.jar
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
libfb303/0.9.3//libfb303-0.9.3.jar
-libthrift/0.16.0//libthrift-0.16.0.jar
+libthrift/0.12.0//libthrift-0.12.0.jar
log4j/1.2.17//log4j-1.2.17.jar
logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar
lz4-java/1.7.1//lz4-java-1.7.1.jar
diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3
b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
index 4aeca7d..be4c7b8 100644
--- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
@@ -149,7 +149,7 @@
kubernetes-model-storageclass/5.4.1//kubernetes-model-storageclass-5.4.1.jar
lapack/2.2.1//lapack-2.2.1.jar
leveldbjni-all/1.8//leveldbjni-all-1.8.jar
libfb303/0.9.3//libfb303-0.9.3.jar
-libthrift/0.16.0//libthrift-0.16.0.jar
+libthrift/0.12.0//libthrift-0.12.0.jar
log4j/1.2.17//log4j-1.2.17.jar
logging-interceptor/3.12.12//logging-interceptor-3.12.12.jar
lz4-java/1.7.1//lz4-java-1.7.1.jar
diff --git a/pom.xml b/pom.xml
index 8d93870..a161991 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,7 @@
<joda.version>2.10.10</joda.version>
<jodd.version>3.5.2</jodd.version>
<jsr305.version>3.0.0</jsr305.version>
- <libthrift.version>0.16.0</libthrift.version>
+ <libthrift.version>0.12.0</libthrift.version>
<antlr4.version>4.8</antlr4.version>
<jpam.version>1.1</jpam.version>
<selenium.version>3.141.59</selenium.version>
@@ -2403,10 +2403,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/HiveAuthFactory.java
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/HiveAuthFactory.java
index c3ab28d..fbb5230 100644
---
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/HiveAuthFactory.java
+++
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/HiveAuthFactory.java
@@ -250,7 +250,7 @@ public class HiveAuthFactory {
}
}
- public static TTransport getSocketTransport(String host, int port, int
loginTimeout) throws TTransportException {
+ public static TTransport getSocketTransport(String host, int port, int
loginTimeout) {
return new TSocket(host, port, loginTimeout);
}
diff --git
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/KerberosSaslHelper.java
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/KerberosSaslHelper.java
index ef91f94..175412e 100644
---
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/KerberosSaslHelper.java
+++
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/KerberosSaslHelper.java
@@ -30,7 +30,6 @@ import org.apache.thrift.TProcessor;
import org.apache.thrift.TProcessorFactory;
import org.apache.thrift.transport.TSaslClientTransport;
import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
public final class KerberosSaslHelper {
@@ -69,8 +68,8 @@ public final class KerberosSaslHelper {
new TSaslClientTransport("GSSAPI", null, names[0], names[1],
saslProps, null,
underlyingTransport);
return new TSubjectAssumingTransport(saslTransport);
- } catch (SaslException | TTransportException se) {
- throw new IOException("Could not instantiate transport", se);
+ } catch (SaslException se) {
+ throw new IOException("Could not instantiate SASL transport", se);
}
}
diff --git
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/PlainSaslHelper.java
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/PlainSaslHelper.java
index 5ac2995..c06f6ec 100644
---
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/PlainSaslHelper.java
+++
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/PlainSaslHelper.java
@@ -38,7 +38,6 @@ import org.apache.thrift.TProcessorFactory;
import org.apache.thrift.transport.TSaslClientTransport;
import org.apache.thrift.transport.TSaslServerTransport;
import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
import org.apache.thrift.transport.TTransportFactory;
public final class PlainSaslHelper {
@@ -65,7 +64,7 @@ public final class PlainSaslHelper {
}
public static TTransport getPlainTransport(String username, String password,
- TTransport underlyingTransport) throws SaslException, TTransportException {
+ TTransport underlyingTransport) throws SaslException {
return new TSaslClientTransport("PLAIN", null, null, null, new
HashMap<String, String>(),
new PlainCallbackHandler(username, password), underlyingTransport);
}
diff --git
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
index b727b4e..1205d21 100644
---
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
+++
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/auth/TSetIpAddressProcessor.java
@@ -45,12 +45,11 @@ public class TSetIpAddressProcessor<I extends Iface>
extends TCLIService.Process
}
@Override
- public void process(final TProtocol in, final TProtocol out) throws
TException {
+ public boolean process(final TProtocol in, final TProtocol out) throws
TException {
setIpAddress(in);
setUserName(in);
try {
- super.process(in, out);
- return;
+ return super.process(in, out);
} finally {
THREAD_LOCAL_USER_NAME.remove();
THREAD_LOCAL_IP_ADDRESS.remove();
diff --git
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftBinaryCLIService.java
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftBinaryCLIService.java
index 025c85e..a980b51 100644
---
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftBinaryCLIService.java
+++
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftBinaryCLIService.java
@@ -90,10 +90,16 @@ public class ThriftBinaryCLIService extends
ThriftCLIService {
// Server args
int maxMessageSize =
hiveConf.getIntVar(HiveConf.ConfVars.HIVE_SERVER2_THRIFT_MAX_MESSAGE_SIZE);
+ int requestTimeout = (int) hiveConf.getTimeVar(
+ HiveConf.ConfVars.HIVE_SERVER2_THRIFT_LOGIN_TIMEOUT,
TimeUnit.SECONDS);
+ int beBackoffSlotLength = (int) hiveConf.getTimeVar(
+ HiveConf.ConfVars.HIVE_SERVER2_THRIFT_LOGIN_BEBACKOFF_SLOT_LENGTH,
TimeUnit.MILLISECONDS);
TThreadPoolServer.Args sargs = new TThreadPoolServer.Args(serverSocket)
.processorFactory(processorFactory).transportFactory(transportFactory)
.protocolFactory(new TBinaryProtocol.Factory())
.inputProtocolFactory(new TBinaryProtocol.Factory(true, true,
maxMessageSize, maxMessageSize))
+ .requestTimeout(requestTimeout).requestTimeoutUnit(TimeUnit.SECONDS)
+
.beBackoffSlotLength(beBackoffSlotLength).beBackoffSlotLengthUnit(TimeUnit.MILLISECONDS)
.executorService(executorService);
// TCP Server
diff --git
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
index ddbe89b..4a223c8 100644
---
a/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
+++
b/sql/hive-thriftserver/src/main/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java
@@ -83,16 +83,6 @@ public abstract class ThriftCLIService extends
AbstractService implements TCLISe
public SessionHandle getSessionHandle() {
return sessionHandle;
}
-
- @Override
- public <T> T unwrap(Class<T> aClass) {
- return null;
- }
-
- @Override
- public boolean isWrapperFor(Class<?> aClass) {
- return false;
- }
}
public ThriftCLIService(CLIService service, String serviceName) {
diff --git
a/sql/hive/src/main/java/org/apache/thrift/transport/TFramedTransport.java
b/sql/hive/src/main/java/org/apache/thrift/transport/TFramedTransport.java
deleted file mode 100644
index 4b32108..0000000
--- a/sql/hive/src/main/java/org/apache/thrift/transport/TFramedTransport.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.thrift.transport;
-
-
-import org.apache.thrift.TByteArrayOutputStream;
-import org.apache.thrift.TConfiguration;
-
-/**
- * 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.
- */
-public class TFramedTransport extends TTransport {
-
- protected static final int DEFAULT_MAX_LENGTH = 16384000;
-
- private int maxLength_;
-
- /**
- * Underlying transport
- */
- private TTransport transport_ = null;
-
- /**
- * Buffer for output
- */
- private final TByteArrayOutputStream writeBuffer_ =
- new TByteArrayOutputStream(1024);
-
- /**
- * Buffer for input
- */
- private final TMemoryInputTransport readBuffer_ =
- new TMemoryInputTransport(new byte[0]);
-
- public static class Factory extends TTransportFactory {
- private int maxLength_;
-
- public Factory() {
- maxLength_ = TFramedTransport.DEFAULT_MAX_LENGTH;
- }
-
- public Factory(int maxLength) {
- maxLength_ = maxLength;
- }
-
- @Override
- public TTransport getTransport(TTransport base) throws TTransportException
{
- return new TFramedTransport(base, maxLength_);
- }
- }
-
- /**
- * Constructor wraps around another transport
- */
- public TFramedTransport(TTransport transport, int maxLength) throws
TTransportException {
- transport_ = transport;
- maxLength_ = maxLength;
- }
-
- public TFramedTransport(TTransport transport) throws TTransportException {
- transport_ = transport;
- maxLength_ = TFramedTransport.DEFAULT_MAX_LENGTH;
- }
-
- public void open() throws TTransportException {
- transport_.open();
- }
-
- public boolean isOpen() {
- return transport_.isOpen();
- }
-
- public void close() {
- transport_.close();
- }
-
- public int read(byte[] buf, int off, int len) throws TTransportException {
- int got = readBuffer_.read(buf, off, len);
- if (got > 0) {
- return got;
- }
-
- // Read another frame of data
- readFrame();
-
- return readBuffer_.read(buf, off, len);
- }
-
- @Override
- public byte[] getBuffer() {
- return readBuffer_.getBuffer();
- }
-
- @Override
- public int getBufferPosition() {
- return readBuffer_.getBufferPosition();
- }
-
- @Override
- public int getBytesRemainingInBuffer() {
- return readBuffer_.getBytesRemainingInBuffer();
- }
-
- @Override
- public void consumeBuffer(int len) {
- readBuffer_.consumeBuffer(len);
- }
-
- @Override
- public TConfiguration getConfiguration() {
- return null;
- }
-
- @Override
- public void updateKnownMessageSize(long l) throws TTransportException {
-
- }
-
- @Override
- public void checkReadBytesAvailable(long l) throws TTransportException {
-
- }
-
- public void clear() {
- readBuffer_.clear();
- }
-
- private final byte[] i32buf = new byte[4];
-
- private void readFrame() throws TTransportException {
- transport_.readAll(i32buf, 0, 4);
- int size = decodeFrameSize(i32buf);
-
- if (size < 0) {
- close();
- throw new TTransportException(TTransportException.CORRUPTED_DATA,
- "Read a negative frame size (" + size + ")!");
- }
-
- if (size > maxLength_) {
- close();
- throw new TTransportException(TTransportException.CORRUPTED_DATA,
- "Frame size (" + size + ") larger than max length (" + maxLength_ +
")!");
- }
-
- byte[] buff = new byte[size];
- transport_.readAll(buff, 0, size);
- readBuffer_.reset(buff);
- }
-
- public void write(byte[] buf, int off, int len) throws TTransportException {
- writeBuffer_.write(buf, off, len);
- }
-
- @Override
- public void flush() throws TTransportException {
- byte[] buf = writeBuffer_.get();
- int len = writeBuffer_.len();
- writeBuffer_.reset();
-
- encodeFrameSize(len, i32buf);
- transport_.write(i32buf, 0, 4);
- transport_.write(buf, 0, len);
- transport_.flush();
- }
-
- public static final void encodeFrameSize(final int frameSize, final byte[]
buf) {
- buf[0] = (byte)(0xff & (frameSize >> 24));
- buf[1] = (byte)(0xff & (frameSize >> 16));
- buf[2] = (byte)(0xff & (frameSize >> 8));
- buf[3] = (byte)(0xff & (frameSize));
- }
-
- public static final int decodeFrameSize(final byte[] buf) {
- return
- ((buf[0] & 0xff) << 24) |
- ((buf[1] & 0xff) << 16) |
- ((buf[2] & 0xff) << 8) |
- ((buf[3] & 0xff));
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
