Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BF1DF9E35 for ; Tue, 16 Dec 2014 16:48:53 +0000 (UTC) Received: (qmail 80669 invoked by uid 500); 16 Dec 2014 16:48:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 80607 invoked by uid 500); 16 Dec 2014 16:48:53 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 80598 invoked by uid 99); 16 Dec 2014 16:48:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Dec 2014 16:48:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1AA8EA2CBC0; Tue, 16 Dec 2014 16:48:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <234c381a115146f3825c0ee81f90cf92@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-6157] Minor update Date: Tue, 16 Dec 2014 16:48:53 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 27c2c25dc -> 716531d62 [CXF-6157] Minor update Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/716531d6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/716531d6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/716531d6 Branch: refs/heads/master Commit: 716531d62eaa8b1dde566e59e2a5ff0be1b2b33c Parents: 27c2c25 Author: Sergey Beryozkin Authored: Tue Dec 16 16:48:35 2014 +0000 Committer: Sergey Beryozkin Committed: Tue Dec 16 16:48:35 2014 +0000 ---------------------------------------------------------------------- .../rs/security/oauth2/provider/JoseSessionTokenProvider.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/716531d6/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java index 2e8f3bf..aad1dc4 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JoseSessionTokenProvider.java @@ -143,6 +143,7 @@ public class JoseSessionTokenProvider implements SessionAuthenticityTokenProvide state.setClientCodeVerifier(parts[2]); state.setState(parts[3]); state.setProposedScope(parts[4]); + state.setRedirectUri(parts[5]); return state; } protected String convertStateToString(OAuthRedirectionState secData) { @@ -161,7 +162,9 @@ public class JoseSessionTokenProvider implements SessionAuthenticityTokenProvide state.append(ModelEncryptionSupport.SEP); // 4: scope state.append(ModelEncryptionSupport.tokenizeString(secData.getProposedScope())); - + state.append(ModelEncryptionSupport.SEP); + // 5: redirect uri + state.append(ModelEncryptionSupport.tokenizeString(secData.getRedirectUri())); return null; }