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 f59915c14f..de68810b66 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 @@ 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 boolean addToken(DelegationTokenIdentifier tokenIdentifier, 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 DelegationTokenInformation getToken(DelegationTokenIdentifier tokenIdenti 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 ee2ace8cbe..6b58f2f97b 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.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 static String encodeWritable(Writable key) throws IOException { 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); }