You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/07/11 18:11:03 UTC
tinkerpop git commit: Remove byte array from sasl return.
Repository: tinkerpop
Updated Branches:
refs/heads/master 79d138a5d -> 138aacd75
Remove byte array from sasl return.
This should have been done back TINKERPOP-1603 but it was missed CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/138aacd7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/138aacd7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/138aacd7
Branch: refs/heads/master
Commit: 138aacd757e9db7b66aaf50f226c8130647fdc05
Parents: 79d138a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Jul 11 14:06:07 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Jul 11 14:06:07 2017 -0400
----------------------------------------------------------------------
.../gremlin/server/handler/SaslAuthenticationHandler.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/138aacd7/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
index 778a003..077d05a 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
@@ -115,14 +115,12 @@ public class SaslAuthenticationHandler extends AbstractAuthenticationHandler {
final RequestMessage original = request.get();
ctx.fireChannelRead(original);
} else {
- // not done here - send back the sasl message for next challenge. note that we send back
- // the base64 encoded sasl as well as the byte array. the byte array will eventually be
- // phased out, but is present now for backward compatibility in 3.2.x
+ // not done here - send back the sasl message for next challenge.
final Map<String,Object> metadata = new HashMap<>();
metadata.put(Tokens.ARGS_SASL, BASE64_ENCODER.encodeToString(saslMessage));
final ResponseMessage authenticate = ResponseMessage.build(requestMessage)
.statusAttributes(metadata)
- .code(ResponseStatusCode.AUTHENTICATE).result(saslMessage).create();
+ .code(ResponseStatusCode.AUTHENTICATE).create();
ctx.writeAndFlush(authenticate);
}
} catch (AuthenticationException ae) {