You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/01/19 10:56:29 UTC
[2/2] cxf-fediz git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cxf-fediz
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf-fediz
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/8468a4bc
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/8468a4bc
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/8468a4bc
Branch: refs/heads/master
Commit: 8468a4bc006265e851fff29a7c8fafb928ccf237
Parents: 85db628 8899164
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Jan 19 10:52:31 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Jan 19 10:52:31 2017 +0000
----------------------------------------------------------------------
apache-fediz/pom.xml | 4 +-
examples/jaxrsCxfPluginWebapp/pom.xml | 2 +-
.../WEB-INF/applicationContext-security.xml | 2 +-
examples/jaxrsSimpleWebapp/pom.xml | 2 +-
examples/jaxrsSpringSecurityWebapp/pom.xml | 2 +-
.../WEB-INF/applicationContext-security.xml | 8 +-
examples/pom.xml | 2 +-
examples/simpleWebapp/pom.xml | 2 +-
examples/spring2Webapp/pom.xml | 2 +-
.../WEB-INF/applicationContext-security.xml | 2 +-
examples/springPreauthWebapp/pom.xml | 2 +-
.../WEB-INF/applicationContext-security.xml | 2 +-
examples/springWebapp/pom.xml | 2 +-
.../WEB-INF/applicationContext-security.xml | 8 +-
examples/wsclientWebapp/pom.xml | 2 +-
examples/wsclientWebapp/webapp/pom.xml | 2 +-
.../main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../wsclientWebapp/webservice/common/pom.xml | 2 +-
examples/wsclientWebapp/webservice/pom.xml | 2 +-
.../wsclientWebapp/webservice/service/pom.xml | 2 +-
.../main/webapp/WEB-INF/applicationContext.xml | 4 +-
plugins/core/pom.xml | 2 +-
.../cxf/fediz/core/TokenValidatorRequest.java | 12 +-
.../cxf/fediz/core/TokenValidatorResponse.java | 22 +-
.../org/apache/cxf/fediz/core/config/Claim.java | 13 +-
.../fediz/core/config/FedizConfigurator.java | 9 +-
.../cxf/fediz/core/config/FedizContext.java | 22 +-
.../apache/cxf/fediz/core/config/Protocol.java | 15 +-
.../cxf/fediz/core/config/TrustManager.java | 18 +-
.../cxf/fediz/core/config/TrustedIssuer.java | 16 +-
.../cxf/fediz/core/handler/LogoutHandler.java | 37 +-
.../cxf/fediz/core/handler/SigninHandler.java | 4 +-
.../core/processor/FederationProcessorImpl.java | 78 ++-
.../cxf/fediz/core/processor/FedizRequest.java | 14 +-
.../cxf/fediz/core/processor/FedizResponse.java | 20 +-
.../fediz/core/processor/SAMLProcessorImpl.java | 5 +
.../cxf/fediz/core/saml/SAMLTokenValidator.java | 4 +-
.../core/samlsso/SSOValidatorResponse.java | 11 +-
.../samlsso/SamlpRequestComponentBuilder.java | 7 -
.../src/main/resources/schemas/FedizConfig.xsd | 11 +
.../core/federation/FederationLogoutTest.java | 357 ++++++++++++
.../test/resources/fediz_test_config_logout.xml | 88 +++
plugins/cxf/pom.xml | 2 +-
.../plugin/AbstractServiceProviderFilter.java | 27 +-
.../cxf/plugin/FedizRedirectBindingFilter.java | 108 ++--
plugins/jetty8/pom.xml | 2 +-
.../fediz/jetty8/FederationAuthenticator.java | 375 +++++++------
.../fediz/jetty8/FederationUserIdentity.java | 5 +-
plugins/jetty9/pom.xml | 2 +-
.../fediz/jetty9/FederationAuthenticator.java | 376 +++++++------
.../fediz/jetty9/FederationUserIdentity.java | 5 +-
plugins/pom.xml | 2 +-
plugins/spring/pom.xml | 2 +-
...erationPreAuthenticatedProcessingFilter.java | 10 +-
.../web/FederationAuthenticationEntryPoint.java | 15 +-
.../FederationAuthenticationFailureHandler.java | 5 +-
.../web/FederationAuthenticationFilter.java | 41 +-
.../spring/web/FederationLogoutFilter.java | 7 +
.../web/FederationLogoutSuccessHandler.java | 5 +-
plugins/spring2/pom.xml | 2 +-
...erationPreAuthenticatedProcessingFilter.java | 10 +-
.../web/FederationAuthenticationEntryPoint.java | 13 +-
.../web/FederationAuthenticationFilter.java | 41 +-
plugins/tomcat7/pom.xml | 2 +-
.../fediz/tomcat7/FederationAuthenticator.java | 59 +-
plugins/tomcat8/pom.xml | 2 +-
.../fediz/tomcat8/FederationAuthenticator.java | 59 +-
pom.xml | 39 +-
release_notes.txt | 14 +-
services/idp/pom.xml | 31 +-
.../cxf/fediz/service/idp/FedizEntryPoint.java | 47 +-
.../cxf/fediz/service/idp/IdpConstants.java | 29 +-
.../service/idp/STSAuthenticationProvider.java | 2 +-
.../idp/STSKrbAuthenticationProvider.java | 5 +
.../cxf/fediz/service/idp/STSUserDetails.java | 24 +
.../service/idp/beans/CommonsURLValidator.java | 52 ++
.../idp/beans/IdpTokenExpiredAction.java | 20 +-
.../idp/beans/PassiveRequestorValidator.java | 44 +-
.../service/idp/beans/STSClientAction.java | 7 +-
.../idp/beans/SigninParametersCacheAction.java | 107 ++--
.../idp/beans/samlsso/AuthnRequestParser.java | 288 ++++++++--
.../beans/samlsso/AuthnRequestValidator.java | 269 ---------
.../idp/beans/samlsso/SamlResponseCreator.java | 14 +-
.../service/idp/beans/wsfed/WfreshParser.java | 9 +-
.../kerberos/KerberosServiceRequestToken.java | 17 +-
.../idp/kerberos/PassThroughKerberosClient.java | 13 +-
.../service/idp/model/TrustedIDPSelection.java | 10 +-
.../ApplicationProtocolControllerImpl.java | 2 +-
.../ApplicationSAMLSSOProtocolHandler.java | 57 ++
.../TrustedIdpFacebookProtocolHandler.java | 5 +-
.../TrustedIdpOIDCProtocolHandler.java | 7 +-
.../TrustedIdpSAMLProtocolHandler.java | 7 +-
.../TrustedIdpWSFedProtocolHandler.java | 3 +-
.../fediz/service/idp/rest/IdpServiceImpl.java | 25 +-
.../service/idp/samlsso/SAMLAuthnRequest.java | 74 +++
services/idp/src/main/resources/cxf-tls.xml | 4 +-
.../idp/src/main/resources/entities-realma.xml | 4 +-
.../idp/src/main/resources/entities-realmb.xml | 5 +-
.../src/main/resources/persistenceContext.xml | 8 +-
services/idp/src/main/resources/restContext.xml | 4 +-
.../main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../webapp/WEB-INF/config/idp-core-servlet.xml | 19 +-
.../config/security-clientcert-config.xml | 8 +-
.../WEB-INF/config/security-krb-config.xml | 8 +-
.../WEB-INF/config/security-rs-config.xml | 8 +-
.../WEB-INF/config/security-up-config.xml | 8 +-
.../WEB-INF/flows/federation-signin-request.xml | 178 ------
.../flows/federation-signin-response.xml | 75 ---
.../flows/federation-validate-request.xml | 108 ++--
.../WEB-INF/flows/saml-signin-request.xml | 114 ----
.../WEB-INF/flows/saml-validate-request.xml | 144 ++++-
.../webapp/WEB-INF/flows/signin-request.xml | 171 ++++++
.../webapp/WEB-INF/flows/signin-response.xml | 85 +++
.../main/webapp/WEB-INF/idp-config-realma.xml | 6 +-
.../main/webapp/WEB-INF/idp-config-realmb.xml | 6 +-
.../idp/src/main/webapp/WEB-INF/idp-servlet.xml | 5 +-
.../src/main/webapp/WEB-INF/security-config.xml | 9 +-
.../src/main/webapp/WEB-INF/views/idplist.jsp | 2 +-
services/idp/src/main/webapp/WEB-INF/web.xml | 3 +
services/idp/src/test/resources/idp-config.xml | 6 +-
services/idp/src/test/resources/rest-client.xml | 2 +-
services/idp/src/test/resources/testContext.xml | 6 +-
services/oidc/pom.xml | 7 +-
.../oidc/clients/ClientRegistrationService.java | 4 +-
.../oidc/src/main/resources/ESAPI.properties | 1 +
.../oidc/src/main/webapp/META-INF/context.xml | 2 +-
.../main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/data-manager.xml | 4 +-
.../src/main/webapp/WEB-INF/entity-manager.xml | 2 +-
.../src/main/webapp/WEB-INF/views/client.jsp | 3 +-
.../webapp/WEB-INF/views/clientCodeGrants.jsp | 3 +-
.../main/webapp/WEB-INF/views/clientTokens.jsp | 3 +-
.../WEB-INF/views/oAuthAuthorizationData.jsp | 3 +-
.../webapp/WEB-INF/views/registeredClients.jsp | 4 +-
services/oidc/src/main/webapp/WEB-INF/web.xml | 3 +
services/pom.xml | 2 +-
services/sts/pom.xml | 4 +-
.../fediz/service/sts/FileClaimsHandler.java | 2 +-
.../sts/realms/RealmFileClaimsHandler.java | 2 +-
.../main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/cxf-transport.xml | 4 +-
.../src/main/webapp/WEB-INF/data/passwords.xml | 4 +-
.../sts/src/main/webapp/WEB-INF/data/realms.xml | 4 +-
.../src/main/webapp/WEB-INF/data/userClaims.xml | 4 +-
.../src/main/webapp/WEB-INF/endpoints/file.xml | 4 +-
.../main/webapp/WEB-INF/endpoints/kerberos.xml | 4 +-
.../src/main/webapp/WEB-INF/endpoints/ldap.xml | 16 +-
.../sts/src/main/webapp/WEB-INF/fediz-sts.xml | 4 +-
.../apache/cxf/fediz/sts/realms/sts-client.xml | 4 +-
systests/cxf/pom.xml | 19 +-
systests/cxf/src/test/resources/client.jks | Bin 2061 -> 0 bytes
systests/cxf/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../cxf/src/test/resources/logging.properties | 2 +-
systests/cxf/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/federation/oidc/pom.xml | 280 ----------
.../cxf/fediz/integrationtests/OIDCTest.java | 271 ---------
.../oidc/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../oidc/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../oidc/src/test/resources/cxf-service.xml | 130 -----
.../oidc/src/test/resources/entities-realma.xml | 480 ----------------
.../src/test/resources/fediz_config_oidc.xml | 56 --
.../oidc/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/federation/oidcIdpWebapp/pom.xml | 2 +-
.../main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 4 +-
systests/federation/pom.xml | 6 +-
systests/federation/samlIdpWebapp/pom.xml | 2 +-
.../main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 2 +-
systests/federation/samlWebapp/pom.xml | 73 +++
.../fediz/samlsso/service/DoubleItService.java | 53 ++
.../service/KeystorePasswordCallback.java | 66 +++
.../cxf/fediz/samlsso/service/Number.java | 48 ++
.../src/main/resources/stsKeystoreA.properties | 6 +
.../src/main/resources/stsrealm_a.jks | Bin 0 -> 2061 bytes
.../samlWebapp/src/main/resources/ststrust.jks | Bin 0 -> 3908 bytes
.../src/main/webapp/WEB-INF/cxf-service.xml | 104 ++++
.../samlWebapp/src/main/webapp/WEB-INF/web.xml | 29 +
systests/federation/samlsso/pom.xml | 86 ++-
.../cxf/fediz/integrationtests/RealmMapper.java | 44 ++
.../integrationtests/SAMLSSOFedizTest.java | 254 ---------
.../cxf/fediz/integrationtests/SAMLSSOTest.java | 281 ++++++----
.../samlsso/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../samlsso/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../samlsso/src/test/resources/cxf-service.xml | 130 +++++
.../src/test/resources/entities-realma.xml | 518 -----------------
.../test/resources/fediz_config_saml_sso.xml | 116 ----
.../src/test/resources/logging.properties | 54 ++
.../test/resources/realma/entities-realma.xml | 549 +++++++++++++++++++
.../test/resources/realmb/entities-realmb.xml | 18 +-
.../src/test/resources/realmb/idp-servlet.xml | 104 +---
.../test/resources/realmb/security-config.xml | 9 +-
.../src/test/resources/rp/cxf-service.xml | 154 ++++++
.../samlsso/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/federation/wsfed/pom.xml | 58 +-
.../cxf/fediz/integrationtests/WSFedTest.java | 294 +++++++++-
.../wsfed/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../wsfed/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../wsfed/src/test/resources/cxf-service.xml | 130 +++++
.../src/test/resources/fediz_config_wsfed.xml | 122 ++++-
.../wsfed/src/test/resources/logging.properties | 54 ++
.../test/resources/realma/entities-realma.xml | 86 ++-
.../test/resources/realmb/entities-realmb.xml | 13 +-
.../src/test/resources/realmb/idp-servlet.xml | 100 +---
.../test/resources/realmb/security-config.xml | 32 +-
.../wsfed/src/test/resources/server.jks | Bin 3859 -> 0 bytes
.../federation/wsfed/src/test/resources/web.xml | 102 ----
systests/idp/pom.xml | 20 +-
.../apache/cxf/fediz/systests/idp/IdpTest.java | 298 +++++++++-
.../idp/src/test/resources/alice_client.jks | Bin 2225 -> 0 bytes
systests/idp/src/test/resources/client.jks | Bin 2061 -> 0 bytes
systests/idp/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../idp/src/test/resources/logging.properties | 2 +-
.../test/resources/realma/entities-realma.xml | 41 +-
systests/idp/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/jetty8/pom.xml | 30 +-
.../jetty8/src/test/resources/alice_client.jks | Bin 2225 -> 0 bytes
systests/jetty8/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../jetty8/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../src/test/resources/logging.properties | 54 ++
systests/jetty8/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/jetty9/pom.xml | 19 +-
.../jetty9/src/test/resources/alice_client.jks | Bin 2225 -> 0 bytes
systests/jetty9/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../jetty9/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../src/test/resources/logging.properties | 54 ++
systests/jetty9/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/kerberos/pom.xml | 19 +-
.../kerberos/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../src/test/resources/logging.properties | 54 ++
systests/kerberos/src/test/resources/server.jks | Bin 3859 -> 0 bytes
.../src/test/resources/sts/cxf-transport.xml | 4 +-
.../src/test/resources/sts/kerberos.xml | 4 +-
.../test/resources/sts/userClaimsKerberos.xml | 4 +-
systests/ldap/pom.xml | 305 +++++++++++
.../cxf/fediz/integrationtests/LDAPTest.java | 283 ++++++++++
.../ldap/src/test/resources/fediz_config.xml | 61 +++
systests/ldap/src/test/resources/ldap.jaas | 8 +
systests/ldap/src/test/resources/ldap.ldif | 69 +++
.../ldap/src/test/resources/logging.properties | 54 ++
.../src/test/resources/sts/cxf-transport.xml | 88 +++
systests/ldap/src/test/resources/sts/ldap.xml | 117 ++++
systests/oidc/pom.xml | 27 +-
.../cxf/fediz/systests/oidc/OIDCTest.java | 2 +-
.../oidc/src/test/resources/alice_client.jks | Bin 2225 -> 0 bytes
systests/oidc/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../oidc/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../oidc/src/test/resources/logging.properties | 2 +-
.../test/resources/oidc/applicationContext.xml | 41 +-
.../src/test/resources/oidc/data-manager.xml | 4 +-
.../test/resources/realma/entities-realma.xml | 4 +-
systests/oidc/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/pom.xml | 3 +-
systests/samlsso/pom.xml | 19 +-
.../apache/cxf/fediz/systests/idp/IdpTest.java | 80 ++-
.../samlsso/src/test/resources/alice_client.jks | Bin 2225 -> 0 bytes
systests/samlsso/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../samlsso/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../src/test/resources/logging.properties | 2 +-
.../test/resources/realma/entities-realma.xml | 11 +-
systests/samlsso/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/spring/pom.xml | 13 +-
.../cxf/fediz/integrationtests/Spring2Test.java | 16 +
.../cxf/fediz/integrationtests/SpringTest.java | 8 +
systests/spring/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../src/test/resources/logging.properties | 2 +-
systests/spring/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/tests/pom.xml | 2 +-
.../fediz/integrationtests/AbstractTests.java | 132 ++++-
.../tests/src/test/resources/alice_client.jks | Bin 0 -> 2225 bytes
systests/tests/src/test/resources/client.jks | Bin 0 -> 2061 bytes
.../tests/src/test/resources/clienttrust.jks | Bin 0 -> 1512 bytes
systests/tests/src/test/resources/server.jks | Bin 0 -> 3859 bytes
systests/tomcat7/pom.xml | 19 +-
.../tomcat7/src/test/resources/alice_client.jks | Bin 2225 -> 0 bytes
systests/tomcat7/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../tomcat7/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../src/test/resources/logging.properties | 2 +-
.../test/resources/realma/entities-realma.xml | 4 +-
systests/tomcat7/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/tomcat8/pom.xml | 19 +-
.../tomcat8/src/test/resources/alice_client.jks | Bin 2225 -> 0 bytes
systests/tomcat8/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../tomcat8/src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../src/test/resources/logging.properties | 2 +-
systests/tomcat8/src/test/resources/server.jks | Bin 3859 -> 0 bytes
systests/webapps/cxfWebapp/pom.xml | 2 +-
.../main/webapp/WEB-INF/applicationContext.xml | 4 +-
.../src/main/webapp/WEB-INF/cxf-service.xml | 2 +-
systests/webapps/pom.xml | 2 +-
systests/webapps/simpleWebapp/pom.xml | 2 +-
systests/webapps/spring2Webapp/pom.xml | 2 +-
.../WEB-INF/applicationContext-security.xml | 2 +-
systests/webapps/springPreauthWebapp/pom.xml | 2 +-
.../WEB-INF/applicationContext-security.xml | 2 +-
systests/webapps/springWebapp/pom.xml | 2 +-
.../WEB-INF/applicationContext-security.xml | 6 +-
systests/websphere/pom.xml | 17 +-
.../src/test/resources/alice_client.jks | Bin 2225 -> 0 bytes
.../websphere/src/test/resources/client.jks | Bin 2061 -> 0 bytes
.../src/test/resources/clienttrust.jks | Bin 1512 -> 0 bytes
.../src/test/resources/logging.properties | 2 +-
.../websphere/src/test/resources/server.jks | Bin 3859 -> 0 bytes
303 files changed, 6965 insertions(+), 4361 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/8468a4bc/services/oidc/src/main/webapp/WEB-INF/data-manager.xml
----------------------------------------------------------------------