You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by da...@apache.org on 2017/03/01 21:39:22 UTC

kudu git commit: Java Client: authenticate with login username when using SASL PLAIN

Repository: kudu
Updated Branches:
  refs/heads/master abbd09a57 -> 55c3db350


Java Client: authenticate with login username when using SASL PLAIN

Also tweaks up some logging output I noticed when reviewing the
negotiation tests for this change.

Change-Id: I2a4234d4620af6c7e6fe5314b68f7f173252b208
Reviewed-on: http://gerrit.cloudera.org:8080/6209
Reviewed-by: Jean-Daniel Cryans <jd...@apache.org>
Tested-by: Kudu Jenkins


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/55c3db35
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/55c3db35
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/55c3db35

Branch: refs/heads/master
Commit: 55c3db350bd77d849f7cbba091b2a5f0c213cf29
Parents: abbd09a
Author: Dan Burkert <da...@apache.org>
Authored: Wed Mar 1 12:41:36 2017 -0800
Committer: Dan Burkert <da...@apache.org>
Committed: Wed Mar 1 21:38:54 2017 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/kudu/client/Negotiator.java  | 14 ++++++--------
 .../java/org/apache/kudu/client/TestNegotiator.java   | 10 +++++++---
 2 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/55c3db35/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java b/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java
index 25d0ac2..95e7219 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java
@@ -87,8 +87,7 @@ import org.apache.kudu.util.SecurityUtil;
  */
 @InterfaceAudience.Private
 public class Negotiator extends SimpleChannelUpstreamHandler {
-
-  static final Logger LOG = LoggerFactory.getLogger(TabletClient.class);
+  static final Logger LOG = LoggerFactory.getLogger(Negotiator.class);
 
   private static final SaslClientCallbackHandler SASL_CALLBACK = new SaslClientCallbackHandler();
   private static final Set<RpcHeader.RpcFeatureFlag> SUPPORTED_RPC_FEATURES =
@@ -103,8 +102,6 @@ public class Negotiator extends SimpleChannelUpstreamHandler {
    */
   private static final String[] PRIORITIZED_MECHS = new String[] { "GSSAPI", "PLAIN" };
 
-  static final String USER_AND_PASSWORD = "java_client";
-
   static final int CONNECTION_CTX_CALL_ID = -3;
   static final int SASL_CALL_ID = -33;
 
@@ -625,8 +622,9 @@ public class Negotiator extends SimpleChannelUpstreamHandler {
 
     // The UserInformationPB is deprecated, but used by servers prior to Kudu 1.1.
     RpcHeader.UserInformationPB.Builder userBuilder = RpcHeader.UserInformationPB.newBuilder();
-    userBuilder.setEffectiveUser(Negotiator.USER_AND_PASSWORD);
-    userBuilder.setRealUser(Negotiator.USER_AND_PASSWORD);
+    String user = System.getProperty("user.name");
+    userBuilder.setEffectiveUser(user);
+    userBuilder.setRealUser(user);
     builder.setDEPRECATEDUserInfo(userBuilder.build());
     RpcHeader.ConnectionContextPB pb = builder.build();
     RpcHeader.RequestHeader.Builder header =
@@ -653,9 +651,9 @@ public class Negotiator extends SimpleChannelUpstreamHandler {
     public void handle(Callback[] callbacks) throws UnsupportedCallbackException {
       for (Callback callback : callbacks) {
         if (callback instanceof NameCallback) {
-          ((NameCallback) callback).setName(USER_AND_PASSWORD);
+          ((NameCallback) callback).setName(System.getProperty("user.name"));
         } else if (callback instanceof PasswordCallback) {
-          ((PasswordCallback) callback).setPassword(USER_AND_PASSWORD.toCharArray());
+          ((PasswordCallback) callback).setPassword(new char[0]);
         } else {
           throw new UnsupportedCallbackException(callback,
                                                  "Unrecognized SASL client callback");

http://git-wip-us.apache.org/repos/asf/kudu/blob/55c3db35/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiator.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiator.java b/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiator.java
index 945160c..108d92b 100644
--- a/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiator.java
+++ b/java/kudu-client/src/test/java/org/apache/kudu/client/TestNegotiator.java
@@ -55,8 +55,12 @@ import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Message;
 import com.google.protobuf.TextFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestNegotiator {
+  static final Logger LOG = LoggerFactory.getLogger(TestNegotiator.class);
+
   private DecoderEmbedder<Object> embedder;
   private SecurityContext secContext;
   private SSLEngine serverEngine;
@@ -137,7 +141,7 @@ public class TestNegotiator {
     RpcOutboundMessage msg = (RpcOutboundMessage)embedder.poll();
     ConnectionContextPB connCtx = (ConnectionContextPB)msg.getBody();
     assertEquals(Negotiator.CONNECTION_CTX_CALL_ID, msg.getHeaderBuilder().getCallId());
-    assertEquals("java_client", connCtx.getDEPRECATEDUserInfo().getRealUser());
+    assertEquals(System.getProperty("user.name"), connCtx.getDEPRECATEDUserInfo().getRealUser());
 
     // Expect the client to also emit a negotiation Result.
     Result result = (Result)embedder.poll();
@@ -207,8 +211,8 @@ public class TestNegotiator {
   }
 
   private static CallResponse runServerStep(SSLEngine engine,
-      ByteString clientTlsMessage) throws SSLException {
-    Negotiator.LOG.info("Handling TLS message from client: {}", clientTlsMessage.toByteArray());
+                                            ByteString clientTlsMessage) throws SSLException {
+    LOG.debug("Handling TLS message from client: {}", Bytes.hex(clientTlsMessage.toByteArray()));
     ByteBuffer dst = ByteBuffer.allocate(engine.getSession().getPacketBufferSize());
     ByteBuffer src = clientTlsMessage.asReadOnlyByteBuffer();
     do {