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 2016/11/15 14:34:05 UTC
[1/2] tinkerpop git commit: Improved error message for authentication
message formatting problems. CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 eaa26170c -> 02f166407
Improved error message for authentication message formatting problems. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/26db14e7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/26db14e7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/26db14e7
Branch: refs/heads/tp32
Commit: 26db14e7dafcb11e4b3bf933bfc7f6cb6def4e79
Parents: c20d814
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Nov 15 09:32:41 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Nov 15 09:32:41 2016 -0500
----------------------------------------------------------------------
.../gremlin/server/handler/SaslAuthenticationHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/26db14e7/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 de7f624..4bb7879 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
@@ -83,7 +83,7 @@ public class SaslAuthenticationHandler extends ChannelInboundHandlerAdapter {
saslResponse = Base64.getDecoder().decode((String) saslObject);
} else {
final ResponseMessage error = ResponseMessage.build(request.get())
- .statusMessage("Incorrect type for : " + Tokens.ARGS_SASL + ". byte[] or String is expected")
+ .statusMessage("Incorrect type for : " + Tokens.ARGS_SASL + " - byte[] or base64 encoded String is expected")
.code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST).create();
ctx.writeAndFlush(error);
return;
[2/2] tinkerpop git commit: Merge branch 'tp31' into tp32
Posted by sp...@apache.org.
Merge branch 'tp31' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02f16640
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02f16640
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02f16640
Branch: refs/heads/tp32
Commit: 02f166407dfdeff3fd2e98a57cb6b6229ac9aa80
Parents: eaa2617 26db14e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Nov 15 09:33:27 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Nov 15 09:33:27 2016 -0500
----------------------------------------------------------------------
.../gremlin/server/handler/SaslAuthenticationHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------