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 2015/04/09 13:35:07 UTC
[1/3] cxf-fediz git commit: Fixing federation test
Repository: cxf-fediz
Updated Branches:
refs/heads/master 230bce9af -> 8fc324cb9
Fixing federation test
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6e194ab1
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6e194ab1
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6e194ab1
Branch: refs/heads/master
Commit: 6e194ab15ffff76015bdcae7fc8a0bc56737085a
Parents: 230bce9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Apr 9 12:12:30 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Apr 9 12:12:30 2015 +0100
----------------------------------------------------------------------
.../idp/src/main/resources/entities-realmb.xml | 2 +-
.../main/webapp/WEB-INF/idp-config-realmb.xml | 2 +-
.../test/resources/realma/entities-realma.xml | 2 +-
.../test/resources/realmb/entities-realmb.xml | 2 +-
.../src/test/resources/realmb/idp-servlet.xml | 2 ++
.../test/resources/realmb/security-config.xml | 20 ++++++++++++++++----
6 files changed, 22 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6e194ab1/services/idp/src/main/resources/entities-realmb.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/resources/entities-realmb.xml b/services/idp/src/main/resources/entities-realmb.xml
index be99344..3f17472 100644
--- a/services/idp/src/main/resources/entities-realmb.xml
+++ b/services/idp/src/main/resources/entities-realmb.xml
@@ -51,7 +51,7 @@
</property>
<property name="authenticationURIs">
<util:map>
- <entry key="default" value="/login/default" />
+ <entry key="default" value="federation/up" />
</util:map>
</property>
<property name="serviceDisplayName" value="REALM B" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6e194ab1/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
----------------------------------------------------------------------
diff --git a/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml b/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
index a8c8a3b..830dc78 100644
--- a/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
+++ b/services/idp/src/main/webapp/WEB-INF/idp-config-realmb.xml
@@ -73,7 +73,7 @@
</property>
<property name="authenticationURIs">
<util:map>
- <entry key="default" value="/login/default" />
+ <entry key="default" value="federation/up" />
</util:map>
</property>
<property name="serviceDisplayName" value="REALM B" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6e194ab1/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml b/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
index 418c03a..a3e1a36 100644
--- a/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
+++ b/systests/federation/wsfed/src/test/resources/realma/entities-realma.xml
@@ -52,7 +52,7 @@
</property>
<property name="authenticationURIs">
<util:map>
- <entry key="default" value="/login/default" />
+ <entry key="default" value="federation/up" />
</util:map>
</property>
<property name="serviceDisplayName" value="REALM A" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6e194ab1/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml b/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
index 9e24cb2..fc203fb 100644
--- a/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
+++ b/systests/federation/wsfed/src/test/resources/realmb/entities-realmb.xml
@@ -51,7 +51,7 @@
</property>
<property name="authenticationURIs">
<util:map>
- <entry key="default" value="/login/default" />
+ <entry key="default" value="federation/up" />
</util:map>
</property>
<property name="serviceDisplayName" value="REALM B" />
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6e194ab1/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml b/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml
index 2042e8e..489aa3a 100644
--- a/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml
+++ b/systests/federation/wsfed/src/test/resources/realmb/idp-servlet.xml
@@ -75,6 +75,8 @@
flow-builder-services="builder">
<webflow:flow-location
path="/WEB-INF/federation-validate-request.xml" id="federation" />
+ <webflow:flow-location
+ path="/WEB-INF/federation-validate-request.xml" id="federation/up" />
<webflow:flow-location path="/WEB-INF/federation-signin-request.xml"
id="signinRequest" />
<webflow:flow-location path="/WEB-INF/federation-signin-response.xml"
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6e194ab1/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
----------------------------------------------------------------------
diff --git a/systests/federation/wsfed/src/test/resources/realmb/security-config.xml b/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
index 7b5b522..7d869c3 100644
--- a/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
+++ b/systests/federation/wsfed/src/test/resources/realmb/security-config.xml
@@ -66,13 +66,25 @@
<security:authentication-provider ref="stsAuthProvider" />
</security:authentication-manager>
- <security:http use-expressions="true">
+ <!-- Redirects to a dedicated http config -->
+ <bean id="federationEntryPoint" class="org.apache.cxf.fediz.service.idp.FederationEntryPoint">
+ <property name="realm" value="urn:org:apache:cxf:fediz:idp:realm-B" />
+ <property name="configService" ref="config" />
+ </bean>
+
+ <!-- Main entry point -->
+ <security:http pattern="/federation" use-expressions="true" entry-point-ref="federationEntryPoint">
+ <security:custom-filter after="CHANNEL_FILTER" ref="stsPortFilter" />
+ <security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher" />
+ <security:intercept-url pattern="/FederationMetadata/2007-06/FederationMetadata.xml" access="isAnonymous() or isAuthenticated()" />
+ </security:http>
+
+ <!-- HTTP/BA entry point -->
+ <security:http pattern="/federation/up" use-expressions="true">
<security:custom-filter after="CHANNEL_FILTER" ref="stsPortFilter" />
<security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher" />
<security:intercept-url pattern="/FederationMetadata/2007-06/FederationMetadata.xml" access="isAnonymous() or isAuthenticated()" />
- <!-- MUST be http-basic thus systests run fine -->
- <!--<security:form-login />-->
<security:http-basic />
<security:logout delete-cookies="FEDIZ_HOME_REALM" invalidate-session="true" />
</security:http>
@@ -85,7 +97,7 @@
<bean id="entitlementsEnricher" class="org.apache.cxf.fediz.service.idp.service.security.GrantedAuthorityEntitlements" />
- <bean id="stsAuthProvider" class="org.apache.cxf.fediz.service.idp.STSAuthenticationProvider">
+ <bean id="stsAuthProvider" class="org.apache.cxf.fediz.service.idp.STSUPAuthenticationProvider">
<property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts-realmb/${realm.STS_URI}/STSServiceTransportUT?wsdl"/>
<property name="wsdlEndpoint" value="TransportUT_Port"/>
<property name="wsdlService" value="SecurityTokenService"/>
[2/3] cxf-fediz git commit: Fixing kerberos test
Posted by co...@apache.org.
Fixing kerberos test
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1528300d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1528300d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1528300d
Branch: refs/heads/master
Commit: 1528300d9bd1d3550cdcef274ed1786203cc3e64
Parents: 6e194ab
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Apr 9 12:14:04 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Apr 9 12:14:04 2015 +0100
----------------------------------------------------------------------
systests/kerberos/src/test/resources/idp/security-config.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1528300d/systests/kerberos/src/test/resources/idp/security-config.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/idp/security-config.xml b/systests/kerberos/src/test/resources/idp/security-config.xml
index 7b1b22a..4fe3da2 100644
--- a/systests/kerberos/src/test/resources/idp/security-config.xml
+++ b/systests/kerberos/src/test/resources/idp/security-config.xml
@@ -101,7 +101,7 @@
<property name="serviceName" value="bob@service.ws.apache.org"/>
</bean>-->
- <bean id="stsAuthProvider" class="org.apache.cxf.fediz.service.idp.STSAuthenticationProvider">
+ <bean id="stsAuthProvider" class="org.apache.cxf.fediz.service.idp.STSKrbAuthenticationProvider">
<!--<property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransportUT?wsdl"/>
<property name="wsdlEndpoint" value="TransportUT_Port"/> -->
<property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransportKerberos?wsdl"/>
[3/3] cxf-fediz git commit: Fixing clientcert test
Posted by co...@apache.org.
Fixing clientcert test
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/8fc324cb
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/8fc324cb
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/8fc324cb
Branch: refs/heads/master
Commit: 8fc324cb9efd4bfe0b7680561c591beea4c6874e
Parents: 1528300
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Apr 9 12:26:25 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Apr 9 12:26:25 2015 +0100
----------------------------------------------------------------------
systests/clientcert/src/test/resources/idp/idp-servlet.xml | 2 ++
systests/clientcert/src/test/resources/idp/security-config.xml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/8fc324cb/systests/clientcert/src/test/resources/idp/idp-servlet.xml
----------------------------------------------------------------------
diff --git a/systests/clientcert/src/test/resources/idp/idp-servlet.xml b/systests/clientcert/src/test/resources/idp/idp-servlet.xml
index e1afb92..c09f3e3 100644
--- a/systests/clientcert/src/test/resources/idp/idp-servlet.xml
+++ b/systests/clientcert/src/test/resources/idp/idp-servlet.xml
@@ -75,6 +75,8 @@
flow-builder-services="builder">
<webflow:flow-location
path="/WEB-INF/federation-validate-request.xml" id="federation" />
+ <webflow:flow-location
+ path="/WEB-INF/federation-validate-request.xml" id="federation/up" />
<webflow:flow-location path="/WEB-INF/federation-signin-request.xml"
id="signinRequest" />
<webflow:flow-location path="/WEB-INF/federation-signin-response.xml"
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/8fc324cb/systests/clientcert/src/test/resources/idp/security-config.xml
----------------------------------------------------------------------
diff --git a/systests/clientcert/src/test/resources/idp/security-config.xml b/systests/clientcert/src/test/resources/idp/security-config.xml
index 9d2472d..15767c8 100644
--- a/systests/clientcert/src/test/resources/idp/security-config.xml
+++ b/systests/clientcert/src/test/resources/idp/security-config.xml
@@ -91,7 +91,7 @@
<entry key="ws-security.password" value="idp-pass" />
</util:map>
- <bean id="stsAuthProvider" class="org.apache.cxf.fediz.service.idp.STSAuthenticationProvider">
+ <bean id="stsAuthProvider" class="org.apache.cxf.fediz.service.idp.STSPreAuthAuthenticationProvider">
<property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransportUT?wsdl"/>
<property name="wsdlEndpoint" value="TransportUT_Port"/>
<property name="wsdlService" value="SecurityTokenService"/>