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/13 11:36:34 UTC
[18/18] cxf-fediz git commit: Whitespace cleanup
Whitespace cleanup
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/2ca31863
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/2ca31863
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/2ca31863
Branch: refs/heads/master
Commit: 2ca318630f99fd11eb95111341e7188900fc212f
Parents: 29bf8de
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Feb 13 11:21:02 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Feb 13 11:21:02 2017 +0000
----------------------------------------------------------------------
.../cxf/fediz/example/FederationService.java | 6 +-
.../cxf/fediz/example/FederationService.java | 2 +-
.../cxf/fediz/example/FederationServlet.java | 2 +-
.../cxf/fediz/example/FederationServlet.java | 8 +-
.../cxf/fediz/example/FederationServlet.java | 2 +-
.../cxf/fediz/example/FederationServlet.java | 8 +-
.../cxf/fediz/example/FederationServlet.java | 4 +-
.../fediz/example/ClaimsCallbackHandler.java | 12 +-
.../cxf/fediz/example/FederationServlet.java | 4 +-
.../java/org/apache/cxf/fediz/core/Claim.java | 2 +-
.../apache/cxf/fediz/core/ClaimCollection.java | 2 +-
.../org/apache/cxf/fediz/core/ClaimTypes.java | 48 +-
.../cxf/fediz/core/FederationConstants.java | 4 +-
.../apache/cxf/fediz/core/FedizConstants.java | 16 +-
.../apache/cxf/fediz/core/FedizPrincipal.java | 4 +-
.../org/apache/cxf/fediz/core/RequestState.java | 12 +-
.../apache/cxf/fediz/core/SAMLSSOConstants.java | 16 +-
.../fediz/core/SecurityTokenThreadLocal.java | 10 +-
.../apache/cxf/fediz/core/TokenValidator.java | 4 +-
.../cxf/fediz/core/TokenValidatorResponse.java | 2 +-
.../config/CertificateValidationMethod.java | 8 +-
.../org/apache/cxf/fediz/core/config/Claim.java | 10 +-
.../fediz/core/config/FederationProtocol.java | 20 +-
.../fediz/core/config/FedizConfigurator.java | 10 +-
.../cxf/fediz/core/config/FedizContext.java | 66 +--
.../cxf/fediz/core/config/KeyManager.java | 10 +-
.../cxf/fediz/core/config/PropertyType.java | 6 +-
.../apache/cxf/fediz/core/config/Protocol.java | 24 +-
.../cxf/fediz/core/config/SAMLProtocol.java | 22 +-
.../cxf/fediz/core/config/TrustManager.java | 16 +-
.../cxf/fediz/core/config/TrustedIssuer.java | 30 +-
.../IllegalConfigurationException.java | 2 +-
.../core/exception/ProcessingException.java | 28 +-
.../cxf/fediz/core/handler/LogoutHandler.java | 10 +-
.../cxf/fediz/core/handler/SigninHandler.java | 8 +-
.../cxf/fediz/core/metadata/MetadataWriter.java | 58 +-
.../core/processor/AbstractFedizProcessor.java | 8 +-
.../core/processor/FederationProcessorImpl.java | 30 +-
.../fediz/core/processor/FedizProcessor.java | 2 +-
.../core/processor/FedizProcessorFactory.java | 2 +-
.../cxf/fediz/core/processor/FedizRequest.java | 4 +-
.../cxf/fediz/core/processor/FedizResponse.java | 4 +-
.../core/processor/RedirectionResponse.java | 10 +-
.../fediz/core/processor/SAMLProcessorImpl.java | 142 ++---
.../core/saml/FedizSignatureTrustValidator.java | 46 +-
.../cxf/fediz/core/saml/SAMLTokenValidator.java | 58 +-
.../apache/cxf/fediz/core/saml/SAMLUtil.java | 6 +-
.../fediz/core/saml/SamlAssertionValidator.java | 14 +-
.../fediz/core/samlsso/CompressionUtils.java | 24 +-
.../samlsso/DefaultSAMLPRequestBuilder.java | 38 +-
.../fediz/core/samlsso/SAMLPRequestBuilder.java | 4 +-
.../samlsso/SAMLProtocolResponseValidator.java | 56 +-
.../core/samlsso/SAMLSSOResponseValidator.java | 78 +--
.../core/samlsso/SSOValidatorResponse.java | 10 +-
.../samlsso/SamlpRequestComponentBuilder.java | 60 +--
.../apache/cxf/fediz/core/util/CertsUtils.java | 48 +-
.../cxf/fediz/core/util/ClassLoaderUtils.java | 32 +-
.../apache/cxf/fediz/core/util/CookieUtils.java | 28 +-
.../apache/cxf/fediz/core/util/DOMUtils.java | 32 +-
.../cxf/fediz/core/util/SignatureUtils.java | 28 +-
.../apache/cxf/fediz/core/util/StringUtils.java | 2 +-
.../org/apache/cxf/fediz/common/STSUtil.java | 28 +-
.../cxf/fediz/common/SecurityTestUtil.java | 6 +-
.../fediz/core/AbstractSAMLCallbackHandler.java | 92 ++--
.../cxf/fediz/core/KeystoreCallbackHandler.java | 8 +-
.../cxf/fediz/core/SAML1CallbackHandler.java | 12 +-
.../cxf/fediz/core/SAML2CallbackHandler.java | 12 +-
.../fediz/core/config/CallbackHandlerTest.java | 140 ++---
.../core/config/FedizConfigurationTest.java | 98 ++--
.../config/FedizConfigurationWriterTest.java | 66 +--
.../fediz/core/config/TestCallbackHandler.java | 4 +-
.../federation/AudienceRestrictionTest.java | 92 ++--
.../fediz/core/federation/CustomValidator.java | 2 +-
.../core/federation/FederationLogoutTest.java | 144 ++---
.../core/federation/FederationMetaDataTest.java | 26 +-
.../core/federation/FederationRequestTest.java | 34 +-
.../core/federation/FederationResponseTest.java | 448 ++++++++--------
.../core/federation/RequestedClaimsTest.java | 64 +--
.../federation/SAMLTokenValidatorOldTest.java | 90 ++--
.../core/federation/TestSigninHandler.java | 10 +-
.../cxf/fediz/core/samlsso/CustomValidator.java | 2 +-
.../samlsso/SAML2PResponseComponentBuilder.java | 48 +-
.../fediz/core/samlsso/SAMLMetaDataTest.java | 32 +-
.../cxf/fediz/core/samlsso/SAMLRequestTest.java | 82 +--
.../samlsso/SAMLResponseConformanceTest.java | 344 ++++++------
.../fediz/core/samlsso/SAMLResponseTest.java | 208 ++++----
.../fediz/core/samlsso/SAMLSSOTestUtils.java | 12 +-
.../plugin/AbstractServiceProviderFilter.java | 90 ++--
.../cxf/fediz/cxf/plugin/CXFFedizPrincipal.java | 6 +-
.../cxf/plugin/FedizRedirectBindingFilter.java | 120 ++---
.../fediz/cxf/plugin/FedizSecurityContext.java | 6 +-
.../cxf/plugin/state/EHCacheSPStateManager.java | 38 +-
.../fediz/cxf/plugin/state/ResponseState.java | 16 +-
.../fediz/cxf/plugin/state/SPStateManager.java | 16 +-
.../cxf/web/ThreadLocalCallbackHandler.java | 4 +-
.../fediz/jetty8/FederationAuthenticator.java | 124 ++---
.../fediz/jetty8/FederationIdentityService.java | 12 +-
.../fediz/jetty8/FederationLoginService.java | 26 +-
.../fediz/jetty8/FederationUserIdentity.java | 14 +-
.../fediz/jetty8/FederationUserPrincipal.java | 4 +-
.../fediz/jetty9/FederationAuthenticator.java | 122 ++---
.../fediz/jetty9/FederationIdentityService.java | 12 +-
.../fediz/jetty9/FederationLoginService.java | 26 +-
.../fediz/jetty9/FederationUserIdentity.java | 14 +-
.../fediz/jetty9/FederationUserPrincipal.java | 4 +-
.../cxf/fediz/spring/FederationConfig.java | 4 +-
.../cxf/fediz/spring/FederationConfigImpl.java | 12 +-
.../apache/cxf/fediz/spring/FederationUser.java | 14 +-
.../AbstractFederationUserDetailsService.java | 2 +-
.../authentication/ExpiredTokenException.java | 4 +-
.../FederationAuthenticationProvider.java | 18 +-
.../FederationAuthenticationToken.java | 2 +-
.../FederationResponseAuthenticationToken.java | 2 +-
...AuthoritiesUserDetailsFederationService.java | 14 +-
...erationPreAuthenticatedProcessingFilter.java | 2 +-
...AuthoritiesUserDetailsFederationService.java | 4 +-
.../web/FederationAuthenticationEntryPoint.java | 22 +-
.../FederationAuthenticationFailureHandler.java | 24 +-
.../web/FederationAuthenticationFilter.java | 38 +-
.../spring/web/FederationLogoutFilter.java | 2 +-
.../web/FederationLogoutSuccessHandler.java | 4 +-
.../cxf/fediz/spring/FederationConfig.java | 4 +-
.../cxf/fediz/spring/FederationConfigImpl.java | 16 +-
.../apache/cxf/fediz/spring/FederationUser.java | 18 +-
.../AbstractFederationUserDetailsService.java | 6 +-
.../authentication/ExpiredTokenException.java | 4 +-
.../FederationAuthenticationProvider.java | 18 +-
.../FederationAuthenticationToken.java | 2 +-
.../FederationResponseAuthenticationToken.java | 2 +-
...AuthoritiesUserDetailsFederationService.java | 14 +-
...erationPreAuthenticatedProcessingFilter.java | 2 +-
...AuthoritiesUserDetailsFederationService.java | 8 +-
.../web/FederationAuthenticationEntryPoint.java | 26 +-
.../web/FederationAuthenticationFilter.java | 52 +-
.../fediz/tomcat7/FederationAuthenticator.java | 24 +-
.../fediz/tomcat7/FederationPrincipalImpl.java | 2 +-
.../fediz/tomcat8/FederationAuthenticator.java | 24 +-
.../org/apache/cxf/fediz/was/Constants.java | 8 +-
.../was/mapper/FileBasedRoleToGroupMapper.java | 2 +-
.../cxf/fediz/was/mapper/RoleToGroupMapper.java | 10 +-
.../filter/SecurityContextTTLChecker.java | 6 +-
.../cxf/fediz/was/tai/FedizInterceptor.java | 12 +-
.../cxf/fediz/was/tai/FedizInterceptorTest.java | 14 +-
.../cxf/fediz/service/idp/MetadataServlet.java | 14 +-
.../service/idp/STSAuthenticationProvider.java | 54 +-
.../idp/STSKrbAuthenticationProvider.java | 58 +-
.../cxf/fediz/service/idp/STSPortFilter.java | 14 +-
.../idp/STSPreAuthAuthenticationProvider.java | 28 +-
.../idp/STSUPAuthenticationProvider.java | 38 +-
.../cxf/fediz/service/idp/STSUserDetails.java | 18 +-
.../service/idp/beans/CommonsURLValidator.java | 6 +-
.../idp/beans/IdpTokenExpiredAction.java | 8 +-
.../idp/beans/PassiveRequestorValidator.java | 16 +-
.../service/idp/beans/STSClientAction.java | 96 ++--
.../service/idp/beans/TokenSerializer.java | 4 +-
.../idp/beans/TrustedIdpProtocolAction.java | 24 +-
.../idp/beans/samlsso/AuthnRequestParser.java | 96 ++--
.../idp/beans/samlsso/LocalRedirectCreator.java | 10 +-
.../idp/beans/samlsso/SamlResponseCreator.java | 56 +-
.../beans/samlsso/SamlResponseErrorCreator.java | 16 +-
.../service/idp/beans/wsfed/WfreshParser.java | 12 +-
.../fediz/service/idp/domain/Application.java | 48 +-
.../cxf/fediz/service/idp/domain/Claim.java | 12 +-
.../fediz/service/idp/domain/Entitlement.java | 8 +-
.../service/idp/domain/FederationType.java | 80 +--
.../cxf/fediz/service/idp/domain/Idp.java | 16 +-
.../fediz/service/idp/domain/RequestClaim.java | 12 +-
.../cxf/fediz/service/idp/domain/Role.java | 10 +-
.../cxf/fediz/service/idp/domain/TrustType.java | 80 +--
.../fediz/service/idp/domain/TrustedIdp.java | 32 +-
.../KerberosAuthenticationProcessingFilter.java | 6 +-
.../idp/kerberos/KerberosEntryPoint.java | 8 +-
.../kerberos/KerberosServiceRequestToken.java | 20 +-
.../idp/kerberos/KerberosTokenValidator.java | 18 +-
.../idp/kerberos/PassThroughKerberosClient.java | 8 +-
.../service/idp/metadata/IdpMetadataWriter.java | 10 +-
.../idp/metadata/ServiceMetadataWriter.java | 48 +-
.../cxf/fediz/service/idp/model/IDPConfig.java | 4 +-
.../fediz/service/idp/model/RequestClaim.java | 4 +-
.../fediz/service/idp/model/ServiceConfig.java | 4 +-
.../service/idp/model/TrustedIDPSelection.java | 2 +-
...AbstractTrustedIdpOAuth2ProtocolHandler.java | 52 +-
.../AbstractTrustedIdpProtocolHandler.java | 14 +-
.../ApplicationProtocolControllerImpl.java | 6 +-
.../ApplicationSAMLSSOProtocolHandler.java | 2 +-
.../ApplicationWSFedProtocolHandler.java | 2 +-
.../TrustedIdpFacebookProtocolHandler.java | 58 +-
.../TrustedIdpOIDCProtocolHandler.java | 102 ++--
.../TrustedIdpProtocolControllerImpl.java | 6 +-
.../TrustedIdpSAMLProtocolHandler.java | 80 +--
.../TrustedIdpWSFedProtocolHandler.java | 52 +-
.../service/idp/rest/ApplicationService.java | 8 +-
.../idp/rest/ApplicationServiceImpl.java | 34 +-
.../fediz/service/idp/rest/ClaimService.java | 6 +-
.../service/idp/rest/ClaimServiceImpl.java | 24 +-
.../service/idp/rest/EntitlementService.java | 6 +-
.../idp/rest/EntitlementServiceImpl.java | 16 +-
.../cxf/fediz/service/idp/rest/IdpService.java | 18 +-
.../fediz/service/idp/rest/IdpServiceImpl.java | 68 +--
.../idp/rest/QueryResourceInfoComparator.java | 228 ++++----
.../idp/rest/RestServiceExceptionMapper.java | 166 +++---
.../cxf/fediz/service/idp/rest/RoleService.java | 8 +-
.../fediz/service/idp/rest/RoleServiceImpl.java | 34 +-
.../fediz/service/idp/rest/RootServiceImpl.java | 2 +-
.../service/idp/rest/TrustedIdpService.java | 4 +-
.../service/idp/rest/TrustedIdpServiceImpl.java | 24 +-
.../idp/samlsso/SAML2CallbackHandler.java | 26 +-
.../samlsso/SAML2PResponseComponentBuilder.java | 42 +-
.../service/idp/samlsso/SAMLAuthnRequest.java | 18 +-
.../service/idp/service/ApplicationDAO.java | 2 +-
.../cxf/fediz/service/idp/service/ClaimDAO.java | 8 +-
.../service/idp/service/ConfigService.java | 2 +-
.../idp/service/ConfigServiceSpring.java | 2 +-
.../service/idp/service/EntitlementDAO.java | 8 +-
.../cxf/fediz/service/idp/service/IdpDAO.java | 10 +-
.../cxf/fediz/service/idp/service/RoleDAO.java | 2 +-
.../idp/service/jpa/ApplicationClaimEntity.java | 14 +-
.../idp/service/jpa/ApplicationDAOJPAImpl.java | 80 +--
.../idp/service/jpa/ApplicationEntity.java | 36 +-
.../ApplicationIdpProtocolSupportValidator.java | 4 +-
.../idp/service/jpa/ClaimDAOJPAImpl.java | 34 +-
.../service/idp/service/jpa/ClaimEntity.java | 12 +-
.../idp/service/jpa/ConfigServiceJPA.java | 18 +-
.../service/jpa/DBInitApplicationListener.java | 12 +-
.../fediz/service/idp/service/jpa/DBLoader.java | 2 +-
.../service/idp/service/jpa/DBLoaderImpl.java | 28 +-
.../service/idp/service/jpa/DBLoaderSpring.java | 30 +-
.../idp/service/jpa/EntitlementDAOJPAImpl.java | 34 +-
.../idp/service/jpa/EntitlementEntity.java | 12 +-
.../service/idp/service/jpa/IdpDAOJPAImpl.java | 116 ++--
.../service/idp/service/jpa/IdpEntity.java | 10 +-
.../service/idp/service/jpa/RoleDAOJPAImpl.java | 64 +--
.../service/idp/service/jpa/RoleEntity.java | 14 +-
.../idp/service/jpa/TrustedIdpDAOJPAImpl.java | 34 +-
.../idp/service/jpa/TrustedIdpEntity.java | 24 +-
.../jpa/TrustedIdpProtocolSupportValidator.java | 4 +-
.../security/GrantedAuthorityEntitlements.java | 20 +-
.../idp/spi/ApplicationProtocolHandler.java | 4 +-
.../idp/spi/TrustedIdpProtocolHandler.java | 4 +-
.../cxf/fediz/service/idp/util/WebUtils.java | 8 +-
.../idp/service/jpa/ApplicationDAOJPATest.java | 114 ++--
.../idp/service/jpa/ClaimDAOJPATest.java | 36 +-
.../idp/service/jpa/EntitlementDAOJPATest.java | 40 +-
.../service/idp/service/jpa/IdpDAOJPATest.java | 244 ++++-----
.../service/idp/service/jpa/TestDBLoader.java | 20 +-
.../idp/service/jpa/TrustedIdpDAOJPATest.java | 94 ++--
.../service/idp/util/MetadataWriterTest.java | 12 +-
.../idp/integrationtests/RestITTest.java | 32 +-
.../fediz/service/oidc/FedizSubjectCreator.java | 60 +--
.../service/oidc/OAuthDataProviderImpl.java | 24 +-
.../oidc/PrivateKeyPasswordProviderImpl.java | 2 +-
.../service/oidc/clients/ClientCodeGrants.java | 2 +-
.../oidc/clients/ClientRegistrationService.java | 68 +--
.../service/oidc/clients/ClientTokens.java | 2 +-
.../oidc/clients/InvalidRegistration.java | 2 +-
.../service/oidc/clients/RegisterClient.java | 2 +-
.../service/oidc/clients/RegisteredClients.java | 2 +-
.../fediz/service/oidc/console/UserConsole.java | 2 +-
.../oidc/console/UserConsoleService.java | 8 +-
.../handler/hrd/ApplicationContextProvider.java | 4 +-
.../handler/hrd/ClientIdHomeRealmDiscovery.java | 12 +-
.../hrd/LoginHintHomeRealmDiscovery.java | 4 +-
.../service/oidc/logout/LogoutService.java | 48 +-
.../oidc/logout/SignoutQueryHandler.java | 2 +-
.../oidc/logout/TokenCleanupHandler.java | 4 +-
.../service/sts/FedizSAMLDelegationHandler.java | 10 +-
.../service/sts/FedizX509DelegationHandler.java | 14 +-
.../fediz/service/sts/FileClaimsHandler.java | 12 +-
.../service/sts/realms/IdentityMapperImpl.java | 2 +-
.../realms/RealmExtensionIdentityMapper.java | 2 +-
.../sts/realms/RealmFileClaimsHandler.java | 16 +-
.../service/sts/realms/SamlRealmCodec.java | 4 +-
.../service/sts/realms/UriRealmParser.java | 2 +-
.../apache/cxf/fediz/sts/AbstractSTSTest.java | 12 +-
.../java/org/apache/cxf/fediz/sts/Utils.java | 4 +-
.../cxf/fediz/sts/realms/ITCrossRealmTest.java | 26 +-
.../RealmExtensionIdentityMapperTest.java | 10 +-
.../test/java/custom/CustomClaimsHandler.java | 18 +-
.../src/test/java/custom/CustomUTValidator.java | 10 +-
.../systests/custom/CustomParametersTest.java | 32 +-
.../federation/FederationTest.java | 38 +-
.../fediz/oidc/idp/example/BasicAuthFilter.java | 2 +-
.../oidc/idp/example/CommonCallbackHandler.java | 2 +-
.../idp/example/EHCacheOIDCTokenProvider.java | 6 +-
.../oidc/idp/example/IdTokenProviderImpl.java | 4 +-
.../fediz/samlsso/example/BasicAuthFilter.java | 16 +-
.../samlsso/example/SAML2CallbackHandler.java | 28 +-
.../example/SAML2PResponseComponentBuilder.java | 42 +-
.../cxf/fediz/samlsso/example/SamlSso.java | 66 +--
.../fediz/samlsso/service/DoubleItService.java | 2 +-
.../service/KeystorePasswordCallback.java | 10 +-
.../cxf/fediz/samlsso/service/Number.java | 6 +-
.../cxf/fediz/integrationtests/RealmMapper.java | 8 +-
.../cxf/fediz/integrationtests/SAMLSSOTest.java | 80 +--
.../cxf/fediz/integrationtests/WSFedTest.java | 110 ++--
.../apache/cxf/fediz/systests/idp/IdpTest.java | 62 +--
.../ClientCertificatePreAuthSpringTest.java | 18 +-
.../integrationtests/ClientCertificateTest.java | 16 +-
.../integrationtests/HOKCallbackHandler.java | 4 +-
.../JettyPreAuthSpringTest.java | 12 +-
.../cxf/fediz/integrationtests/JettyTest.java | 8 +-
.../cxf/fediz/integrationtests/JettyUtils.java | 28 +-
.../ClientCertificatePreAuthSpringTest.java | 30 +-
.../integrationtests/ClientCertificateTest.java | 28 +-
.../integrationtests/HOKCallbackHandler.java | 4 +-
.../JettyPreAuthSpringTest.java | 30 +-
.../cxf/fediz/integrationtests/JettyTest.java | 30 +-
.../cxf/fediz/integrationtests/JettyUtils.java | 16 +-
.../KerberosClientPasswordCallback.java | 4 +-
.../KerberosServicePasswordCallback.java | 6 +-
.../fediz/integrationtests/KerberosTest.java | 78 +--
.../cxf/fediz/integrationtests/LDAPTest.java | 50 +-
.../cxf/fediz/systests/oidc/OIDCTest.java | 230 ++++----
.../apache/cxf/fediz/systests/idp/IdpTest.java | 526 +++++++++----------
.../cxf/fediz/integrationtests/Spring2Test.java | 54 +-
.../cxf/fediz/integrationtests/SpringTest.java | 24 +-
.../AbstractClientCertTests.java | 24 +-
.../fediz/integrationtests/AbstractTests.java | 36 +-
.../fediz/integrationtests/HTTPTestUtils.java | 18 +-
.../AudienceRestrictionTest.java | 34 +-
.../integrationtests/ClientCertificateTest.java | 28 +-
.../integrationtests/HOKCallbackHandler.java | 4 +-
.../fediz/integrationtests/HolderOfKeyTest.java | 44 +-
.../integrationtests/TestCallbackHandler.java | 4 +-
.../cxf/fediz/integrationtests/TomcatTest.java | 28 +-
.../cxf/fediz/integrationtests/WReqTest.java | 40 +-
.../AudienceRestrictionTest.java | 34 +-
.../integrationtests/ClientCertificateTest.java | 28 +-
.../integrationtests/HOKCallbackHandler.java | 4 +-
.../fediz/integrationtests/HolderOfKeyTest.java | 42 +-
.../integrationtests/TestCallbackHandler.java | 4 +-
.../cxf/fediz/integrationtests/TomcatTest.java | 28 +-
.../cxf/fediz/integrationtests/WReqTest.java | 42 +-
.../org/apache/cxf/fediz/example/Service.java | 32 +-
.../cxf/fediz/example/FederationServlet.java | 12 +-
.../cxf/fediz/example/FederationServlet.java | 18 +-
.../cxf/fediz/example/FederationServlet.java | 14 +-
.../cxf/fediz/example/FederationServlet.java | 18 +-
338 files changed, 5223 insertions(+), 5223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/examples/jaxrsCxfPluginWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
----------------------------------------------------------------------
diff --git a/examples/jaxrsCxfPluginWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java b/examples/jaxrsCxfPluginWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
index 471b8bf..01bc608 100644
--- a/examples/jaxrsCxfPluginWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
+++ b/examples/jaxrsCxfPluginWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
@@ -50,9 +50,9 @@ import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
@Path("/")
public class FederationService {
- @Context
+ @Context
private UriInfo uriInfo;
- @Context
+ @Context
private SecurityContext securityContext;
@POST
public Response getTokenInfoFromPost() {
@@ -80,7 +80,7 @@ public class FederationService {
out.append("<br><b>Roles</b><p>");
List<String> roleListToCheck = Arrays.asList("Admin", "Manager", "User", "Authenticated");
for (String item: roleListToCheck) {
- out.append("Has role '" + item + "': "
+ out.append("Has role '" + item + "': "
+ ((securityContext.isUserInRole(item)) ? "<b>yes</b>" : "no") + "<p>");
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/examples/jaxrsSimpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
----------------------------------------------------------------------
diff --git a/examples/jaxrsSimpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java b/examples/jaxrsSimpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
index fa31a87..5d2dfae 100644
--- a/examples/jaxrsSimpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
+++ b/examples/jaxrsSimpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
@@ -73,7 +73,7 @@ public class FederationService {
out.append("<br><b>Roles</b><p>");
List<String> roleListToCheck = Arrays.asList("Admin", "Manager", "User", "Authenticated");
for (String item: roleListToCheck) {
- out.append("Has role '" + item + "': "
+ out.append("Has role '" + item + "': "
+ ((securityContext.isUserInRole(item)) ? "<b>yes</b>" : "no") + "<p>");
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
----------------------------------------------------------------------
diff --git a/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 3c456c9..b6f240f 100644
--- a/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -48,7 +48,7 @@ import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
public class FederationServlet extends HttpServlet {
/**
- *
+ *
*/
private static final long serialVersionUID = -9019993850246851112L;
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
----------------------------------------------------------------------
diff --git a/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 1f2a58a..2c6054d 100644
--- a/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/spring2Webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -51,7 +51,7 @@ import org.springframework.security.context.SecurityContextHolder;
public class FederationServlet extends HttpServlet {
/**
- *
+ *
*/
private static final long serialVersionUID = -9019993850246851112L;
@@ -74,7 +74,7 @@ public class FederationServlet extends HttpServlet {
if (p != null) {
out.println("Principal: " + p.getName() + "<p>");
}
-
+
// Access Spring security context
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if (auth instanceof FederationAuthenticationToken) {
@@ -84,7 +84,7 @@ public class FederationServlet extends HttpServlet {
out.println("<li>" + item.getAuthority() + "</li>");
}
out.println("</ul>");
-
+
if (fedAuthToken.getUserDetails() instanceof FederationUser) {
out.println("<br><b>Claims</b><p>");
ClaimCollection claims = ((FederationUser)fedAuthToken.getUserDetails()).getClaims();
@@ -94,7 +94,7 @@ public class FederationServlet extends HttpServlet {
} else {
out.println("FederationAuthenticationToken found but not FederationUser");
}
-
+
} else {
out.println("No FederationAuthenticationToken found in Spring Security Context.");
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
----------------------------------------------------------------------
diff --git a/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 9e4a042..90afce4 100644
--- a/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/springPreauthWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -51,7 +51,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
public class FederationServlet extends HttpServlet {
/**
- *
+ *
*/
private static final long serialVersionUID = -9019993850246851112L;
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
----------------------------------------------------------------------
diff --git a/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 498cc6d..33443a1 100644
--- a/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/springWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -51,7 +51,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
public class FederationServlet extends HttpServlet {
/**
- *
+ *
*/
private static final long serialVersionUID = -9019993850246851112L;
@@ -74,7 +74,7 @@ public class FederationServlet extends HttpServlet {
if (p != null) {
out.println("Principal: " + p.getName() + "<p>");
}
-
+
// Access Spring security context
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if (auth instanceof FederationAuthenticationToken) {
@@ -84,7 +84,7 @@ public class FederationServlet extends HttpServlet {
out.println("<li>" + item.getAuthority() + "</li>");
}
out.println("</ul>");
-
+
if (fedAuthToken.getUserDetails() instanceof FederationUser) {
out.println("<br><b>Claims</b><p>");
ClaimCollection claims = ((FederationUser)fedAuthToken.getUserDetails()).getClaims();
@@ -94,7 +94,7 @@ public class FederationServlet extends HttpServlet {
} else {
out.println("FederationAuthenticationToken found but not FederationUser");
}
-
+
} else {
out.println("No FederationAuthenticationToken found in Spring Security Context.");
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/examples/websphereWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
----------------------------------------------------------------------
diff --git a/examples/websphereWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/examples/websphereWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index e7387b3..2d6a4f4 100644
--- a/examples/websphereWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/websphereWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -48,7 +48,7 @@ import org.apache.cxf.fediz.core.processor.FedizResponse;
public class FederationServlet extends HttpServlet {
/**
- *
+ *
*/
private static final String SUBJECT_TOKEN_KEY = "_security.token";
@@ -109,7 +109,7 @@ public class FederationServlet extends HttpServlet {
}
} catch (WSSecurityException e) {
out.println("<p>Exception=" + e.getMessage() + "</p>");
- }
+ }
}
private FedizResponse getCachedFederationResponse(Subject subject) {
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ClaimsCallbackHandler.java
----------------------------------------------------------------------
diff --git a/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ClaimsCallbackHandler.java b/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ClaimsCallbackHandler.java
index d999968..acc5506 100644
--- a/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ClaimsCallbackHandler.java
+++ b/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ClaimsCallbackHandler.java
@@ -36,33 +36,33 @@ import org.apache.cxf.ws.security.trust.claims.ClaimsCallback;
* stores it on the ClaimsCallback object.
*/
public class ClaimsCallbackHandler implements CallbackHandler {
-
+
public void handle(Callback[] callbacks)
throws IOException, UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof ClaimsCallback) {
ClaimsCallback callback = (ClaimsCallback) callbacks[i];
callback.setClaims(createClaims());
-
+
} else {
throw new UnsupportedCallbackException(callbacks[i], "Unrecognized Callback");
}
}
}
-
+
/**
* Create a Claims Element for a "role"
*/
private Element createClaims() {
Document doc = DOMUtils.createDocument();
- Element claimsElement =
+ Element claimsElement =
doc.createElementNS("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Claims");
claimsElement.setAttributeNS(null, "Dialect", "http://schemas.xmlsoap.org/ws/2005/05/identity");
- Element claimType =
+ Element claimType =
doc.createElementNS("http://schemas.xmlsoap.org/ws/2005/05/identity", "ClaimType");
claimType.setAttributeNS(null, "Uri", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role");
claimsElement.appendChild(claimType);
return claimsElement;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
----------------------------------------------------------------------
diff --git a/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java b/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 1fcb751..96f8d6f 100644
--- a/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++ b/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -49,7 +49,7 @@ import org.apache.hello_world_soap_http.Greeter;
public class FederationServlet extends HttpServlet {
/**
- *
+ *
*/
private static final long serialVersionUID = -9019993850246851112L;
@@ -156,7 +156,7 @@ public class FederationServlet extends HttpServlet {
Greeter service = (Greeter)ApplicationContextProvider.getContext().getBean("HelloServiceClient");
String reply = service.greetMe();
-
+
out.println("<br><b>Greeter Service Response: " + reply + "</b><p>");
out.println("</body>");
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java
index 3c4814a..c8e47f5 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/Claim.java
@@ -29,7 +29,7 @@ import java.security.Principal;
public class Claim implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimCollection.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimCollection.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimCollection.java
index 806bc99..58a5848 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimCollection.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimCollection.java
@@ -32,7 +32,7 @@ import java.util.List;
public class ClaimCollection extends ArrayList<Claim> {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java
index d8f4464..6c5b736 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/ClaimTypes.java
@@ -30,23 +30,23 @@ public interface ClaimTypes {
* The base XML namespace URI that is used by the claim types
* http://docs.oasis-open.org/imi/identity/v1.0/os/identity-1.0-spec-os.pdf
*/
- URI URI_BASE =
+ URI URI_BASE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims");
/**
* (givenName in [RFC 2256]) Preferred name or first name of a Subject.
- * According to RFC 2256: This attribute is used to hold the part of a person's name
+ * According to RFC 2256: This attribute is used to hold the part of a person's name
* which is not their surname nor middle name.
*/
- URI FIRSTNAME =
+ URI FIRSTNAME =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname");
/**
* (sn in [RFC 2256]) Surname or family name of a Subject.
* According to RFC 2256: This is the X.500 surname attribute which contains the family name of a person.
*/
- URI LASTNAME =
- URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname");
+ URI LASTNAME =
+ URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname");
/**
* (mail in inetOrgPerson) Preferred address for the "To:" field of email
@@ -54,45 +54,45 @@ public interface ClaimTypes {
* According to inetOrgPerson using [RFC 1274]: This attribute type specifies
* an electronic mailbox attribute following the syntax specified in RFC 822.
*/
- URI EMAILADDRESS =
- URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress");
+ URI EMAILADDRESS =
+ URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress");
/**
* (street in [RFC 2256]) Street address component of a Subject\u201fs address information.
* According to RFC 2256: This attribute contains the physical address of the object
* to which the entry corresponds, such as an address for package delivery.
*/
- URI STREETADDRESS =
- URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress");
+ URI STREETADDRESS =
+ URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress");
/**
* (/ in [RFC 2256]) Locality component of a Subject's address information.
* According to RFC 2256: This attribute contains the name of a locality, such as a city,
* county or other geographic region.
*/
- URI LOCALITY =
- URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/locality");
+ URI LOCALITY =
+ URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/locality");
/**
* (st in [RFC 2256]) Abbreviation for state or province name of a Subject's address information.
* According to RFC 2256: \u201cThis attribute contains the full name of a state or province.
* The values SHOULD be coordinated on a national level and if well-known shortcuts exist.
*/
- URI STATE_PROVINCE =
- URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/stateorprovince");
+ URI STATE_PROVINCE =
+ URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/stateorprovince");
/**
* (postalCode in X.500) Postal code or zip code component of a Subject's address information.
* According to X.500(2001): The postal code attribute type specifies the postal code of the named object.
*/
- URI POSTALCODE =
+ URI POSTALCODE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/postalcode");
/**
* (c in [RFC 2256]) Country of a Subject.
* According to RFC 2256: This attribute contains a two-letter ISO 3166 country code.
*/
- URI COUNTRY =
+ URI COUNTRY =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country");
/**
@@ -100,7 +100,7 @@ public interface ClaimTypes {
* According to inetOrgPerson using [RFC 1274]: This attribute type specifies
* a home telephone number associated with a person.
*/
- URI HOMEPHONE =
+ URI HOMEPHONE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/homephone");
/**
@@ -108,39 +108,39 @@ public interface ClaimTypes {
* According to X.500(2001): This attribute type specifies an
* office/campus telephone number associated with a person.
*/
- URI OTHERPHONE =
- URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/otherphone");
+ URI OTHERPHONE =
+ URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/otherphone");
/**
* (mobile in inetOrgPerson) Mobile telephone number of a Subject.
* According to inetOrgPerson using [RFC 1274]: This attribute type specifies a
* mobile telephone number associated with a person.
*/
- URI MOBILEPHONE =
+ URI MOBILEPHONE =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/mobilephone");
/**
* The date of birth of a Subject in a form allowed by the xs:date data type.
*/
- URI DATEOFBIRTH =
+ URI DATEOFBIRTH =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/dateofbirth");
/**
* Gender of a Subject that can have any of these exact URI values
* '0' (meaning unspecified), '1' (meaning Male) or '2' (meaning Female)
*/
- URI GENDER =
+ URI GENDER =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/gender");
/**
* A private personal identifier (PPID) that identifies the Subject to a Relying Party.
*/
- URI PRIVATE_PERSONAL_IDENTIFIER =
+ URI PRIVATE_PERSONAL_IDENTIFIER =
URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier");
/**
* The Web page of a Subject expressed as a URL.
*/
- URI WEB_PAGE =
- URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/webpage");
+ URI WEB_PAGE =
+ URI.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/webpage");
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
index b8f7d70..6839ff5 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FederationConstants.java
@@ -28,7 +28,7 @@ import java.util.Map;
* Constants specific to WS-Federation
*/
public final class FederationConstants extends FedizConstants {
-
+
public static final String WSFED_METHOD = "WSFED";
/**
@@ -208,7 +208,7 @@ public final class FederationConstants extends FedizConstants {
.create("http://docs.oasis-open.org/wsfed/authorization/200706/authntypes/smartcard");
public static final String METADATA_PATH_URI = "FederationMetadata/2007-06/FederationMetadata.xml";
-
+
private FederationConstants() {
super();
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizConstants.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizConstants.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizConstants.java
index f5205f4..47b0767 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizConstants.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizConstants.java
@@ -22,23 +22,23 @@ package org.apache.cxf.fediz.core;
import java.net.URI;
public class FedizConstants {
-
+
public static final URI DEFAULT_ROLE_URI = URI
.create("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role");
public static final String WS_TRUST_13_NS = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
-
+
public static final String WS_TRUST_2005_02_NS = "http://schemas.xmlsoap.org/ws/2005/02/trust";
-
+
public static final String SAML2_METADATA_NS = "urn:oasis:names:tc:SAML:2.0:metadata";
-
+
public static final String WS_FEDERATION_NS = "http://docs.oasis-open.org/wsfed/federation/200706";
-
+
public static final String WS_ADDRESSING_NS = "http://www.w3.org/2005/08/addressing";
-
+
public static final String SCHEMA_INSTANCE_NS = "http://www.w3.org/2001/XMLSchema-instance";
-
+
protected FedizConstants() {
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java
index 52d7c17..f74991a 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/FedizPrincipal.java
@@ -27,9 +27,9 @@ import org.w3c.dom.Element;
public interface FedizPrincipal extends Principal {
ClaimCollection getClaims();
-
+
Element getLoginToken();
-
+
List<String> getRoleClaims();
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java
index cfe761f..8192413 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/RequestState.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class RequestState implements Serializable {
private static final long serialVersionUID = 869323136115571943L;
-
+
private String targetAddress;
private String idpServiceAddress;
private String requestId;
@@ -38,11 +38,11 @@ public class RequestState implements Serializable {
private long createdAt;
private String state;
private String webAppDomain;
-
+
public RequestState() {
-
+
}
-
+
// CHECKSTYLE:OFF
public RequestState(String targetAddress,
String idpServiceAddress,
@@ -62,7 +62,7 @@ public class RequestState implements Serializable {
setCreatedAt(createdAt);
}
-
+
public void setTargetAddress(String targetAddress) {
this.targetAddress = targetAddress;
}
@@ -114,7 +114,7 @@ public class RequestState implements Serializable {
public String getWebAppContext() {
return webAppContext;
}
-
+
public String getState() {
return state;
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/SAMLSSOConstants.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/SAMLSSOConstants.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/SAMLSSOConstants.java
index e82bd7d..6dce445 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/SAMLSSOConstants.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/SAMLSSOConstants.java
@@ -23,19 +23,19 @@ package org.apache.cxf.fediz.core;
* Constants specific to SAML SSO
*/
public final class SAMLSSOConstants extends FedizConstants {
-
+
public static final String FEDIZ_SAML_METADATA_PATH_URI = "SAML/Metadata.xml";
-
+
public static final String SAML_REQUEST = "SAMLRequest";
-
- public static final String SAML_RESPONSE = "SAMLResponse";
-
+
+ public static final String SAML_RESPONSE = "SAMLResponse";
+
public static final String RELAY_STATE = "RelayState";
-
+
public static final String SIG_ALG = "SigAlg";
-
+
public static final String SIGNATURE = "Signature";
-
+
private SAMLSSOConstants() {
super();
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java
index 6b1021d..91c023f 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/SecurityTokenThreadLocal.java
@@ -27,14 +27,14 @@ import org.w3c.dom.Element;
*/
public final class SecurityTokenThreadLocal {
- private static final ThreadLocal<Element> TLS =
+ private static final ThreadLocal<Element> TLS =
new ThreadLocal<Element>();
private SecurityTokenThreadLocal() {
- }
-
+ }
+
public static void setToken(Element token) {
- if (token == null) {
+ if (token == null) {
TLS.remove();
} else {
TLS.set(token);
@@ -44,6 +44,6 @@ public final class SecurityTokenThreadLocal {
public static Element getToken() {
return TLS.get();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
index f05a45b..f62bb4c 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidator.java
@@ -41,10 +41,10 @@ public interface TokenValidator {
/**
* Validate a Token using the given Element and Configuration.
- * @throws ProcessingException
+ * @throws ProcessingException
*/
TokenValidatorResponse validateAndProcessToken(
- TokenValidatorRequest request,
+ TokenValidatorRequest request,
FedizContext config
) throws ProcessingException;
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java
index 11a2740..2d9788e 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/TokenValidatorResponse.java
@@ -35,7 +35,7 @@ public class TokenValidatorResponse {
- public TokenValidatorResponse(String uniqueTokenId, String username, String issuer,
+ public TokenValidatorResponse(String uniqueTokenId, String username, String issuer,
List<String> roles, List<Claim> claims, String audience) {
this.username = username;
this.issuer = issuer;
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertificateValidationMethod.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertificateValidationMethod.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertificateValidationMethod.java
index cee16e1..6620a68 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertificateValidationMethod.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/CertificateValidationMethod.java
@@ -25,7 +25,7 @@ public enum CertificateValidationMethod {
PEER_TRUST("PeerTrust"),
CHAIN_TRUST("ChainTrust");
-
+
private final String value;
CertificateValidationMethod(String v) {
@@ -38,7 +38,7 @@ public enum CertificateValidationMethod {
public String value() {
return value;
}
-
+
public static CertificateValidationMethod fromValue(String v) {
for (CertificateValidationMethod c: CertificateValidationMethod.values()) {
if (c.value.equals(v)) {
@@ -48,6 +48,6 @@ public enum CertificateValidationMethod {
throw new IllegalArgumentException(v);
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java
index 080d2ae..41c7acc 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Claim.java
@@ -62,21 +62,21 @@ public class Claim {
if (!(obj instanceof Claim)) {
return false;
}
-
+
Claim that = (Claim)obj;
if (claimType != null && !claimType.equals(that.getClaimType())) {
return false;
} else if (claimType == null && that.getClaimType() != null) {
return false;
}
-
+
return true;
}
public String toString() {
return claimType.toString();
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java
index b25795a..a3a87dd 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FederationProtocol.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
public class FederationProtocol extends Protocol {
private static final Logger LOG = LoggerFactory.getLogger(FederationProtocol.class);
-
+
private Object request;
private Object authenticationType;
private Object homeRealm;
@@ -39,10 +39,10 @@ public class FederationProtocol extends Protocol {
private Object signInQuery;
private Object signOutQuery;
private Object reply;
-
+
public FederationProtocol(ProtocolType protocolType) {
super(protocolType);
-
+
// add SAMLTokenValidator as the last one
// Fediz chooses the first validator in the list if its
// canHandleToken or canHandleTokenType method return true
@@ -78,7 +78,7 @@ public class FederationProtocol extends Protocol {
+ "java.lang.String or javax.security.auth.callback.CallbackHandler.");
}
}
-
+
public Object getHomeRealm() {
if (this.homeRealm != null) {
return this.homeRealm;
@@ -99,7 +99,7 @@ public class FederationProtocol extends Protocol {
+ "java.lang.String or javax.security.auth.callback.CallbackHandler.");
}
}
-
+
public Object getFreshness() {
if (this.freshness != null) {
return this.freshness;
@@ -120,7 +120,7 @@ public class FederationProtocol extends Protocol {
+ "java.lang.String or javax.security.auth.callback.CallbackHandler.");
}
}
-
+
public Object getSignInQuery() {
if (this.signInQuery != null) {
return this.signInQuery;
@@ -141,7 +141,7 @@ public class FederationProtocol extends Protocol {
+ "java.lang.String or javax.security.auth.callback.CallbackHandler.");
}
}
-
+
public Object getSignOutQuery() {
if (this.signOutQuery != null) {
return this.signOutQuery;
@@ -162,7 +162,7 @@ public class FederationProtocol extends Protocol {
+ "java.lang.String or javax.security.auth.callback.CallbackHandler.");
}
}
-
+
public Object getRequest() {
if (this.request != null) {
return this.request;
@@ -171,7 +171,7 @@ public class FederationProtocol extends Protocol {
this.request = loadCallbackType(cbt, "Request");
return this.request;
}
-
+
public void setRequest(Object value) {
final boolean isString = value instanceof String;
final boolean isCallbackHandler = value instanceof CallbackHandler;
@@ -216,5 +216,5 @@ public class FederationProtocol extends Protocol {
public String toString() {
return getFederationProtocol().toString();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
index 3e86805..00f8129 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizConfigurator.java
@@ -39,7 +39,7 @@ public class FedizConfigurator {
private FedizConfig rootConfig;
private JAXBContext jaxbContext;
-
+
private List<FedizContext> fedizContextList;
public FedizConfig loadConfig(File f) throws JAXBException, IOException {
@@ -55,11 +55,11 @@ public class FedizConfigurator {
parseFedizContextList();
return rootConfig;
}
-
+
private void parseFedizContextList() {
fedizContextList = new ArrayList<>();
for (ContextConfig config : rootConfig.getContextConfig()) {
- fedizContextList.add(new FedizContext(config));
+ fedizContextList.add(new FedizContext(config));
}
}
@@ -83,7 +83,7 @@ public class FedizConfigurator {
public List<FedizContext> getFedizContextList() {
return fedizContextList;
}
-
+
public FedizContext getFedizContext(String contextName) {
if (contextName == null) {
throw new IllegalArgumentException("Context Name cannot be 'null'.");
@@ -100,7 +100,7 @@ public class FedizConfigurator {
return fedContext;
}
}
-
+
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
index 3a329e1..c3111de 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/FedizContext.java
@@ -55,11 +55,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FedizContext implements Closeable {
-
+
public static final String CACHE_KEY_PREFIX = "fediz.replay.cache";
private static final Logger LOG = LoggerFactory.getLogger(FedizContext.class);
-
+
private ContextConfig config;
private boolean detectReplayedTokens = true;
@@ -71,7 +71,7 @@ public class FedizContext implements Closeable {
private KeyManager decryptionKeyManager;
private ClassLoader classloader;
private Pattern logoutRedirectToConstraint;
-
+
public FedizContext(ContextConfig config) {
if (config == null) {
@@ -79,7 +79,7 @@ public class FedizContext implements Closeable {
}
this.config = config;
}
-
+
public void init() {
//get validators initialized
getProtocol();
@@ -94,24 +94,24 @@ public class FedizContext implements Closeable {
public List<TrustedIssuer> getTrustedIssuers() {
TrustedIssuers issuers = config.getTrustedIssuers();
- List<TrustedIssuerType> trustManagers = issuers.getIssuer();
+ List<TrustedIssuerType> trustManagers = issuers.getIssuer();
List<TrustedIssuer> trustedIssuers = new ArrayList<>();
for (TrustedIssuerType manager:trustManagers) {
trustedIssuers.add(new TrustedIssuer(manager));
}
- return trustedIssuers;
+ return trustedIssuers;
}
-
+
public List<TrustManager> getCertificateStores() {
if (!certificateStores.isEmpty()) {
return Collections.unmodifiableList(certificateStores);
}
-
+
CertificateStores certStores = config.getCertificateStores();
List<TrustManagersType> trustManagers = certStores.getTrustManager();
for (TrustManagersType manager : trustManagers) {
TrustManager tm = new TrustManager(manager);
-
+
Crypto crypto = null;
try {
if (manager.getKeyStore().getType().equalsIgnoreCase("PEM")) {
@@ -132,13 +132,13 @@ public class FedizContext implements Closeable {
throw new RuntimeException("Failed to read keystore");
}
}
- return Collections.unmodifiableList(certificateStores);
+ return Collections.unmodifiableList(certificateStores);
}
public BigInteger getMaximumClockSkew() {
return config.getMaximumClockSkew();
}
-
+
public void setMaximumClockSkew(BigInteger maximumClockSkew) {
config.setMaximumClockSkew(maximumClockSkew);
}
@@ -157,7 +157,7 @@ public class FedizContext implements Closeable {
} else if (type instanceof SamlProtocolType) {
protocol = new SAMLProtocol(type);
}
-
+
if (protocol != null) {
protocol.setClassloader(getClassloader());
}
@@ -171,16 +171,16 @@ public class FedizContext implements Closeable {
public String getLogoutRedirectTo() {
return config.getLogoutRedirectTo();
}
-
+
public Pattern getLogoutRedirectToConstraint() {
if (logoutRedirectToConstraint == null && config.getLogoutRedirectToConstraint() != null) {
logoutRedirectToConstraint = Pattern.compile(config.getLogoutRedirectToConstraint());
}
return logoutRedirectToConstraint;
}
-
+
public KeyManager getSigningKey() {
-
+
if (keyManager != null) {
return keyManager;
}
@@ -199,11 +199,11 @@ public class FedizContext implements Closeable {
LOG.error("Failed to load keystore '" + name + "'", e);
throw new IllegalConfigurationException("Failed to load keystore '" + name + "'");
}
-
- return keyManager;
-
+
+ return keyManager;
+
}
-
+
public KeyManager getDecryptionKey() {
if (decryptionKeyManager != null) {
return decryptionKeyManager;
@@ -222,9 +222,9 @@ public class FedizContext implements Closeable {
LOG.error("Failed to load keystore '" + name + "'", e);
throw new IllegalConfigurationException("Failed to load keystore '" + name + "'");
}
-
- return decryptionKeyManager;
-
+
+ return decryptionKeyManager;
+
}
public ReplayCache getTokenReplayCache() {
@@ -259,12 +259,12 @@ public class FedizContext implements Closeable {
public boolean isDetectExpiredTokens() {
return config.isTokenExpirationValidation();
}
-
+
public void setDetectExpiredTokens(boolean detectExpiredTokens) {
config.setTokenExpirationValidation(detectExpiredTokens);
}
-
+
public boolean isDetectReplayedTokens() {
return detectReplayedTokens;
}
@@ -287,7 +287,7 @@ public class FedizContext implements Closeable {
replayCache.close();
}
}
-
+
private Properties createCryptoProperties(TrustManagersType tm) {
String trustStoreFile = null;
KeyStoreType ks = tm.getKeyStore();
@@ -301,7 +301,7 @@ public class FedizContext implements Closeable {
trustStoreFile = ks.getResource();
}
}
-
+
if (trustStoreFile == null) {
throw new IllegalStateException("No certificate store configured");
}
@@ -309,7 +309,7 @@ public class FedizContext implements Closeable {
if (!f.exists() && getRelativePath() != null && !getRelativePath().isEmpty()) {
trustStoreFile = getRelativePath().concat(File.separator + trustStoreFile);
}
-
+
if (trustStoreFile == null || trustStoreFile.isEmpty()) {
throw new IllegalConfigurationException("truststoreFile not configured");
}
@@ -326,7 +326,7 @@ public class FedizContext implements Closeable {
trustStoreFile);
return p;
}
-
+
private Properties createCryptoProperties(KeyManagersType km) {
String keyStoreFile = null;
String keyType = "jks";
@@ -341,7 +341,7 @@ public class FedizContext implements Closeable {
keyStoreFile = ks.getResource();
}
}
-
+
if (keyStoreFile == null) {
throw new IllegalStateException("No certificate store configured");
}
@@ -349,7 +349,7 @@ public class FedizContext implements Closeable {
if (!f.exists() && getRelativePath() != null && !getRelativePath().isEmpty()) {
keyStoreFile = getRelativePath().concat(File.separator + keyStoreFile);
}
-
+
if (keyStoreFile == null || keyStoreFile.isEmpty()) {
throw new IllegalConfigurationException("truststoreFile not configured");
}
@@ -359,7 +359,7 @@ public class FedizContext implements Closeable {
if (ks.getType() != null) {
keyType = ks.getType();
}
-
+
Properties p = new Properties();
p.put("org.apache.ws.security.crypto.provider",
"org.apache.ws.security.components.crypto.Merlin");
@@ -370,7 +370,7 @@ public class FedizContext implements Closeable {
keyStoreFile);
return p;
}
-
+
public ClassLoader getClassloader() {
return classloader;
}
@@ -378,7 +378,7 @@ public class FedizContext implements Closeable {
public void setClassloader(ClassLoader classloader) {
this.classloader = classloader;
}
-
+
public boolean isAddAuthenticatedRole() {
return config.isAddAuthenticatedRole();
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyManager.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyManager.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyManager.java
index 0c7b518..3a89b9f 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyManager.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/KeyManager.java
@@ -23,7 +23,7 @@ import org.apache.cxf.fediz.core.config.jaxb.KeyManagersType;
import org.apache.wss4j.common.crypto.Crypto;
public class KeyManager {
-
+
private KeyManagersType keyManagerType;
private Crypto crypto;
private String name;
@@ -32,7 +32,7 @@ public class KeyManager {
super();
this.keyManagerType = keyManager;
}
-
+
public String getName() {
if (name != null) {
return name;
@@ -46,7 +46,7 @@ public class KeyManager {
}
return name;
}
-
+
public Crypto getCrypto() {
return crypto;
}
@@ -58,10 +58,10 @@ public class KeyManager {
public String getKeyAlias() {
return keyManagerType.getKeyAlias();
}
-
+
public String getKeyPassword() {
return keyManagerType.getKeyPassword();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java
index 8551aa7..ec9608e 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/PropertyType.java
@@ -23,14 +23,14 @@ import org.apache.cxf.fediz.core.config.jaxb.ArgumentType;
public enum PropertyType {
CLASS("Class"),
-
+
STRING("String");
private final String value;
PropertyType(String v) {
value = v;
}
-
+
PropertyType(ArgumentType arg) {
value = arg.value();
}
@@ -48,5 +48,5 @@ public enum PropertyType {
throw new IllegalArgumentException(v);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
index 993b011..f21b8a1 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/Protocol.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
public abstract class Protocol {
private static final Logger LOG = LoggerFactory.getLogger(Protocol.class);
-
+
private ProtocolType protocolType;
private ClassLoader classloader;
private Object issuer;
@@ -46,7 +46,7 @@ public abstract class Protocol {
public Protocol(ProtocolType protocolType) {
super();
this.protocolType = protocolType;
-
+
if (protocolType.getTokenValidators() != null && protocolType.getTokenValidators().getValidator() != null) {
for (String validatorClassname : protocolType.getTokenValidators().getValidator()) {
Object obj = null;
@@ -81,21 +81,21 @@ public abstract class Protocol {
if (!(obj instanceof Protocol)) {
return false;
}
-
+
Protocol that = (Protocol)obj;
if (protocolType != null && !protocolType.equals(that.getProtocolType())) {
return false;
} else if (protocolType == null && that.getProtocolType() != null) {
return false;
}
-
+
return true;
}
public String toString() {
return protocolType.toString();
}
-
+
public ClassLoader getClassloader() {
return classloader;
}
@@ -103,7 +103,7 @@ public abstract class Protocol {
public void setClassloader(ClassLoader classloader) {
this.classloader = classloader;
}
-
+
public String getRoleDelimiter() {
return getProtocolType().getRoleDelimiter();
}
@@ -119,11 +119,11 @@ public abstract class Protocol {
public void setRoleURI(String value) {
getProtocolType().setRoleURI(value);
}
-
+
public String getMetadataURI() {
return getProtocolType().getMetadataURI();
}
-
+
public void setMetadataURI(String value) {
getProtocolType().setMetadataURI(value);
}
@@ -148,7 +148,7 @@ public abstract class Protocol {
+ "java.lang.String or javax.security.auth.callback.CallbackHandler.");
}
}
-
+
public Object getRealm() {
if (this.realm != null) {
return this.realm;
@@ -169,11 +169,11 @@ public abstract class Protocol {
+ "java.lang.String or javax.security.auth.callback.CallbackHandler.");
}
}
-
+
public List<TokenValidator> getTokenValidators() {
return validators;
}
-
+
protected Object loadCallbackType(CallbackType cbt, String name) {
if (cbt == null || cbt.getValue() == null) {
return null;
@@ -221,7 +221,7 @@ public abstract class Protocol {
public void setClaimTypesRequested(ClaimTypesRequested value) {
getProtocolType().setClaimTypesRequested(value);
}
-
+
public String getApplicationServiceURL() {
return getProtocolType().getApplicationServiceURL();
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/SAMLProtocol.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/SAMLProtocol.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/SAMLProtocol.java
index a9736e9..d0edea2 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/SAMLProtocol.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/SAMLProtocol.java
@@ -31,19 +31,19 @@ import org.slf4j.LoggerFactory;
public class SAMLProtocol extends Protocol {
private static final Logger LOG = LoggerFactory.getLogger(SAMLProtocol.class);
-
+
private SAMLPRequestBuilder samlpRequestBuilder;
-
+
public SAMLProtocol(ProtocolType protocolType) {
super(protocolType);
-
+
// add SAMLTokenValidator as the last one
// Fediz chooses the first validator in the list if its
// canHandleToken or canHandleTokenType method return true
SAMLTokenValidator validator = new SAMLTokenValidator();
getTokenValidators().add(getTokenValidators().size(), validator);
}
-
+
protected SamlProtocolType getSAMLProtocol() {
return (SamlProtocolType)super.getProtocolType();
}
@@ -59,12 +59,12 @@ public class SAMLProtocol extends Protocol {
public void setSignRequest(boolean signRequest) {
getSAMLProtocol().setSignRequest(signRequest);
}
-
+
public SAMLPRequestBuilder getSAMLPRequestBuilder() {
if (samlpRequestBuilder != null) {
return samlpRequestBuilder;
}
-
+
// See if we have a custom SAMLPRequestBuilder
String samlpRequestBuilderStr = getSAMLProtocol().getAuthnRequestBuilder();
if (samlpRequestBuilderStr != null && !"".equals(samlpRequestBuilderStr)) {
@@ -79,17 +79,17 @@ public class SAMLProtocol extends Protocol {
LOG.debug(ex.getMessage(), ex);
}
}
-
+
// Default implementation
samlpRequestBuilder = new DefaultSAMLPRequestBuilder();
-
+
return samlpRequestBuilder;
}
public void setSAMLPRequestBuilder(SAMLPRequestBuilder requestBuilder) {
this.samlpRequestBuilder = requestBuilder;
}
-
+
public boolean isDisableDeflateEncoding() {
return getSAMLProtocol().isDisableDeflateEncoding();
}
@@ -97,7 +97,7 @@ public class SAMLProtocol extends Protocol {
public void setDisableDeflateEncoding(boolean disableDeflateEncoding) {
getSAMLProtocol().setDisableDeflateEncoding(disableDeflateEncoding);
}
-
+
public boolean isDoNotEnforceKnownIssuer() {
return getSAMLProtocol().isDoNotEnforceKnownIssuer();
}
@@ -105,7 +105,7 @@ public class SAMLProtocol extends Protocol {
public void setDoNotEnforceKnownIssuer(boolean doNotEnforceKnownIssuer) {
getSAMLProtocol().setDoNotEnforceKnownIssuer(doNotEnforceKnownIssuer);
}
-
+
public String getIssuerLogoutURL() {
return getSAMLProtocol().getIssuerLogoutURL();
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java
index c82b719..888ed5b 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustManager.java
@@ -23,7 +23,7 @@ import org.apache.cxf.fediz.core.config.jaxb.TrustManagersType;
import org.apache.wss4j.common.crypto.Crypto;
public class TrustManager {
-
+
private TrustManagersType trustManagerType;
private Crypto crypto;
private String name;
@@ -32,7 +32,7 @@ public class TrustManager {
super();
this.trustManagerType = trustManagerType;
}
-
+
public TrustManager(Crypto crypto) {
super();
this.crypto = crypto;
@@ -53,7 +53,7 @@ public class TrustManager {
name = trustManagerType.getKeyStore().getResource();
}
}
-
+
return name;
}
@@ -64,7 +64,7 @@ public class TrustManager {
public void setCrypto(Crypto crypto) {
this.crypto = crypto;
}
-
+
public int hashCode() {
if (trustManagerType == null) {
return super.hashCode();
@@ -72,19 +72,19 @@ public class TrustManager {
return trustManagerType.hashCode();
}
}
-
+
public boolean equals(Object obj) {
if (!(obj instanceof TrustManager)) {
return false;
}
-
+
TrustManager that = (TrustManager)obj;
if (trustManagerType != null && !trustManagerType.equals(that.getTrustManagersType())) {
return false;
} else if (trustManagerType == null && that.getTrustManagersType() != null) {
return false;
}
-
+
return true;
}
@@ -95,7 +95,7 @@ public class TrustManager {
return trustManagerType.toString();
}
}
-
+
public TrustManagersType getTrustManagersType() {
return trustManagerType;
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java
index 322a451..6eb3ece 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/config/TrustedIssuer.java
@@ -28,36 +28,36 @@ public class TrustedIssuer {
private final TrustedIssuerType trustedIssuerType;
private Pattern subject;
-
+
public TrustedIssuer(TrustedIssuerType trustedIssuerType) {
super();
this.trustedIssuerType = trustedIssuerType;
}
-
+
public String getName() {
return trustedIssuerType.getName();
}
-
+
public void setName(String name) {
trustedIssuerType.setName(name);
}
-
+
public Pattern getCompiledSubject() {
if (subject != null) {
return subject;
}
-
+
if (trustedIssuerType.getSubject() != null) {
subject = Pattern.compile(trustedIssuerType.getSubject());
}
-
+
return subject;
}
-
+
public String getSubject() {
return trustedIssuerType.getSubject();
}
-
+
public void setSubject(String subject) {
trustedIssuerType.setSubject(subject);
this.subject = null;
@@ -75,7 +75,7 @@ public class TrustedIssuer {
);
}
}
-
+
public void setCertificateValidationMethod(
final CertificateValidationMethod validationMethod
) {
@@ -86,36 +86,36 @@ public class TrustedIssuer {
} else {
String error = "Not supported certificate validation type";
if (validationMethod != null) {
- error += ": " + validationMethod.value();
+ error += ": " + validationMethod.value();
}
throw new IllegalStateException(error);
}
}
-
+
public int hashCode() {
return trustedIssuerType.hashCode();
}
-
+
public boolean equals(Object obj) {
if (!(obj instanceof TrustedIssuer)) {
return false;
}
-
+
TrustedIssuer that = (TrustedIssuer)obj;
if (trustedIssuerType != null && !trustedIssuerType.equals(that.getTrustedIssuerType())) {
return false;
} else if (trustedIssuerType == null && that.getTrustedIssuerType() != null) {
return false;
}
-
+
return true;
}
public String toString() {
return trustedIssuerType.toString();
}
-
+
public TrustedIssuerType getTrustedIssuerType() {
return trustedIssuerType;
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/IllegalConfigurationException.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/IllegalConfigurationException.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/IllegalConfigurationException.java
index 7ccc76e..91cf5c7 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/IllegalConfigurationException.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/IllegalConfigurationException.java
@@ -22,7 +22,7 @@ package org.apache.cxf.fediz.core.exception;
public class IllegalConfigurationException extends RuntimeException {
/**
- *
+ *
*/
private static final long serialVersionUID = 6273022567957710601L;
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/ProcessingException.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/ProcessingException.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/ProcessingException.java
index eb58975..b838664 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/ProcessingException.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/exception/ProcessingException.java
@@ -22,10 +22,10 @@ package org.apache.cxf.fediz.core.exception;
public class ProcessingException extends Exception {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
-
+
public enum TYPE {
TOKEN_EXPIRED,
TOKEN_REPLAY,
@@ -35,13 +35,13 @@ public class ProcessingException extends Exception {
TOKEN_INVALID,
TOKEN_NO_SIGNATURE
}
-
+
/**
* A map of Fault Code to Fault Strings
*/
- private static final java.util.Map<TYPE, String> TYPE_MAP =
+ private static final java.util.Map<TYPE, String> TYPE_MAP =
new java.util.HashMap<TYPE, String>();
-
+
static {
TYPE_MAP.put(TYPE.BAD_REQUEST, "The specified request is not understood");
TYPE_MAP.put(TYPE.INVALID_REQUEST, "The request was invalid or malformed");
@@ -51,23 +51,23 @@ public class ProcessingException extends Exception {
TYPE_MAP.put(TYPE.TOKEN_INVALID, "Security token has been revoked");
TYPE_MAP.put(TYPE.TOKEN_NO_SIGNATURE, "Security token has no signature");
}
-
+
private TYPE type;
-
-
+
+
public ProcessingException(String message) {
super(message);
}
-
+
public ProcessingException(String message, TYPE type) {
super(message);
this.type = type;
}
-
+
public ProcessingException(TYPE type) {
this.type = type;
}
-
+
public ProcessingException(String message, Throwable e) {
super(message, e);
}
@@ -76,15 +76,15 @@ public class ProcessingException extends Exception {
super(message, e);
this.type = type;
}
-
+
public void setType(TYPE type) {
this.type = type;
}
-
+
public TYPE getType() {
return type;
}
-
+
@Override
public String getMessage() {
if (type != null && TYPE_MAP.get(type) != null) {
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java
index b547b00..59fc613 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/LogoutHandler.java
@@ -66,7 +66,7 @@ public class LogoutHandler implements RequestHandler<Boolean> {
}
//Check for custom logout URL
String logoutUrl = fedizConfig.getLogoutURL();
- return logoutUrl != null && !logoutUrl.isEmpty()
+ return logoutUrl != null && !logoutUrl.isEmpty()
&& servletContextPath != null && request.getRequestURI().equals(servletContextPath + logoutUrl);
}
@@ -81,7 +81,7 @@ public class LogoutHandler implements RequestHandler<Boolean> {
return customLogout(request, response);
}
}
-
+
protected boolean customLogout(HttpServletRequest request, HttpServletResponse response) {
LOG.info("Custom Logout URL was invoked.");
return signout(request, response);
@@ -90,10 +90,10 @@ public class LogoutHandler implements RequestHandler<Boolean> {
protected boolean signoutCleanup(HttpServletRequest request, HttpServletResponse response) {
LOG.info("SignOutCleanup request found. Terminating user session.");
request.getSession().invalidate();
-
+
String wreply = request.getParameter(FederationConstants.PARAM_REPLY);
Pattern logoutRedirectToConstraint = fedizConfig.getLogoutRedirectToConstraint();
-
+
if (wreply != null && !wreply.isEmpty()) {
if (logoutRedirectToConstraint == null) {
LOG.debug("No regular expression constraint configured for logout. Ignoring wreply parameter");
@@ -113,7 +113,7 @@ public class LogoutHandler implements RequestHandler<Boolean> {
}
}
}
-
+
writeLogoutImage(response);
return true;
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2ca31863/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/SigninHandler.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/SigninHandler.java b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/SigninHandler.java
index f84e83b..31aefcd 100644
--- a/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/SigninHandler.java
+++ b/plugins/core/src/main/java/org/apache/cxf/fediz/core/handler/SigninHandler.java
@@ -97,7 +97,7 @@ public class SigninHandler<T> implements RequestHandler<T> {
throws ProcessingException {
LOG.debug("Process SignIn request");
LOG.debug("token=\n{}", responseToken);
-
+
FedizRequest federationRequest = new FedizRequest();
String wa = req.getParameter(FederationConstants.PARAM_ACTION);
@@ -118,7 +118,7 @@ public class SigninHandler<T> implements RequestHandler<T> {
List<String> audienceURIs = fedizContext.getAudienceUris();
boolean validAudience = audienceURIs.isEmpty() && audience == null;
if (!validAudience && audience != null) {
-
+
for (String a : audienceURIs) {
if (audience.startsWith(a)) {
validAudience = true;
@@ -126,12 +126,12 @@ public class SigninHandler<T> implements RequestHandler<T> {
break;
}
}
-
+
if (!validAudience) {
LOG.warn("Token AudienceRestriction [{}] doesn't match with specified list of URIs.", audience);
LOG.debug("Authenticated URIs are: {}", audienceURIs);
}
-
+
if (LOG.isDebugEnabled() && requestURL != null && requestURL.indexOf(audience) == -1) {
LOG.debug("Token AudienceRestriction doesn't match with request URL [{}] [{}]", audience, requestURL);
}