drill-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sudheeshkatkam <...@git.apache.org>
Subject [GitHub] drill pull request #578: DRILL-4280: Kerberos Authentication
Date Tue, 01 Nov 2016 16:38:44 GMT
Github user sudheeshkatkam commented on a diff in the pull request:

    https://github.com/apache/drill/pull/578#discussion_r85853989
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserServer.java
---
    @@ -328,44 +304,73 @@ protected void consumeHandshake(ChannelHandlerContext ctx, UserToBitHandshake
in
           public BitToUserHandshake getHandshakeResponse(UserToBitHandshake inbound) throws
Exception {
             logger.trace("Handling handshake from user to bit. {}", inbound);
     
    -
             // if timeout is unsupported or is set to false, disable timeout.
             if (!inbound.hasSupportTimeout() || !inbound.getSupportTimeout()) {
               connection.disableReadTimeout();
               logger.warn("Timeout Disabled as client doesn't support it.", connection.getName());
             }
     
    -        BitToUserHandshake.Builder respBuilder = BitToUserHandshake.newBuilder()
    +        final BitToUserHandshake.Builder respBuilder = BitToUserHandshake.newBuilder()
                 .setRpcVersion(UserRpcConfig.RPC_VERSION);
     
             try {
    -          if (inbound.getRpcVersion() != UserRpcConfig.RPC_VERSION) {
    -            final String errMsg = String.format("Invalid rpc version. Expected %d, actual
%d.",
    -                UserRpcConfig.RPC_VERSION, inbound.getRpcVersion());
    +          if (!SUPPORTED_RPC_VERSIONS.contains(inbound.getRpcVersion())) {
    +            final String errMsg = String.format("Invalid rpc version. Expected %s, actual
%d.",
    +                SUPPORTED_RPC_VERSIONS, inbound.getRpcVersion());
     
                 return handleFailure(respBuilder, HandshakeStatus.RPC_VERSION_MISMATCH, errMsg,
null);
               }
     
    -          if (authenticator != null) {
    +          connection.setHandshake(inbound);
    +
    +          if (authFactory == null) { // authentication is disabled
    +            connection.finalizeSession(inbound.getCredentials().getUserName());
    +            respBuilder.setStatus(HandshakeStatus.SUCCESS);
    +            return respBuilder.build();
    +          }
    +
    +          if (inbound.getRpcVersion() == NON_SASL_RPC_VERSION_SUPPORTED) { // for backward
compatibility
    +            final String userName = inbound.getCredentials().getUserName();
    +            if (logger.isTraceEnabled()) {
    +              logger.trace("User {} on connection {} is using an older client (Drill
version <= 1.8).",
    +                  userName, connection.getRemoteAddress());
    +            }
                 try {
                   String password = "";
                   final UserProperties props = inbound.getProperties();
                   for (int i = 0; i < props.getPropertiesCount(); i++) {
                     Property prop = props.getProperties(i);
    -                if (UserSession.PASSWORD.equalsIgnoreCase(prop.getKey())) {
    +                if (ConnectionParameters.PASSWORD.equalsIgnoreCase(prop.getKey())) {
                       password = prop.getValue();
                       break;
                     }
                   }
    -              authenticator.authenticate(inbound.getCredentials().getUserName(), password);
    +              final PlainMechanism plainMechanism = authFactory.getPlainMechanism();
    +              if (plainMechanism == null) {
    +                throw new UserAuthenticationException("The server no longer supports
username/password" +
    +                    " based authentication. Please talk to your system administrator.");
    +              }
    +              plainMechanism.getAuthenticator()
    +                  .authenticate(userName, password);
    +              connection.changeHandlerTo(handler);
    +              connection.finalizeSession(userName);
    +              respBuilder.setStatus(HandshakeStatus.SUCCESS);
    --- End diff --
    
    I remember making that change. Missed this PR somehow. Fixed.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message