You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/07 14:54:07 UTC
[1/2] cxf-fediz git commit: Get initial redirect to the IdP working
Repository: cxf-fediz
Updated Branches:
refs/heads/master a671407ad -> 7387d9a34
Get initial redirect to the IdP working
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/cbff9ea7
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/cbff9ea7
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/cbff9ea7
Branch: refs/heads/master
Commit: cbff9ea7adfd956ac92eeafe36178def0577fd94
Parents: a671407
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 7 14:52:31 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Feb 7 14:52:31 2017 +0000
----------------------------------------------------------------------
.../apache/cxf/fediz/service/oidc/logout/LogoutService.java | 5 +++++
services/oidc/src/main/webapp/WEB-INF/applicationContext.xml | 6 ++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/cbff9ea7/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java
index f342ca0..5c6a10a 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/logout/LogoutService.java
@@ -127,6 +127,11 @@ public class LogoutService {
// 1. "/finalize" URI for the IDP to redirect to this service again
// or
// 2. may be let IDP redirect straight to getClientLogoutUri(client) ?
+
+ UriBuilder ub2 = mc.getUriInfo().getAbsolutePathBuilder();
+ ub2.path("finalize");
+ ub.queryParam("wreply", ub2.build());
+
return ub.build();
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/cbff9ea7/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
index 51bb044..6b308d3 100644
--- a/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/services/oidc/src/main/webapp/WEB-INF/applicationContext.xml
@@ -70,8 +70,14 @@
<property name="services" ref="oidcServices"/>
</bean>
+ <bean id="tokenCleanupHandler" class="org.apache.cxf.fediz.service.oidc.logout.TokenCleanupHandler">
+ <property name="dataProvider" ref="oauthProvider"/>
+ </bean>
+
<bean id="logoutService" class="org.apache.cxf.fediz.service.oidc.logout.LogoutService">
<property name="dataProvider" ref="oauthProvider"/>
+ <property name="relativeIdpLogoutUri" value="../../secure/logout"/>
+ <property name="logoutHandlers" ref="tokenCleanupHandler"/>
</bean>
<!-- Service supporting all OIDC Core flows -->
[2/2] cxf-fediz git commit: Add configuration to fediz_config.xml
Posted by co...@apache.org.
Add configuration to fediz_config.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/7387d9a3
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/7387d9a3
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/7387d9a3
Branch: refs/heads/master
Commit: 7387d9a34ddc50399e83c69b61897422f5700fbf
Parents: cbff9ea
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 7 14:53:45 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Feb 7 14:53:45 2017 +0000
----------------------------------------------------------------------
services/oidc/src/main/conf/fediz_config.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7387d9a3/services/oidc/src/main/conf/fediz_config.xml
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/conf/fediz_config.xml b/services/oidc/src/main/conf/fediz_config.xml
index 5987462..9e2a5fe 100644
--- a/services/oidc/src/main/conf/fediz_config.xml
+++ b/services/oidc/src/main/conf/fediz_config.xml
@@ -51,6 +51,8 @@
<claimType type="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" optional="true" />
</claimTypesRequested>
</protocol>
+ <logoutURL>/secure/logout</logoutURL>
+ <logoutRedirectToConstraint>https://localhost.*/fediz-oidc/.*</logoutRedirectToConstraint>
</contextConfig>
</FedizConfig>