Skip to content

HIVE-25996: Backport HIVE-25098 to branch-2.3 #3066

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

Merged
sunchao merged 2 commits into from
Jul 28, 2023
Merged

HIVE-25996: Backport HIVE-25098 to branch-2.3 #3066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3a492
HIVE-25996: Backport HIVE-21498 and HIVE-25098 to fix CVE-2020-13949
wangyum Mar 2, 2022
157bbe4
Rebase
wangyum Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions common/src/java/org/apache/hadoop/hive/common/auth/HiveAuthUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLSocket;

import org.apache.thrift.TConfiguration;
import org.apache.thrift.transport.TSSLTransportFactory;
import org.apache.thrift.transport.TServerSocket;
import org.apache.thrift.transport.TSocket;
Expand All @@ -42,8 +43,8 @@
public class HiveAuthUtils {
private static final Logger LOG = LoggerFactory.getLogger(HiveAuthUtils.class);

public static TTransport getSocketTransport(String host, int port, int loginTimeout) {
return new TSocket(host, port, loginTimeout);
public static TTransport getSocketTransport(String host, int port, int loginTimeout) throws TTransportException {
return new TSocket(new TConfiguration(), host, port, loginTimeout);
}

public static TTransport getSSLSocket(String host, int port, int loginTimeout)
Expand Down
4 changes: 2 additions & 2 deletions ...-extensions/src/main/java/org/apache/hive/hcatalog/messaging/json/JSONMessageFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@ public Map<String, String> apply(@Nullable Partition partition) {

static String createFunctionObjJson(Function functionObj) throws TException {
TSerializer serializer = new TSerializer(new TJSONProtocol.Factory());
return serializer.toString(functionObj, "UTF-8");
return serializer.toString(functionObj);
}

static String createIndexObjJson(Index indexObj) throws TException {
TSerializer serializer = new TSerializer(new TJSONProtocol.Factory());
return serializer.toString(indexObj, "UTF-8");
return serializer.toString(indexObj);
}
}
6 changes: 3 additions & 3 deletions ...ebhcat/java-client/src/main/java/org/apache/hive/hcatalog/api/MetadataJSONSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class MetadataJSONSerializer extends MetadataSerializer {
public String serializeTable(HCatTable hcatTable) throws HCatException {
try {
return new TSerializer(new TJSONProtocol.Factory())
.toString(hcatTable.toHiveTable(), "UTF-8");
.toString(hcatTable.toHiveTable());
}
catch (TException exception) {
throw new HCatException("Could not serialize HCatTable: " + hcatTable, exception);
Expand All @@ -74,7 +74,7 @@ public HCatTable deserializeTable(String hcatTableStringRep) throws HCatExceptio
public String serializePartition(HCatPartition hcatPartition) throws HCatException {
try {
return new TSerializer(new TJSONProtocol.Factory())
.toString(hcatPartition.toHivePartition(), "UTF-8");
.toString(hcatPartition.toHivePartition());
}
catch (TException exception) {
throw new HCatException("Could not serialize HCatPartition: " + hcatPartition, exception);
Expand Down Expand Up @@ -103,7 +103,7 @@ public List<String> serializePartitionSpec(HCatPartitionSpec hcatPartitionSpec)
List<String> stringReps = new ArrayList<String>();
TSerializer serializer = new TSerializer(new TJSONProtocol.Factory());
for (PartitionSpec partitionSpec : hcatPartitionSpec.partitionSpecProxy.toPartitionSpec()) {
stringReps.add(serializer.toString(partitionSpec, "UTF-8"));
stringReps.add(serializer.toString(partitionSpec));
}
return stringReps;
}
Expand Down
Loading