diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java index f9350edcf01..93ad9245f65 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java @@ -145,14 +145,6 @@ public class HBaseSaslRpcClient extends AbstractHBaseSaslRpcClient { } } - try { - readStatus(inStream); - } catch (IOException e) { - if (e instanceof RemoteException) { - LOG.debug("Sasl connection failed: ", e); - throw e; - } - } if (LOG.isDebugEnabled()) { LOG.debug("SASL client context established. Negotiated QoP: " + saslClient.getNegotiatedProperty(Sasl.QOP)); diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java index 8d82ba538bd..60bd80fb58f 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java @@ -50,10 +50,8 @@ import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.DataOutputBuffer; -import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; -import org.junit.Assert; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; @@ -307,32 +305,4 @@ public class TestHBaseSaslRpcClient { private Token createTokenMock() { return mock(Token.class); } - - @Test(expected = IOException.class) - public void testFailedEvaluateResponse() throws IOException { - // prep mockin the SaslClient - SimpleSaslClientAuthenticationProvider mockProvider = - Mockito.mock(SimpleSaslClientAuthenticationProvider.class); - SaslClient mockClient = Mockito.mock(SaslClient.class); - Assert.assertNotNull(mockProvider); - Assert.assertNotNull(mockClient); - Mockito.when(mockProvider.createClient(Mockito.any(), Mockito.any(), Mockito.any(), - Mockito.any(), Mockito.anyBoolean(), Mockito.any())).thenReturn(mockClient); - HBaseSaslRpcClient rpcClient = new HBaseSaslRpcClient(HBaseConfiguration.create(), mockProvider, - createTokenMock(), Mockito.mock(InetAddress.class), Mockito.mock(SecurityInfo.class), false); - - // simulate getting an error from a failed saslServer.evaluateResponse - DataOutputBuffer errorBuffer = new DataOutputBuffer(); - errorBuffer.writeInt(SaslStatus.ERROR.state); - WritableUtils.writeString(errorBuffer, IOException.class.getName()); - WritableUtils.writeString(errorBuffer, "Invalid Token"); - - DataInputBuffer in = new DataInputBuffer(); - in.reset(errorBuffer.getData(), 0, errorBuffer.getLength()); - DataOutputBuffer out = new DataOutputBuffer(); - - // simulate that authentication exchange has completed quickly after sending the token - Mockito.when(mockClient.isComplete()).thenReturn(true); - rpcClient.saslConnect(in, out); - } }