You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/06/27 09:36:40 UTC
[cxf-fediz] branch spring-security-4 created (now 49d01ae)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch spring-security-4
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git.
at 49d01ae Merge remote-tracking branch 'cxf-fediz/master' into spring-security-4
This branch includes the following new commits:
new 49d01ae Merge remote-tracking branch 'cxf-fediz/master' into spring-security-4
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[cxf-fediz] 01/01: Merge remote-tracking branch 'cxf-fediz/master'
into spring-security-4
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch spring-security-4
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit 49d01aef73f18f3a64e907f49c34c01130bf0f38
Merge: 0479464 7f26047
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Jun 27 11:38:24 2019 +0300
Merge remote-tracking branch 'cxf-fediz/master' into spring-security-4
Conflicts:
pom.xml
services/idp-core/pom.xml
examples/jaxrsCxfPluginWebapp/pom.xml | 2 +-
.../cxf/fediz/example/FederationService.java | 19 +-
.../cxf/fediz/example/FederationService.java | 14 +-
examples/jaxrsSpringSecurityWebapp/pom.xml | 2 +-
.../cxf/fediz/example/FederationService.java | 14 +-
.../fediz/example/ApplicationContextProvider.java | 4 +-
.../cxf/fediz/core/config/FedizConfigurator.java | 2 +-
.../cxf/fediz/core/handler/LogoutHandler.java | 9 +-
.../core/metadata/MetadataDocumentHandler.java | 8 +-
.../core/processor/FederationProcessorImpl.java | 6 +-
.../fediz/core/processor/SAMLProcessorImpl.java | 10 +-
.../org/apache/cxf/fediz/core/saml/SAMLUtil.java | 3 +-
.../fediz/core/AbstractSAMLCallbackHandler.java | 4 +-
.../cxf/fediz/core/config/CallbackHandlerTest.java | 1 +
.../fediz/core/config/FedizConfigurationTest.java | 1 +
.../core/config/FedizConfigurationWriterTest.java | 1 +
.../core/federation/AudienceRestrictionTest.java | 1 +
.../fediz/core/federation/ClaimsProcessorTest.java | 1 +
.../cxf/fediz/core/federation/CustomValidator.java | 1 +
.../core/federation/FederationLogoutTest.java | 1 +
.../core/federation/FederationMetaDataTest.java | 1 +
.../core/federation/FederationRequestTest.java | 1 +
.../core/federation/FederationResponseTest.java | 2 +
.../fediz/core/federation/RequestedClaimsTest.java | 1 +
.../core/federation/SAMLTokenValidatorOldTest.java | 2 +
.../cxf/fediz/core/samlsso/CustomValidator.java | 1 +
.../samlsso/SAML2PResponseComponentBuilder.java | 4 +-
.../cxf/fediz/core/samlsso/SAMLLogoutTest.java | 22 +-
.../cxf/fediz/core/samlsso/SAMLMetaDataTest.java | 2 +
.../cxf/fediz/core/samlsso/SAMLRequestTest.java | 5 +-
.../core/samlsso/SAMLResponseConformanceTest.java | 9 +-
.../cxf/fediz/core/samlsso/SAMLResponseTest.java | 13 +-
.../cxf/plugin/FedizRedirectBindingFilter.java | 2 +-
.../cxf/fediz/jetty9/FederationAuthenticator.java | 4 +-
.../FederationAuthenticationProvider.java | 6 +-
.../FederationAuthenticationToken.java | 7 +-
...tedAuthoritiesUserDetailsFederationService.java | 3 +-
.../web/FederationAuthenticationEntryPoint.java | 3 +-
.../spring/web/FederationAuthenticationFilter.java | 5 +-
pom.xml | 37 +-
services/idp-core/pom.xml | 23 -
.../cxf/fediz/service/idp/FedizEntryPoint.java | 7 +-
.../service/idp/STSKrbAuthenticationProvider.java | 3 +-
.../cxf/fediz/service/idp/STSPortFilter.java | 3 +-
.../idp/STSPreAuthAuthenticationProvider.java | 3 +-
.../service/idp/STSUPAuthenticationProvider.java | 3 +-
.../fediz/service/idp/beans/STSClientAction.java | 4 +-
.../beans/samlsso/AbstractSamlResponseCreator.java | 4 +-
.../idp/beans/samlsso/LocalRedirectCreator.java | 8 +-
.../AbstractTrustedIdpOAuth2ProtocolHandler.java | 27 +-
.../protocols/TrustedIdpSAMLProtocolHandler.java | 2 +-
.../protocols/TrustedIdpWSFedProtocolHandler.java | 12 +-
.../service/idp/service/jpa/DBLoaderSpring.java | 9 +-
.../service/idp/beans/STSClientActionTest.java | 4 +-
.../idp/service/jpa/ApplicationDAOJPATest.java | 9 +-
.../service/idp/service/jpa/ClaimDAOJPATest.java | 9 +-
.../idp/service/jpa/EntitlementDAOJPATest.java | 9 +-
.../service/idp/service/jpa/IdpDAOJPATest.java | 9 +-
.../idp/service/jpa/TrustedIdpDAOJPATest.java | 10 +-
.../fediz/service/idp/util/MetadataWriterTest.java | 6 +-
.../service/idp/integrationtests/RestITTest.java | 1 +
services/oidc/pom.xml | 18 -
.../fediz/service/oidc/FedizSubjectCreator.java | 3 +-
.../src/main/resources/META-INF/persistence.xml | 35 --
.../src/main/webapp/WEB-INF/entity-manager.xml | 44 --
services/sts/pom.xml | 1 -
.../fediz/service/sts/realms/SamlRealmCodec.java | 2 +-
.../fediz/service/sts/realms/UriRealmParser.java | 2 +-
.../org/apache/cxf/fediz/sts/AbstractSTSTest.java | 5 +-
.../cxf/fediz/sts/realms/ITCrossRealmTest.java | 3 +-
.../realms/RealmExtensionIdentityMapperTest.java | 1 +
.../systests/custom/CustomParametersTest.java | 6 +-
systests/cxf/pom.xml | 2 -
.../cxf/fediz/systests/cxf/FederationTest.java | 17 +-
.../cxf/fediz/systests/cxf/TokenExpiryTest.java | 1 +
systests/federation/oidcIdpWebapp/pom.xml | 1 -
systests/federation/samlIdpWebapp/pom.xml | 3 +-
systests/federation/samlWebapp/pom.xml | 3 +-
.../systests/federation/samlsso/SAMLSSOTest.java | 1 +
.../systests/federation/unknown/WSFedTest.java | 1 +
.../fediz/systests/federation/wsfed/WSFedTest.java | 51 +-
.../org/apache/cxf/fediz/systests/idp/IdpTest.java | 1 +
.../jetty9/ClientCertificatePreAuthSpringTest.java | 1 +
.../systests/jetty9/ClientCertificateTest.java | 1 +
.../systests/jetty9/JettyPreAuthSpringTest.java | 1 +
.../cxf/fediz/systests/jetty9/JettyTest.java | 1 +
.../cxf/fediz/systests/jetty9/TokenExpiryTest.java | 1 +
.../cxf/fediz/systests/kerberos/KerberosTest.java | 1 +
.../apache/cxf/fediz/systests/ldap/LDAPTest.java | 7 +-
.../cxf/fediz/systests/oidc/AbstractOIDCTest.java | 61 +-
.../apache/cxf/fediz/systests/samlsso/CXFTest.java | 36 +-
.../apache/cxf/fediz/systests/samlsso/IdpTest.java | 631 +++++++--------------
.../cxf/fediz/systests/samlsso/JettyTest.java | 17 +-
.../cxf/fediz/systests/samlsso/SpringTest.java | 38 +-
...omcat8PluginTest.java => TomcatPluginTest.java} | 49 +-
.../cxf/fediz/systests/spring/SpringTest.java | 20 +-
.../cxf/fediz/systests/spring/TokenExpiryTest.java | 1 +
.../systests/common/AbstractClientCertTests.java | 1 +
.../fediz/systests/common/AbstractExpiryTests.java | 7 +-
.../cxf/fediz/systests/common/AbstractTests.java | 1 +
.../cxf/fediz/systests/common/HTTPTestUtils.java | 5 +-
.../systests/tomcat/AudienceRestrictionTest.java | 13 +-
.../systests/tomcat/ClientCertificateTest.java | 1 +
.../cxf/fediz/systests/tomcat/HolderOfKeyTest.java | 15 +-
.../cxf/fediz/systests/tomcat/TokenExpiryTest.java | 1 +
.../cxf/fediz/systests/tomcat/TomcatLauncher.java | 24 +-
.../cxf/fediz/systests/tomcat/TomcatTest.java | 17 +-
.../apache/cxf/fediz/systests/tomcat/WReqTest.java | 15 +-
systests/webapps/cxfWebapp/pom.xml | 3 +-
.../java/org/apache/cxf/fediz/example/Service.java | 22 +-
110 files changed, 633 insertions(+), 958 deletions(-)
diff --cc pom.xml
index bc29dff,cf52b57..dddd0c3
--- a/pom.xml
+++ b/pom.xml
@@@ -61,12 -61,12 +61,12 @@@
<junit.version>4.12</junit.version>
<kerby.version>1.1.1</kerby.version>
<log4j.version>1.2.17</log4j.version>
- <openjpa.version>2.4.3</openjpa.version>
+ <openjpa.version>3.1.0</openjpa.version>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.26</slf4j.version>
- <spring.version>4.3.23.RELEASE</spring.version>
+ <spring.version>4.3.24.RELEASE</spring.version>
<spring-ldap-core.version>2.3.2.RELEASE</spring-ldap-core.version>
- <spring.security.version>4.2.12.RELEASE</spring.security.version>
+ <spring.security.version>4.2.13.RELEASE</spring.security.version>
<spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
<tomcat.version>9.0.20</tomcat.version>
<wss4j.version>2.2.2</wss4j.version>
diff --cc services/idp-core/pom.xml
index 28f6d08,d04eaca..b081cf2
--- a/services/idp-core/pom.xml
+++ b/services/idp-core/pom.xml
@@@ -29,25 -29,10 +29,6 @@@
<name>Apache Fediz IDP Core</name>
<packaging>jar</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <properties>
- <spring.security.version>3.2.10.RELEASE</spring.security.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>junit</groupId>