[hive] branch master updated: HIVE-22675: Replace Base64 in hive-standalone-metastore Package (David Mollitor, reviewed by Ashutosh Chauhan)

[dm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dmollitor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 64b8c0b  HIVE-22675: Replace Base64 in hive-standalone-metastore Package (David Mollitor, reviewed by Ashutosh Chauhan)
64b8c0b is described below

commit 64b8c0bbacc3bfaa973d1d1636bf07dff4231db4
Author: David Mollitor <dm...@apache.org>
AuthorDate: Wed Jun 3 12:55:48 2020 -0400

    HIVE-22675: Replace Base64 in hive-standalone-metastore Package (David Mollitor, reviewed by Ashutosh Chauhan)
---
 .../org/apache/hadoop/hive/metastore/security/DBTokenStore.java   | 8 ++++----
 .../security/TokenStoreDelegationTokenSecretManager.java          | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java
index f59915c..de68810 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/DBTokenStore.java
@@ -21,9 +21,9 @@ package org.apache.hadoop.hive.metastore.security;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.metastore.security.HadoopThriftAuthBridge.Server.ServerMode;
@@ -66,8 +66,8 @@ public class DBTokenStore implements DelegationTokenStore {
 
     try {
       String identifier = TokenStoreDelegationTokenSecretManager.encodeWritable(tokenIdentifier);
-      String tokenStr = Base64.encodeBase64URLSafeString(
-        MetastoreDelegationTokenSupport.encodeDelegationTokenInformation(token));
+      String tokenStr = Base64.getUrlEncoder()
+          .encodeToString(MetastoreDelegationTokenSupport.encodeDelegationTokenInformation(token));
       boolean result = (Boolean)invokeOnTokenStore("addToken", new Object[] {identifier, tokenStr},
         String.class, String.class);
       LOG.trace("addToken: tokenIdentifier = {}, added = {}", tokenIdentifier, result);
@@ -85,7 +85,7 @@ public class DBTokenStore implements DelegationTokenStore {
           TokenStoreDelegationTokenSecretManager.encodeWritable(tokenIdentifier)}, String.class);
       DelegationTokenInformation result = null;
       if (StringUtils.isNotEmpty(tokenStr)) {
-        result = MetastoreDelegationTokenSupport.decodeDelegationTokenInformation(Base64.decodeBase64(tokenStr));
+        result = MetastoreDelegationTokenSupport.decodeDelegationTokenInformation(Base64.getUrlDecoder().decode(tokenStr));
       }
       LOG.trace("getToken: tokenIdentifier = {}, result = {}", tokenIdentifier, result);
       return result;
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java
index ee2ace8..6b58f2f 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/security/TokenStoreDelegationTokenSecretManager.java
@@ -25,12 +25,12 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.security.token.Token;
 import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenIdentifier;
@@ -176,11 +176,11 @@ public class TokenStoreDelegationTokenSecretManager extends DelegationTokenSecre
     DataOutputStream dos = new DataOutputStream(bos);
     key.write(dos);
     dos.flush();
-    return Base64.encodeBase64URLSafeString(bos.toByteArray());
+    return Base64.getUrlEncoder().encodeToString(bos.toByteArray());
   }
 
   public static void decodeWritable(Writable w, String idStr) throws IOException {
-    DataInputStream in = new DataInputStream(new ByteArrayInputStream(Base64.decodeBase64(idStr)));
+    DataInputStream in = new DataInputStream(new ByteArrayInputStream(Base64.getUrlDecoder().decode(idStr)));
     w.readFields(in);
   }