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 BAA60200C34 for ; Mon, 27 Feb 2017 19:00:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B9363160B60; Mon, 27 Feb 2017 18:00:58 +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 13BC9160B5B for ; Mon, 27 Feb 2017 19:00:57 +0100 (CET) Received: (qmail 48203 invoked by uid 500); 27 Feb 2017 18:00:57 -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 48194 invoked by uid 99); 27 Feb 2017 18:00:57 -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; Mon, 27 Feb 2017 18:00:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1646FDFB0E; Mon, 27 Feb 2017 18:00:57 +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: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Updating OidcConfigurationService to report an end_session_endpoint address Date: Mon, 27 Feb 2017 18:00:57 +0000 (UTC) archived-at: Mon, 27 Feb 2017 18:00:58 -0000 Repository: cxf Updated Branches: refs/heads/master 52d774702 -> 34fd320f9 Updating OidcConfigurationService to report an end_session_endpoint address Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/34fd320f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/34fd320f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/34fd320f Branch: refs/heads/master Commit: 34fd320f91d933233aeb364120456f4fa0f220ac Parents: 52d7747 Author: Sergey Beryozkin Authored: Mon Feb 27 18:00:37 2017 +0000 Committer: Sergey Beryozkin Committed: Mon Feb 27 18:00:37 2017 +0000 ---------------------------------------------------------------------- .../oidc/idp/OidcConfigurationService.java | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/34fd320f/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcConfigurationService.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcConfigurationService.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcConfigurationService.java index 2563c93..bdc53d6 100644 --- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcConfigurationService.java +++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcConfigurationService.java @@ -33,6 +33,10 @@ public class OidcConfigurationService extends AuthorizationMetadataService { // Recommended - but optional private boolean userInfoEndpointNotAvailable; private String userInfoEndpointAddress; + + // Optional RP initiated logout + private boolean endSessionEndpointNotAvailable; + private String endSessionEndpointAddress; @Override protected void prepareConfigurationData(Map cfg, String baseUri) { @@ -49,6 +53,13 @@ public class OidcConfigurationService extends AuthorizationMetadataService { cfg.put("id_token_signing_alg_values_supported", Collections.singletonList(sigProps.get(JoseConstants.RSSEC_SIGNATURE_ALGORITHM))); } + + // RP Initiated Logout Endpoint + if (!isEndSessionEndpointNotAvailable()) { + String theEndSessionEndpointAddress = + calculateEndpointAddress(endSessionEndpointAddress, baseUri, "/idp/logout"); + cfg.put("end_session_endpoint", theEndSessionEndpointAddress); + } } public boolean isUserInfoEndpointNotAvailable() { @@ -59,4 +70,20 @@ public class OidcConfigurationService extends AuthorizationMetadataService { this.userInfoEndpointNotAvailable = userInfoEndpointNotAvailable; } + public boolean isEndSessionEndpointNotAvailable() { + return endSessionEndpointNotAvailable; + } + + public void setEndSessionEndpointNotAvailable(boolean endSessionEndpointNotAvailable) { + this.endSessionEndpointNotAvailable = endSessionEndpointNotAvailable; + } + + public String getEndSessionEndpointAddress() { + return endSessionEndpointAddress; + } + + public void setEndSessionEndpointAddress(String endSessionEndpointAddress) { + this.endSessionEndpointAddress = endSessionEndpointAddress; + } + }