http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java index 1e6a21e..b2cf53b 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLClaimsTest.java @@ -43,6 +43,7 @@ import org.apache.cxf.sts.common.PasswordCallbackHandler; import org.apache.cxf.sts.request.KeyRequirements; import org.apache.cxf.sts.request.TokenRequirements; import org.apache.cxf.sts.service.EncryptionProperties; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; @@ -50,7 +51,6 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.common.util.DOM2Writer; -import org.apache.wss4j.dom.WSConstants; import org.opensaml.core.xml.XMLObject; import org.opensaml.saml.saml2.core.Attribute; @@ -78,7 +78,7 @@ public class SAMLClaimsTest extends org.junit.Assert { public void testSaml2Claims() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); ClaimsManager claimsManager = new ClaimsManager(); ClaimsHandler claimsHandler = new CustomClaimsHandler(); @@ -88,7 +88,7 @@ public class SAMLClaimsTest extends org.junit.Assert { ClaimCollection claims = createClaims(); providerParameters.setRequestedPrimaryClaims(claims); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -113,7 +113,7 @@ public class SAMLClaimsTest extends org.junit.Assert { public void testSaml2MultipleClaims() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); ClaimsManager claimsManager = new ClaimsManager(); ClaimsHandler claimsHandler = new CustomClaimsHandler(); @@ -129,7 +129,7 @@ public class SAMLClaimsTest extends org.junit.Assert { secondaryClaims.add(claim); providerParameters.setRequestedSecondaryClaims(secondaryClaims); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -156,7 +156,7 @@ public class SAMLClaimsTest extends org.junit.Assert { public void testSaml2MultipleClaimsSameDialect() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); ClaimsManager claimsManager = new ClaimsManager(); ClaimsHandler claimsHandler = new CustomClaimsHandler(); @@ -174,7 +174,7 @@ public class SAMLClaimsTest extends org.junit.Assert { secondaryClaims.setDialect(ClaimTypes.URI_BASE); providerParameters.setRequestedSecondaryClaims(secondaryClaims); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -198,7 +198,7 @@ public class SAMLClaimsTest extends org.junit.Assert { public void testSaml2StaticClaims() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); ClaimsManager claimsManager = new ClaimsManager(); StaticClaimsHandler claimsHandler = new StaticClaimsHandler(); @@ -214,7 +214,7 @@ public class SAMLClaimsTest extends org.junit.Assert { claims.add(claim); providerParameters.setRequestedPrimaryClaims(claims); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -241,7 +241,7 @@ public class SAMLClaimsTest extends org.junit.Assert { public void testSaml2StaticEndpointClaims() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); ClaimsManager claimsManager = new ClaimsManager(); StaticEndpointClaimsHandler claimsHandler = new StaticEndpointClaimsHandler(); @@ -267,7 +267,7 @@ public class SAMLClaimsTest extends org.junit.Assert { claims.add(claim); providerParameters.setRequestedPrimaryClaims(claims); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -295,7 +295,7 @@ public class SAMLClaimsTest extends org.junit.Assert { public void testSaml2StaticEndpointClaimsUnknownAppliesTo() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, APPLICATION_APPLIES_TO + "UNKNOWN"); ClaimsManager claimsManager = new ClaimsManager(); @@ -322,7 +322,7 @@ public class SAMLClaimsTest extends org.junit.Assert { claims.add(claim); providerParameters.setRequestedPrimaryClaims(claims); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); try { samlTokenProvider.createToken(providerParameters); @@ -339,7 +339,7 @@ public class SAMLClaimsTest extends org.junit.Assert { public void testSaml2ClaimsInteger() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); ClaimsManager claimsManager = new ClaimsManager(); ClaimsHandler claimsHandler = new CustomClaimsHandler(); @@ -352,7 +352,7 @@ public class SAMLClaimsTest extends org.junit.Assert { claims.add(claim); providerParameters.setRequestedPrimaryClaims(claims); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java index 330a3a3..402af61 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderActAsTest.java @@ -47,14 +47,13 @@ import org.apache.cxf.sts.request.TokenRequirements; import org.apache.cxf.sts.service.EncryptionProperties; import org.apache.cxf.ws.security.sts.provider.model.secext.AttributedString; import org.apache.cxf.ws.security.sts.provider.model.secext.UsernameTokenType; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.util.DOM2Writer; -import org.apache.wss4j.dom.WSConstants; - import org.junit.Assert; import org.opensaml.core.xml.XMLObject; @@ -81,13 +80,13 @@ public class SAMLProviderActAsTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType + WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType ); //Principal must be set in ReceivedToken/ActAs providerParameters.getTokenRequirements().getActAs().setPrincipal( new CustomTokenPrincipal(username.getValue())); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -129,13 +128,13 @@ public class SAMLProviderActAsTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, saml1Assertion + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, saml1Assertion ); //Principal must be set in ReceivedToken/ActAs providerParameters.getTokenRequirements().getActAs().setPrincipal( new CustomTokenPrincipal(user)); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -184,13 +183,13 @@ public class SAMLProviderActAsTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType + WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType ); //Principal must be set in ReceivedToken/ActAs providerParameters.getTokenRequirements().getActAs().setPrincipal( new CustomTokenPrincipal(username.getValue())); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -236,7 +235,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType ); //Principal must be set in ReceivedToken/ActAs providerParameters.getTokenRequirements().getActAs().setPrincipal( @@ -251,7 +250,7 @@ public class SAMLProviderActAsTest extends org.junit.Assert { ClaimCollection claims = createClaims(); providerParameters.setRequestedPrimaryClaims(claims); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -303,13 +302,13 @@ public class SAMLProviderActAsTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType + WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType ); //Principal must be set in ReceivedToken/ActAs providerParameters.getTokenRequirements().getActAs().setPrincipal( new CustomTokenPrincipal(username.getValue())); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -341,14 +340,14 @@ public class SAMLProviderActAsTest extends org.junit.Assert { // Now get another token "ActAs" the previous token providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, token + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, token ); //Principal must be set in ReceivedToken/ActAs providerParameters.getTokenRequirements().getActAs().setPrincipal( new CustomTokenPrincipal("service-A")); providerParameters.setPrincipal(new CustomTokenPrincipal("service-A")); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -387,9 +386,9 @@ public class SAMLProviderActAsTest extends org.junit.Assert { private Element getSAMLAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); providerParameters.setPrincipal(new CustomTokenPrincipal("bob")); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java index 6031300..5c17f43 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderCustomTest.java @@ -33,6 +33,7 @@ import org.apache.cxf.sts.common.PasswordCallbackHandler; import org.apache.cxf.sts.request.KeyRequirements; import org.apache.cxf.sts.request.TokenRequirements; import org.apache.cxf.sts.service.EncryptionProperties; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; @@ -40,7 +41,6 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.common.util.DOM2Writer; -import org.apache.wss4j.dom.WSConstants; /** * Some unit tests for creating custom SAML Tokens. @@ -54,13 +54,13 @@ public class SAMLProviderCustomTest extends org.junit.Assert { public void testCustomSaml1AttributeAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); List<AttributeStatementProvider> customProviderList = new ArrayList<>(); customProviderList.add(new CustomAttributeProvider()); ((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customProviderList); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -81,14 +81,14 @@ public class SAMLProviderCustomTest extends org.junit.Assert { public void testCustomSaml2AuthenticationAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); List<AuthenticationStatementProvider> customProviderList = new ArrayList<>(); customProviderList.add(new CustomAuthenticationProvider()); ((SAMLTokenProvider)samlTokenProvider).setAuthenticationStatementProviders(customProviderList); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -109,14 +109,14 @@ public class SAMLProviderCustomTest extends org.junit.Assert { public void testCustomSaml1AuthenticationAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); List<AuthenticationStatementProvider> customProviderList = new ArrayList<>(); customProviderList.add(new CustomAuthenticationProvider()); ((SAMLTokenProvider)samlTokenProvider).setAuthenticationStatementProviders(customProviderList); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -137,7 +137,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert { public void testCustomSaml2CombinedAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); List<AuthenticationStatementProvider> customProviderList = new ArrayList<>(); @@ -149,7 +149,7 @@ public class SAMLProviderCustomTest extends org.junit.Assert { customAttributeProviderList.add(new CustomAttributeProvider()); ((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customAttributeProviderList); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -169,14 +169,14 @@ public class SAMLProviderCustomTest extends org.junit.Assert { public void testCustomSaml1MultipleAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); List<AttributeStatementProvider> customProviderList = new ArrayList<>(); customProviderList.add(new CustomAttributeProvider()); customProviderList.add(new CustomAttributeProvider()); ((SAMLTokenProvider)samlTokenProvider).setAttributeStatementProviders(customProviderList); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -197,14 +197,14 @@ public class SAMLProviderCustomTest extends org.junit.Assert { public void testCustomSaml2AuthDecisionAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); List<AuthDecisionStatementProvider> customProviderList = new ArrayList<>(); customProviderList.add(new CustomAuthDecisionProvider()); ((SAMLTokenProvider)samlTokenProvider).setAuthDecisionStatementProviders(customProviderList); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -225,11 +225,11 @@ public class SAMLProviderCustomTest extends org.junit.Assert { public void testCustomSaml1SubjectAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); ((SAMLTokenProvider)samlTokenProvider).setSubjectProvider(new CustomSubjectProvider()); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -250,13 +250,13 @@ public class SAMLProviderCustomTest extends org.junit.Assert { public void testCustomSaml1SubjectNameIDFormat() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); DefaultSubjectProvider subjectProvider = new DefaultSubjectProvider(); subjectProvider.setSubjectNameIDFormat(SAML1Constants.NAMEID_FORMAT_EMAIL_ADDRESS); ((SAMLTokenProvider)samlTokenProvider).setSubjectProvider(subjectProvider); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java index 3c1c954..6e8fa10 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderKeyTypeTest.java @@ -39,6 +39,7 @@ import org.apache.cxf.sts.request.ReceivedKey; import org.apache.cxf.sts.request.TokenRequirements; import org.apache.cxf.sts.service.EncryptionProperties; import org.apache.cxf.ws.security.sts.provider.STSException; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; @@ -47,7 +48,6 @@ import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.saml.builder.SAML1Constants; import org.apache.wss4j.common.saml.builder.SAML2Constants; import org.apache.wss4j.common.util.DOM2Writer; -import org.apache.wss4j.dom.WSConstants; import org.apache.wss4j.dom.util.WSSecurityUtil; /** @@ -62,8 +62,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml1BearerAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -85,8 +85,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml2BearerAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -109,8 +109,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml1PublicKeyAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.SAML_NS, STSConstants.PUBLIC_KEY_KEYTYPE); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.SAML_NS)); + createProviderParameters(WSS4JConstants.SAML_NS, STSConstants.PUBLIC_KEY_KEYTYPE); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.SAML_NS)); try { samlTokenProvider.createToken(providerParameters); @@ -149,8 +149,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml2PublicKeyAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.SAML2_NS, STSConstants.PUBLIC_KEY_KEYTYPE); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.SAML2_NS)); + createProviderParameters(WSS4JConstants.SAML2_NS, STSConstants.PUBLIC_KEY_KEYTYPE); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.SAML2_NS)); try { samlTokenProvider.createToken(providerParameters); @@ -189,8 +189,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml1SymmetricKeyAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.SYMMETRIC_KEY_KEYTYPE); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.SYMMETRIC_KEY_KEYTYPE); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); Entropy entropy = new Entropy(); BinarySecret binarySecret = new BinarySecret(); @@ -254,8 +254,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml1SymmetricKeyAssertionSecretKey() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.SYMMETRIC_KEY_KEYTYPE); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.SYMMETRIC_KEY_KEYTYPE); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); Entropy entropy = new Entropy(); BinarySecret binarySecret = new BinarySecret(); @@ -288,8 +288,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml2SymmetricKeyAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.SYMMETRIC_KEY_KEYTYPE); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.SYMMETRIC_KEY_KEYTYPE); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); Entropy entropy = new Entropy(); BinarySecret binarySecret = new BinarySecret(); @@ -352,8 +352,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultBadKeytypeAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, "bad-keytype"); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, "bad-keytype"); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); try { samlTokenProvider.createToken(providerParameters); fail("Failure expected on a bad KeyType"); @@ -363,8 +363,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { samlTokenProvider = new SAMLTokenProvider(); providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, "bad-keytype"); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, "bad-keytype"); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); try { samlTokenProvider.createToken(providerParameters); fail("Failure expected on a bad KeyType"); @@ -380,10 +380,10 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml1BearerKeyValueAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); providerParameters.getStsProperties().getSignatureProperties().setUseKeyValue(true); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -406,8 +406,8 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml2BearerUnsignedAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); providerParameters.getStsProperties().setSignatureCrypto(null); ((SAMLTokenProvider)samlTokenProvider).setSignToken(false); @@ -438,9 +438,9 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = createProviderParametersPKCS12( - WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE + WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE ); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -462,10 +462,10 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml2BearerDifferentC14nAssertion() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); KeyRequirements keyRequirements = providerParameters.getKeyRequirements(); - keyRequirements.setC14nAlgorithm(WSConstants.C14N_EXCL_WITH_COMMENTS); + keyRequirements.setC14nAlgorithm(WSS4JConstants.C14N_EXCL_WITH_COMMENTS); // This will fail as the requested c14n algorithm is rejected TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); @@ -474,14 +474,14 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { Element token = (Element)providerResponse.getToken(); String tokenString = DOM2Writer.nodeToString(token); - assertFalse(tokenString.contains(WSConstants.C14N_EXCL_WITH_COMMENTS)); - assertTrue(tokenString.contains(WSConstants.C14N_EXCL_OMIT_COMMENTS)); + assertFalse(tokenString.contains(WSS4JConstants.C14N_EXCL_WITH_COMMENTS)); + assertTrue(tokenString.contains(WSS4JConstants.C14N_EXCL_OMIT_COMMENTS)); STSPropertiesMBean stsProperties = providerParameters.getStsProperties(); SignatureProperties sigProperties = new SignatureProperties(); List<String> acceptedC14nAlgorithms = new ArrayList<>(); - acceptedC14nAlgorithms.add(WSConstants.C14N_EXCL_OMIT_COMMENTS); - acceptedC14nAlgorithms.add(WSConstants.C14N_EXCL_WITH_COMMENTS); + acceptedC14nAlgorithms.add(WSS4JConstants.C14N_EXCL_OMIT_COMMENTS); + acceptedC14nAlgorithms.add(WSS4JConstants.C14N_EXCL_WITH_COMMENTS); sigProperties.setAcceptedC14nAlgorithms(acceptedC14nAlgorithms); stsProperties.setSignatureProperties(sigProperties); @@ -492,7 +492,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { token = (Element)providerResponse.getToken(); tokenString = DOM2Writer.nodeToString(token); - assertTrue(tokenString.contains(WSConstants.C14N_EXCL_WITH_COMMENTS)); + assertTrue(tokenString.contains(WSS4JConstants.C14N_EXCL_WITH_COMMENTS)); } /** @@ -506,7 +506,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); KeyRequirements keyRequirements = providerParameters.getKeyRequirements(); // Default @@ -519,7 +519,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { assertTrue(tokenString.contains("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";)); // Try with unsupported alternative - String signatureAlgorithm = WSConstants.DSA; + String signatureAlgorithm = WSS4JConstants.DSA; keyRequirements.setSignatureAlgorithm(signatureAlgorithm); // This will fail as the requested signature algorithm is rejected @@ -533,7 +533,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { assertTrue(tokenString.contains("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";)); // Supported alternative - signatureAlgorithm = WSConstants.RSA_SHA1; + signatureAlgorithm = WSS4JConstants.RSA_SHA1; keyRequirements.setSignatureAlgorithm(signatureAlgorithm); // This will succeed as the requested signature algorithm is accepted @@ -553,7 +553,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml2BearerDifferentSignatureDigestAlgorithm() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); // Default TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); @@ -562,12 +562,12 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { Element token = (Element)providerResponse.getToken(); String tokenString = DOM2Writer.nodeToString(token); - assertTrue(tokenString.contains(WSConstants.SHA256)); + assertTrue(tokenString.contains(WSS4JConstants.SHA256)); // Supported alternative SignatureProperties signatureProperties = providerParameters.getStsProperties().getSignatureProperties(); - signatureProperties.setDigestAlgorithm(WSConstants.SHA1); + signatureProperties.setDigestAlgorithm(WSS4JConstants.SHA1); providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); @@ -575,7 +575,7 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { token = (Element)providerResponse.getToken(); tokenString = DOM2Writer.nodeToString(token); - assertTrue(tokenString.contains(WSConstants.SHA1)); + assertTrue(tokenString.contains(WSS4JConstants.SHA1)); } /** @@ -585,17 +585,17 @@ public class SAMLProviderKeyTypeTest extends org.junit.Assert { public void testDefaultSaml2EncryptWith() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.SYMMETRIC_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.SYMMETRIC_KEY_KEYTYPE); KeyRequirements keyRequirements = providerParameters.getKeyRequirements(); - keyRequirements.setEncryptWith(WSConstants.AES_128); + keyRequirements.setEncryptWith(WSS4JConstants.AES_128); keyRequirements.setKeySize(92); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); keyRequirements.setKeySize(128); - keyRequirements.setEncryptWith(WSConstants.AES_256); + keyRequirements.setEncryptWith(WSS4JConstants.AES_256); providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java index 24e1cd1..41a514a 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderLifetimeTest.java @@ -35,13 +35,13 @@ import org.apache.cxf.sts.request.Lifetime; import org.apache.cxf.sts.request.TokenRequirements; import org.apache.cxf.sts.service.EncryptionProperties; import org.apache.cxf.ws.security.sts.provider.STSException; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.util.DOM2Writer; import org.apache.wss4j.common.util.DateUtil; -import org.apache.wss4j.dom.WSConstants; /** @@ -63,7 +63,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE ); // Set expected lifetime to 1 minute @@ -75,7 +75,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true))); providerParameters.getTokenRequirements().setLifetime(lifetime); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -103,10 +103,10 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE ); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -134,7 +134,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE ); // Set expected lifetime to 35 minutes @@ -147,7 +147,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true))); providerParameters.getTokenRequirements().setLifetime(lifetime); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); try { samlTokenProvider.createToken(providerParameters); @@ -171,7 +171,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE ); // Set expected lifetime to Default max lifetime plus 1 @@ -184,7 +184,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { lifetime.setExpires(expirationTime.atZone(ZoneOffset.UTC).format(DateUtil.getDateTimeFormatter(true))); providerParameters.getTokenRequirements().setLifetime(lifetime); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); try { samlTokenProvider.createToken(providerParameters); @@ -212,7 +212,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE ); // Set expected lifetime to 35 minutes @@ -226,7 +226,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { providerParameters.getTokenRequirements().setLifetime(lifetime); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -253,7 +253,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE ); // Set expected lifetime to 1 minute @@ -267,7 +267,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { providerParameters.getTokenRequirements().setLifetime(lifetime); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -294,7 +294,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE ); // Set expected lifetime to 1 minute @@ -307,7 +307,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { providerParameters.getTokenRequirements().setLifetime(lifetime); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); try { samlTokenProvider.createToken(providerParameters); fail("Failure expected on a Created Element too far in the future"); @@ -340,7 +340,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE ); // Set expected lifetime to 1 minute @@ -351,7 +351,7 @@ public class SAMLProviderLifetimeTest extends org.junit.Assert { providerParameters.getTokenRequirements().setLifetime(lifetime); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java index 34bf478..460aee9 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderOnBehalfOfTest.java @@ -40,12 +40,12 @@ import org.apache.cxf.sts.request.TokenRequirements; import org.apache.cxf.sts.service.EncryptionProperties; import org.apache.cxf.ws.security.sts.provider.model.secext.AttributedString; import org.apache.cxf.ws.security.sts.provider.model.secext.UsernameTokenType; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.util.DOM2Writer; -import org.apache.wss4j.dom.WSConstants; /** * Some unit tests for creating SAML Tokens with an OnBehalfOf element. @@ -70,13 +70,13 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType + WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType ); //Principal must be set in ReceivedToken/OnBehalfOf providerParameters.getTokenRequirements().getOnBehalfOf().setPrincipal( new CustomTokenPrincipal(username.getValue())); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -100,13 +100,13 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, saml1Assertion + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, saml1Assertion ); //Principal must be set in ReceivedToken/OnBehalfOf providerParameters.getTokenRequirements().getOnBehalfOf().setPrincipal( new CustomTokenPrincipal(user)); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML2_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML2_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -137,13 +137,13 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType + WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, usernameTokenType ); //Principal must be set in ReceivedToken/OnBehalfOf providerParameters.getTokenRequirements().getOnBehalfOf().setPrincipal( new CustomTokenPrincipal(username.getValue())); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -178,9 +178,9 @@ public class SAMLProviderOnBehalfOfTest extends org.junit.Assert { private Element getSAMLAssertion(String user) throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, null); providerParameters.setPrincipal(new CustomTokenPrincipal(user)); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE)); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java index 83f086d..e604a0b 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/SAMLProviderRealmTest.java @@ -33,12 +33,12 @@ import org.apache.cxf.sts.request.KeyRequirements; import org.apache.cxf.sts.request.TokenRequirements; import org.apache.cxf.sts.service.EncryptionProperties; import org.apache.cxf.sts.token.realm.RealmProperties; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.util.DOM2Writer; -import org.apache.wss4j.dom.WSConstants; /** * Some unit tests for creating SAML Tokens via the SAMLTokenProvider in different realms @@ -52,7 +52,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { public void testRealms() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); providerParameters.setRealm("A"); // Create Realms @@ -66,7 +66,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { ((SAMLTokenProvider)samlTokenProvider).setRealmMap(samlRealms); // Realm "A" - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE, "A")); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, "A")); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -80,7 +80,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { // Realm "B" providerParameters.setRealm("B"); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE, "B")); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, "B")); providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -94,7 +94,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { // Default Realm providerParameters.setRealm(null); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE, null)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, null)); providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -112,7 +112,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { public void testRealmsUsingOldRealmClass() throws Exception { TokenProvider samlTokenProvider = new SAMLTokenProvider(); TokenProviderParameters providerParameters = - createProviderParameters(WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); + createProviderParameters(WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE); providerParameters.setRealm("A"); // Create Realms @@ -127,7 +127,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { ((SAMLTokenProvider)samlTokenProvider).setRealmMap(samlRealms); // Realm "A" - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE, "A")); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, "A")); TokenProviderResponse providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -141,7 +141,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { // Realm "B" providerParameters.setRealm("B"); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE, "B")); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, "B")); providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); @@ -155,7 +155,7 @@ public class SAMLProviderRealmTest extends org.junit.Assert { // Default Realm providerParameters.setRealm(null); - assertTrue(samlTokenProvider.canHandleToken(WSConstants.WSS_SAML_TOKEN_TYPE, null)); + assertTrue(samlTokenProvider.canHandleToken(WSS4JConstants.WSS_SAML_TOKEN_TYPE, null)); providerResponse = samlTokenProvider.createToken(providerParameters); assertTrue(providerResponse != null); assertTrue(providerResponse.getToken() != null && providerResponse.getTokenId() != null); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java index b1c3d4b..86b5a10 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java @@ -46,12 +46,12 @@ import org.apache.cxf.sts.token.provider.TokenProviderParameters; import org.apache.cxf.sts.token.provider.TokenProviderResponse; import org.apache.cxf.ws.security.sts.provider.STSException; import org.apache.cxf.ws.security.tokenstore.TokenStore; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.util.DateUtil; -import org.apache.wss4j.dom.WSConstants; import org.junit.BeforeClass; @@ -98,7 +98,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert { // Create token. Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true ); // Sleep to expire the token Thread.sleep(100); @@ -140,7 +140,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert { // Create token. Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true ); // Sleep to expire the token Thread.sleep(100); @@ -194,7 +194,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert { // Create token. Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true ); // Sleep to expire the token Thread.sleep(100); @@ -245,7 +245,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert { // Create token. Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true ); // Sleep to expire the token Thread.sleep(100); @@ -301,7 +301,7 @@ public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert { // Create token. Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true ); // Sleep to expire the token Thread.sleep(100); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java index b4ff7d6..d0aa911 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerPOPTest.java @@ -53,6 +53,7 @@ import org.apache.cxf.sts.token.validator.TokenValidator; import org.apache.cxf.sts.token.validator.TokenValidatorParameters; import org.apache.cxf.sts.token.validator.TokenValidatorResponse; import org.apache.cxf.ws.security.tokenstore.TokenStore; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; @@ -88,7 +89,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert { CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, true, false + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, true, false ); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); @@ -165,7 +166,7 @@ public class SAMLTokenRenewerPOPTest extends org.junit.Assert { CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, true, false + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, true, false ); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java index 0fa3827..23b4809 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerRealmTest.java @@ -55,12 +55,12 @@ import org.apache.cxf.sts.token.validator.TokenValidator; import org.apache.cxf.sts.token.validator.TokenValidatorParameters; import org.apache.cxf.sts.token.validator.TokenValidatorResponse; import org.apache.cxf.ws.security.tokenstore.TokenStore; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.util.DateUtil; -import org.apache.wss4j.dom.WSConstants; import org.junit.BeforeClass; /** @@ -86,7 +86,7 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, crypto, "mystskey", + WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, crypto, "mystskey", callbackHandler ); @@ -159,7 +159,7 @@ public class SAMLTokenRenewerRealmTest extends org.junit.Assert { TokenProviderParameters providerParameters = createProviderParameters( - WSConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, crypto, "mystskey", + WSS4JConstants.WSS_SAML_TOKEN_TYPE, STSConstants.BEARER_KEY_KEYTYPE, crypto, "mystskey", callbackHandler ); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java index 1500e89..fc34d7b 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java @@ -50,13 +50,13 @@ import org.apache.cxf.sts.token.validator.TokenValidatorParameters; import org.apache.cxf.sts.token.validator.TokenValidatorResponse; import org.apache.cxf.ws.security.sts.provider.STSException; import org.apache.cxf.ws.security.tokenstore.TokenStore; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.saml.SamlAssertionWrapper; import org.apache.wss4j.common.util.DateUtil; -import org.apache.wss4j.dom.WSConstants; import org.junit.BeforeClass; /** @@ -81,7 +81,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert { CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, true, false + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, true, false ); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); @@ -158,7 +158,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert { CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, false, false + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, false, false ); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); @@ -212,7 +212,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert { CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true ); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); @@ -288,7 +288,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert { CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true ); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); @@ -365,7 +365,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert { CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, false + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, false ); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); @@ -424,7 +424,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert { CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML2_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true + WSS4JConstants.WSS_SAML2_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50, true, true ); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); @@ -482,7 +482,7 @@ public class SAMLTokenRenewerTest extends org.junit.Assert { CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = createSAMLAssertion( - WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, true, false + WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, 50000, true, false ); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java index 82bdaa6..c99061a 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorCachedRealmTest.java @@ -46,11 +46,11 @@ import org.apache.cxf.sts.token.provider.TokenProviderResponse; import org.apache.cxf.sts.token.realm.RealmProperties; import org.apache.cxf.sts.token.realm.SAMLRealmCodec; import org.apache.cxf.ws.security.tokenstore.TokenStore; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; -import org.apache.wss4j.dom.WSConstants; import org.junit.BeforeClass; @@ -79,7 +79,7 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert { Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties()); CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = - createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, "A"); + createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, "A"); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); @@ -112,7 +112,7 @@ public class SAMLTokenValidatorCachedRealmTest extends org.junit.Assert { Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties()); CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = - createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, "A"); + createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, "A"); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); http://git-wip-us.apache.org/repos/asf/cxf/blob/f0797a55/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java index cf9f75f..c80bd59 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/validator/SAMLTokenValidatorRealmTest.java @@ -44,11 +44,11 @@ import org.apache.cxf.sts.token.provider.TokenProviderParameters; import org.apache.cxf.sts.token.provider.TokenProviderResponse; import org.apache.cxf.sts.token.realm.RealmProperties; import org.apache.cxf.sts.token.realm.SAMLRealmCodec; +import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.common.principal.CustomTokenPrincipal; -import org.apache.wss4j.dom.WSConstants; /** * Some unit tests for validating a SAML token in different realms via the SAMLTokenValidator. @@ -68,7 +68,7 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert { Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties()); CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = - createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, "A"); + createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, "A"); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken); @@ -111,7 +111,7 @@ public class SAMLTokenValidatorRealmTest extends org.junit.Assert { Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties()); CallbackHandler callbackHandler = new PasswordCallbackHandler(); Element samlToken = - createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, "B"); + createSAMLAssertion(WSS4JConstants.WSS_SAML_TOKEN_TYPE, crypto, "mystskey", callbackHandler, "B"); Document doc = samlToken.getOwnerDocument(); samlToken = (Element)doc.appendChild(samlToken);
