Github user sohami commented on a diff in the pull request:
https://github.com/apache/drill/pull/773#discussion_r113378601
--- Diff:
exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java
---
@@ -251,25 +255,67 @@ 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();
+
+ // Check the negotiated property before sending the response back to
client
+ try {
+ final String negotiatedQOP =
saslServer.getNegotiatedProperty(Sasl.QOP).toString();
+ final String expectedQOP = (connection.isEncryptionEnabled())
+ ? SaslProperties.QualityOfProtection.PRIVACY.getSaslQop()
+ : SaslProperties.QualityOfProtection.AUTHENTICATION.getSaslQop();
+
+ if (!(negotiatedQOP.equals(expectedQOP))) {
+ throw new SaslException(String.format("Mismatch in negotiated QOP
value: %s and Expected QOP value: %s",
+ negotiatedQOP, expectedQOP));
+ }
+
+ // Update the rawWrapSendSize with the negotiated rawSendSize since
we cannot call encode with more than the
+ // negotiated size of buffer
+ if (connection.isEncryptionEnabled()) {
+ final int negotiatedRawSendSize = Integer.parseInt(
+
saslServer.getNegotiatedProperty(Sasl.RAW_SEND_SIZE).toString());
+ if (negotiatedRawSendSize <= 0) {
+ throw new SaslException(String.format("Negotiated rawSendSize:
%d is invalid. Please check the configured " +
+ "value of encryption.sasl.max_wrapped_size. It might be
configured to a very small value.",
+ negotiatedRawSendSize));
+ }
+ connection.setWrapSizeLimit(negotiatedRawSendSize);
--- End diff --
Good catch!. Previous logic of having a new EncryptionContext object with
each connection was taking care of it. Didn't realized this while making the
change. Will have a separate EncryptionContext object for each connection and
initialize it with the passed object in constructor.
---
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.
---
