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 E5E5018C5B for ; Thu, 10 Dec 2015 17:07:21 +0000 (UTC) Received: (qmail 44892 invoked by uid 500); 10 Dec 2015 17:07:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 44725 invoked by uid 500); 10 Dec 2015 17:07:21 -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 44567 invoked by uid 99); 10 Dec 2015 17:07:21 -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; Thu, 10 Dec 2015 17:07:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78325E17D4; Thu, 10 Dec 2015 17:07:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Thu, 10 Dec 2015 17:07:24 -0000 Message-Id: <36eb1dd550bd4b73a57650044853ad71@git.apache.org> In-Reply-To: <2a14b7db94a54f1497a68bdbc59cf3b6@git.apache.org> References: <2a14b7db94a54f1497a68bdbc59cf3b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cxf git commit: Fixing merge Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b1fc5e49 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b1fc5e49 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b1fc5e49 Branch: refs/heads/3.0.x-fixes Commit: b1fc5e49b0f1aa90e529ec473591e6ed735c44da Parents: 808558f Author: Colm O hEigeartaigh Authored: Thu Dec 10 17:07:07 2015 +0000 Committer: Colm O hEigeartaigh Committed: Thu Dec 10 17:07:07 2015 +0000 ---------------------------------------------------------------------- .../rs/security/oidc/idp/IdTokenResponseFilter.java | 13 ++----------- .../apache/cxf/rs/security/oidc/utils/OidcUtils.java | 1 + 2 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b1fc5e49/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java index 8f2ef01..2f4e371 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java @@ -33,21 +33,12 @@ public class IdTokenResponseFilter extends AbstractOAuthServerJoseJwtProducer im private String issuer; @Override public void process(ClientAccessToken ct, ServerAccessToken st) { -<<<<<<< HEAD - // This may also be done directly inside a data provider code creating the server token -======= // Only add an IdToken if the client has the "openid" scope if (ct.getApprovedScope() == null || !ct.getApprovedScope().contains(OidcUtils.OPENID_SCOPE)) { return; } - String idToken = getProcessedIdToken(st); - if (idToken != null) { - ct.getParameters().put(OidcUtils.ID_TOKEN, idToken); - } - - } - private String getProcessedIdToken(ServerAccessToken st) { ->>>>>>> dc1a867... Only issue an IdToken if the client has the correct scope (for OpenId) + + // This may also be done directly inside a data provider code creating the server token if (userInfoProvider != null) { IdToken token = userInfoProvider.getIdToken(st.getClient().getClientId(), st.getSubject(), st.getScopes()); http://git-wip-us.apache.org/repos/asf/cxf/blob/b1fc5e49/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java index 7ced717..7aa06a1 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java @@ -33,6 +33,7 @@ import org.apache.cxf.rt.security.crypto.MessageDigestUtils; public final class OidcUtils { public static final String ID_TOKEN = "id_token"; + public static final String OPENID_SCOPE = "openid"; public static final String OIDC_SCOPE = "oidc"; public static final String PROFILE_SCOPE = "profile"; public static final String EMAIL_SCOPE = "email";