Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D72AC200BC1 for ; Wed, 16 Nov 2016 13:48:24 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D6046160B13; Wed, 16 Nov 2016 12:48:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 07494160B1F for ; Wed, 16 Nov 2016 13:48:23 +0100 (CET) Received: (qmail 62721 invoked by uid 500); 16 Nov 2016 12:48:23 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 62564 invoked by uid 99); 16 Nov 2016 12:48:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Nov 2016 12:48:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB109F175A; Wed, 16 Nov 2016 12:48:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.apache.org Date: Wed, 16 Nov 2016 12:48:33 -0000 Message-Id: In-Reply-To: <1e145e44aa3e4606b080f97fad04dc89@git.apache.org> References: <1e145e44aa3e4606b080f97fad04dc89@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/29] tinkerpop git commit: Improved error message for authentication message formatting problems. CTR archived-at: Wed, 16 Nov 2016 12:48:25 -0000 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/TINKERPOP-1502 Commit: 26db14e7dafcb11e4b3bf933bfc7f6cb6def4e79 Parents: c20d814 Author: Stephen Mallette Authored: Tue Nov 15 09:32:41 2016 -0500 Committer: Stephen Mallette 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;