Github user sudheeshkatkam commented on a diff in the pull request: https://github.com/apache/drill/pull/578#discussion_r102396769 --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataClient.java --- @@ -75,27 +87,118 @@ public MessageLite getResponseDefaultInstance(int rpcType) throws RpcException { } @Override - protected Response handle(DataClientConnection connection, int rpcType, ByteBuf pBody, ByteBuf dBody) throws RpcException { + protected void handle(DataClientConnection connection, int rpcType, ByteBuf pBody, ByteBuf dBody, + ResponseSender sender) throws RpcException { throw new UnsupportedOperationException("DataClient is unidirectional by design."); } BufferAllocator getAllocator() { - return allocator; + return config.getAllocator(); } @Override protected void validateHandshake(BitServerHandshake handshake) throws RpcException { if (handshake.getRpcVersion() != DataRpcConfig.RPC_VERSION) { - throw new RpcException(String.format("Invalid rpc version. Expected %d, actual %d.", handshake.getRpcVersion(), DataRpcConfig.RPC_VERSION)); + throw new RpcException(String.format("Invalid rpc version. Expected %d, actual %d.", + handshake.getRpcVersion(), DataRpcConfig.RPC_VERSION)); + } + + if (handshake.getAuthenticationMechanismsCount() != 0) { // remote requires authentication + final SaslClient saslClient; + try { + saslClient = config.getAuthFactory(handshake.getAuthenticationMechanismsList()) + .createSaslClient(UserGroupInformation.getLoginUser(), + config.getSaslClientProperties(remoteEndpoint)); + } catch (final IOException e) { + throw new RpcException(String.format("Failed to initiate authenticate to %s", remoteEndpoint.getAddress()), e); + } + if (saslClient == null) { + throw new RpcException("Unexpected failure. Could not initiate SASL exchange."); + } + connection.setSaslClient(saslClient); + } else { + if (config.getAuthMechanismToUse() != null) { + throw new RpcException(String.format("Drillbit (%s) does not require auth, but auth is enabled.", + remoteEndpoint.getAddress())); + } } } @Override - protected void finalizeConnection(BitServerHandshake handshake, DataClientConnection connection) { + protected <M extends MessageLite> RpcCommand<M, DataClientConnection> + getInitialCommand(final RpcCommand<M, DataClientConnection> command) { + if (config.getAuthMechanismToUse() == null) { + return super.getInitialCommand(command); + } else { + return new AuthenticationCommand<>(command); --- End diff -- Yes.
--- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---