Github user sudheeshkatkam commented on a diff in the pull request:
https://github.com/apache/drill/pull/773#discussion_r110035650
--- Diff:
exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserServer.java ---
@@ -335,8 +350,27 @@ public BitToUserHandshake
getHandshakeResponse(UserToBitHandshake inbound) throw
}
}
- // mention server's authentication capabilities
-
respBuilder.addAllAuthenticationMechanisms(config.getAuthProvider().getAllFactoryNames());
+ // We are checking in UserConnectionConfig that if SASL
encryption is enabled then mechanisms other
+ // than PLAIN are also configured otherwise throw exception
+ final Set<String> configuredMech =
config.getAuthProvider().getAllFactoryNames();
+
+ if (!config.isEncryptionEnabled()) {
+
+ respBuilder.addAllAuthenticationMechanisms(configuredMech);
+ } else {
+ final Set<String> saslEncryptMech = new HashSet<>();
+
+ for (String mechanism : configuredMech) {
+ if
(!mechanism.equals(PlainFactory.SIMPLE_NAME.toLowerCase())) {
+ saslEncryptMech.add(mechanism);
+ }
+ }
+ respBuilder.addAllAuthenticationMechanisms(saslEncryptMech);
+ }
+
+ // set the encrypted flag in handshake message. For older
clients this field is optional so will be ignored
+ respBuilder.setEncrypted(connection.isEncrypted());
--- End diff --
Shouldn't these be set inside the above `else` block? The values are
invalid otherwise.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
