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 #773: DRILL-4335: Apache Drill should support network enc...
Date Wed, 05 Apr 2017 22:19:52 GMT
Github user sudheeshkatkam commented on a diff in the pull request:

    https://github.com/apache/drill/pull/773#discussion_r109960926
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java
---
    @@ -251,25 +256,62 @@ void process(SaslResponseContext<S, T> context) throws Exception
{
       private static <S extends ServerConnection<S>, T extends EnumLite>
       void handleSuccess(final SaslResponseContext<S, T> context, final SaslMessage.Builder
challenge,
                          final SaslServer saslServer) throws IOException {
    -    context.connection.changeHandlerTo(context.requestHandler);
    -    context.connection.finalizeSaslSession();
    -    context.sender.send(new Response(context.saslResponseType, challenge.build()));
     
    -    // setup security layers here..
    +    final S connection = context.connection;
    +    connection.changeHandlerTo(context.requestHandler);
    +    connection.finalizeSaslSession();
    +    context.sender.send(new Response(context.saslResponseType, challenge.build()));
     
         if (logger.isTraceEnabled()) {
    -      logger.trace("Authenticated {} successfully using {} from {}", saslServer.getAuthorizationID(),
    -          saslServer.getMechanismName(), context.remoteAddress);
    +      logger.trace("Authenticated {} successfully using {} from {} with encryption context
{}",
    +        saslServer.getAuthorizationID(), saslServer.getMechanismName(), connection.getRemoteAddress().toString(),
    +        connection.getEncryptionString());
    +    }
    +
    +    if (connection.isEncrypted()) {
    +      try {
    +        // Check if connection was marked for being secure then verify for negotiated
QOP value for correctness.
    +        final String negotiatedQOP = saslServer.getNegotiatedProperty(Sasl.QOP).toString();
    +        assert (negotiatedQOP.equals(SaslProperties.QualityOfProtection.PRIVACY.getSaslQop()));
    +
    +        // Update the rawWrapSendSize with the negotiated rawSendSize since we cannot
call encode with more than the
    +        // negotiated size of buffer
    +        final int negotiatedRawSendSize = Integer.parseInt(saslServer
    +                                                              .getNegotiatedProperty(SaslProperties.WRAP_RAW_SEND_SIZE)
    +                                                              .toString());
    +        if(negotiatedRawSendSize <= 0) {
    +          throw new SaslException(String.format("Negotiated rawSendSize: %d is invalid.
Please check the configured " +
    +            "value of sasl.encryption.encodesize. It might be configured to a very small
value.",
    +            negotiatedRawSendSize));
    +        }
    +        connection.setRawWrapSendSize(negotiatedRawSendSize);
    +        connection.addSecurityHandlers();
    +      } catch (IllegalStateException | NumberFormatException e) {
    +        throw new SaslException(String.format("Unexpected failure while retrieving negotiated
property values (%s)",
    +          e.getMessage()), e);
    +      }
    +    } else {
    +      // Encryption is not required hence we don't need to hold on to saslServer object.
    +      if (saslServer != null) {
    +        try {
    +          saslServer.dispose();
    --- End diff --
    
    Same comment as in for `saslClient`


---
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