Author: coheigea
Date: Fri Apr 6 10:57:58 2012
New Revision: 1310276
URL: http://svn.apache.org/viewvc?rev=1310276&view=rev
Log:
Added in some Lifetime unit tests for renewing SAML tokens.
Added:
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
Modified:
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
Added:
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java?rev=1310276&view=auto
==============================================================================
---
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
(added)
+++
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerLifetimeTest.java
Fri Apr 6 10:57:58 2012
@@ -0,0 +1,396 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.sts.token.renewer;
+
+import java.util.Date;
+import java.util.Properties;
+
+import javax.security.auth.callback.CallbackHandler;
+
+import org.w3c.dom.Element;
+
+import org.apache.cxf.jaxws.context.WebServiceContextImpl;
+import org.apache.cxf.jaxws.context.WrappedMessageContext;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.sts.STSConstants;
+import org.apache.cxf.sts.StaticSTSProperties;
+import org.apache.cxf.sts.common.PasswordCallbackHandler;
+import org.apache.cxf.sts.request.KeyRequirements;
+import org.apache.cxf.sts.request.Lifetime;
+import org.apache.cxf.sts.request.ReceivedToken;
+import org.apache.cxf.sts.request.ReceivedToken.STATE;
+import org.apache.cxf.sts.request.TokenRequirements;
+import org.apache.cxf.sts.service.EncryptionProperties;
+import org.apache.cxf.sts.token.provider.DefaultConditionsProvider;
+import org.apache.cxf.sts.token.provider.SAMLTokenProvider;
+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.ws.security.CustomTokenPrincipal;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.util.XmlSchemaDateFormat;
+
+
+/**
+ * Some unit tests for renewing SAML Tokens with lifetime
+ */
+public class SAMLTokenRenewerLifetimeTest extends org.junit.Assert {
+
+ /**
+ * Renew SAML 2 token with a valid requested lifetime
+ */
+ @org.junit.Test
+ public void testSaml2ValidLifetime() throws Exception {
+ int requestedLifetime = 60;
+ SAMLTokenRenewer samlTokenRenewer = new SAMLTokenRenewer();
+ DefaultConditionsProvider conditionsProvider = new
DefaultConditionsProvider();
+ conditionsProvider.setAcceptClientLifetime(true);
+ samlTokenRenewer.setConditionsProvider(conditionsProvider);
+
+ TokenRenewerParameters renewerParameters = createRenewerParameters();
+
+ // Set expected lifetime to 1 minute
+ Date creationTime = new Date();
+ Date expirationTime = new Date();
+ expirationTime.setTime(creationTime.getTime() + (requestedLifetime *
1000L));
+ Lifetime lifetime = new Lifetime();
+ XmlSchemaDateFormat fmt = new XmlSchemaDateFormat();
+ lifetime.setCreated(fmt.format(creationTime));
+ lifetime.setExpires(fmt.format(expirationTime));
+ renewerParameters.getTokenRequirements().setLifetime(lifetime);
+
+ CallbackHandler callbackHandler = new PasswordCallbackHandler();
+ Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
+ // Create token.
+ Element samlToken =
+ createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto,
"mystskey", callbackHandler, 50);
+ // Sleep to expire the token
+ Thread.sleep(1000);
+
+ ReceivedToken renewTarget = new ReceivedToken(samlToken);
+ renewTarget.setState(STATE.VALID);
+ renewerParameters.getTokenRequirements().setRenewTarget(renewTarget);
+ renewerParameters.setToken(renewTarget);
+
+ assertTrue(samlTokenRenewer.canHandleToken(renewTarget));
+ TokenRenewerResponse renewerResponse =
samlTokenRenewer.renewToken(renewerParameters);
+ assertTrue(renewerResponse != null);
+ assertTrue(renewerResponse.getToken() != null);
+ assertEquals(renewerResponse.getLifetime(), requestedLifetime);
+ }
+
+
+ /**
+ * Renew SAML 2 token with a lifetime configured in SAMLTokenProvider
+ * No specific lifetime requested
+ */
+ @org.junit.Test
+ public void testSaml2ProviderLifetime() throws Exception {
+ SAMLTokenRenewer samlTokenRenewer = new SAMLTokenRenewer();
+
+ long providerLifetime = 10 * 600L;
+ DefaultConditionsProvider conditionsProvider = new
DefaultConditionsProvider();
+ conditionsProvider.setLifetime(providerLifetime);
+ samlTokenRenewer.setConditionsProvider(conditionsProvider);
+
+ TokenRenewerParameters renewerParameters = createRenewerParameters();
+
+ CallbackHandler callbackHandler = new PasswordCallbackHandler();
+ Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
+ // Create token.
+ Element samlToken =
+ createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto,
"mystskey", callbackHandler, 50);
+ // Sleep to expire the token
+ Thread.sleep(1000);
+
+ ReceivedToken renewTarget = new ReceivedToken(samlToken);
+ renewTarget.setState(STATE.VALID);
+ renewerParameters.getTokenRequirements().setRenewTarget(renewTarget);
+ renewerParameters.setToken(renewTarget);
+
+ assertTrue(samlTokenRenewer.canHandleToken(renewTarget));
+ TokenRenewerResponse renewerResponse =
samlTokenRenewer.renewToken(renewerParameters);
+ assertTrue(renewerResponse != null);
+ assertTrue(renewerResponse.getToken() != null);
+ assertEquals(renewerResponse.getLifetime(), providerLifetime);
+ }
+
+
+ /**
+ * Renew SAML 2 token with a with a lifetime
+ * which exceeds configured maximum lifetime
+ */
+ @org.junit.Test
+ public void testSaml2ExceededConfiguredMaxLifetime() throws Exception {
+ long maxLifetime = 30 * 60L; // 30 minutes
+ SAMLTokenRenewer samlTokenRenewer = new SAMLTokenRenewer();
+ DefaultConditionsProvider conditionsProvider = new
DefaultConditionsProvider();
+ conditionsProvider.setMaxLifetime(maxLifetime);
+ conditionsProvider.setAcceptClientLifetime(true);
+ samlTokenRenewer.setConditionsProvider(conditionsProvider);
+
+ TokenRenewerParameters renewerParameters = createRenewerParameters();
+
+ // Set expected lifetime to 35 minutes
+ long requestedLifetime = 35 * 60L;
+ Date creationTime = new Date();
+ Date expirationTime = new Date();
+ expirationTime.setTime(creationTime.getTime() + (requestedLifetime *
1000L));
+ Lifetime lifetime = new Lifetime();
+ XmlSchemaDateFormat fmt = new XmlSchemaDateFormat();
+ lifetime.setCreated(fmt.format(creationTime));
+ lifetime.setExpires(fmt.format(expirationTime));
+ renewerParameters.getTokenRequirements().setLifetime(lifetime);
+
+ CallbackHandler callbackHandler = new PasswordCallbackHandler();
+ Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
+ // Create token.
+ Element samlToken =
+ createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto,
"mystskey", callbackHandler, 50);
+ // Sleep to expire the token
+ Thread.sleep(1000);
+
+ ReceivedToken renewTarget = new ReceivedToken(samlToken);
+ renewTarget.setState(STATE.VALID);
+ renewerParameters.getTokenRequirements().setRenewTarget(renewTarget);
+ renewerParameters.setToken(renewTarget);
+
+ assertTrue(samlTokenRenewer.canHandleToken(renewTarget));
+ try {
+ samlTokenRenewer.renewToken(renewerParameters);
+ fail("Failure expected due to exceeded lifetime");
+ } catch (STSException ex) {
+ //expected
+ }
+ }
+
+ /**
+ * Renew SAML 2 token with a with a lifetime
+ * which exceeds default maximum lifetime
+ */
+ @org.junit.Test
+ public void testSaml2ExceededDefaultMaxLifetime() throws Exception {
+ SAMLTokenRenewer samlTokenRenewer = new SAMLTokenRenewer();
+ DefaultConditionsProvider conditionsProvider = new
DefaultConditionsProvider();
+ conditionsProvider.setAcceptClientLifetime(true);
+ samlTokenRenewer.setConditionsProvider(conditionsProvider);
+
+ TokenRenewerParameters renewerParameters = createRenewerParameters();
+
+ // Set expected lifetime to Default max lifetime plus 1
+ long requestedLifetime =
DefaultConditionsProvider.DEFAULT_MAX_LIFETIME + 1;
+ Date creationTime = new Date();
+ Date expirationTime = new Date();
+ expirationTime.setTime(creationTime.getTime() + (requestedLifetime *
1000L));
+ Lifetime lifetime = new Lifetime();
+ XmlSchemaDateFormat fmt = new XmlSchemaDateFormat();
+ lifetime.setCreated(fmt.format(creationTime));
+ lifetime.setExpires(fmt.format(expirationTime));
+ renewerParameters.getTokenRequirements().setLifetime(lifetime);
+
+ CallbackHandler callbackHandler = new PasswordCallbackHandler();
+ Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
+ // Create token.
+ Element samlToken =
+ createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto,
"mystskey", callbackHandler, 50);
+ // Sleep to expire the token
+ Thread.sleep(1000);
+
+ ReceivedToken renewTarget = new ReceivedToken(samlToken);
+ renewTarget.setState(STATE.VALID);
+ renewerParameters.getTokenRequirements().setRenewTarget(renewTarget);
+ renewerParameters.setToken(renewTarget);
+
+ assertTrue(samlTokenRenewer.canHandleToken(renewTarget));
+ try {
+ samlTokenRenewer.renewToken(renewerParameters);
+ fail("Failure expected due to exceeded lifetime");
+ } catch (STSException ex) {
+ //expected
+ }
+ }
+
+ /**
+ * Renew SAML 2 token with a with a lifetime
+ * which exceeds configured maximum lifetime
+ * Lifetime reduced to maximum lifetime
+ */
+ @org.junit.Test
+ public void testSaml2ExceededConfiguredMaxLifetimeButUpdated() throws
Exception {
+
+ long maxLifetime = 30 * 60L; // 30 minutes
+ SAMLTokenRenewer samlTokenRenewer = new SAMLTokenRenewer();
+ DefaultConditionsProvider conditionsProvider = new
DefaultConditionsProvider();
+ conditionsProvider.setMaxLifetime(maxLifetime);
+ conditionsProvider.setFailLifetimeExceedance(false);
+ conditionsProvider.setAcceptClientLifetime(true);
+ samlTokenRenewer.setConditionsProvider(conditionsProvider);
+
+ TokenRenewerParameters renewerParameters = createRenewerParameters();
+
+ // Set expected lifetime to 35 minutes
+ long requestedLifetime = 35 * 60L;
+ Date creationTime = new Date();
+ Date expirationTime = new Date();
+ expirationTime.setTime(creationTime.getTime() + (requestedLifetime *
1000L));
+ Lifetime lifetime = new Lifetime();
+ XmlSchemaDateFormat fmt = new XmlSchemaDateFormat();
+ lifetime.setCreated(fmt.format(creationTime));
+ lifetime.setExpires(fmt.format(expirationTime));
+ renewerParameters.getTokenRequirements().setLifetime(lifetime);
+
+ CallbackHandler callbackHandler = new PasswordCallbackHandler();
+ Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
+ // Create token.
+ Element samlToken =
+ createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto,
"mystskey", callbackHandler, 50);
+ // Sleep to expire the token
+ Thread.sleep(1000);
+
+ ReceivedToken renewTarget = new ReceivedToken(samlToken);
+ renewTarget.setState(STATE.VALID);
+ renewerParameters.getTokenRequirements().setRenewTarget(renewTarget);
+ renewerParameters.setToken(renewTarget);
+
+ assertTrue(samlTokenRenewer.canHandleToken(renewTarget));
+ TokenRenewerResponse renewerResponse =
samlTokenRenewer.renewToken(renewerParameters);
+ assertTrue(renewerResponse != null);
+ assertTrue(renewerResponse.getToken() != null);
+ assertEquals(renewerResponse.getLifetime(), maxLifetime);
+ }
+
+
+ private TokenRenewerParameters createRenewerParameters() throws
WSSecurityException {
+ TokenRenewerParameters parameters = new TokenRenewerParameters();
+
+ TokenRequirements tokenRequirements = new TokenRequirements();
+ parameters.setTokenRequirements(tokenRequirements);
+ parameters.setKeyRequirements(new KeyRequirements());
+
+ parameters.setPrincipal(new CustomTokenPrincipal("alice"));
+ // Mock up message context
+ MessageImpl msg = new MessageImpl();
+ WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ WebServiceContextImpl webServiceContext = new
WebServiceContextImpl(msgCtx);
+ parameters.setWebServiceContext(webServiceContext);
+
+ parameters.setAppliesToAddress("http://dummy-service.com/dummy";);
+
+ // Add STSProperties object
+ StaticSTSProperties stsProperties = new StaticSTSProperties();
+ Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
+ stsProperties.setEncryptionCrypto(crypto);
+ stsProperties.setSignatureCrypto(crypto);
+ stsProperties.setEncryptionUsername("myservicekey");
+ stsProperties.setSignatureUsername("mystskey");
+ stsProperties.setCallbackHandler(new PasswordCallbackHandler());
+ stsProperties.setIssuer("STS");
+ parameters.setStsProperties(stsProperties);
+
+ parameters.setEncryptionProperties(new EncryptionProperties());
+
+ return parameters;
+ }
+
+ private Element createSAMLAssertion(
+ String tokenType, Crypto crypto, String signatureUsername,
+ CallbackHandler callbackHandler, long ttlMs
+ ) throws WSSecurityException {
+ SAMLTokenProvider samlTokenProvider = new SAMLTokenProvider();
+ DefaultConditionsProvider conditionsProvider = new
DefaultConditionsProvider();
+ conditionsProvider.setAcceptClientLifetime(true);
+ samlTokenProvider.setConditionsProvider(conditionsProvider);
+ TokenProviderParameters providerParameters =
+ createProviderParameters(
+ tokenType, STSConstants.BEARER_KEY_KEYTYPE, crypto,
signatureUsername, callbackHandler
+ );
+
+ if (ttlMs != 0) {
+ Lifetime lifetime = new Lifetime();
+ Date creationTime = new Date();
+ Date expirationTime = new Date();
+ expirationTime.setTime(creationTime.getTime() + ttlMs);
+
+ XmlSchemaDateFormat fmt = new XmlSchemaDateFormat();
+ lifetime.setCreated(fmt.format(creationTime));
+ lifetime.setExpires(fmt.format(expirationTime));
+
+ providerParameters.getTokenRequirements().setLifetime(lifetime);
+ }
+
+ TokenProviderResponse providerResponse =
samlTokenProvider.createToken(providerParameters);
+ assertTrue(providerResponse != null);
+ assertTrue(providerResponse.getToken() != null &&
providerResponse.getTokenId() != null);
+
+ return providerResponse.getToken();
+ }
+
+ private TokenProviderParameters createProviderParameters(
+ String tokenType, String keyType, Crypto crypto,
+ String signatureUsername, CallbackHandler callbackHandler
+ ) throws WSSecurityException {
+ TokenProviderParameters parameters = new TokenProviderParameters();
+
+ TokenRequirements tokenRequirements = new TokenRequirements();
+ tokenRequirements.setTokenType(tokenType);
+ parameters.setTokenRequirements(tokenRequirements);
+
+ KeyRequirements keyRequirements = new KeyRequirements();
+ keyRequirements.setKeyType(keyType);
+ parameters.setKeyRequirements(keyRequirements);
+
+ parameters.setPrincipal(new CustomTokenPrincipal("alice"));
+ // Mock up message context
+ MessageImpl msg = new MessageImpl();
+ WrappedMessageContext msgCtx = new WrappedMessageContext(msg);
+ WebServiceContextImpl webServiceContext = new
WebServiceContextImpl(msgCtx);
+ parameters.setWebServiceContext(webServiceContext);
+
+ parameters.setAppliesToAddress("http://dummy-service.com/dummy";);
+
+ // Add STSProperties object
+ StaticSTSProperties stsProperties = new StaticSTSProperties();
+ stsProperties.setSignatureCrypto(crypto);
+ stsProperties.setSignatureUsername(signatureUsername);
+ stsProperties.setCallbackHandler(callbackHandler);
+ stsProperties.setIssuer("STS");
+ parameters.setStsProperties(stsProperties);
+
+ parameters.setEncryptionProperties(new EncryptionProperties());
+
+ return parameters;
+ }
+
+ private Properties getEncryptionProperties() {
+ Properties properties = new Properties();
+ properties.put(
+ "org.apache.ws.security.crypto.provider",
"org.apache.ws.security.components.crypto.Merlin"
+ );
+
properties.put("org.apache.ws.security.crypto.merlin.keystore.password",
"stsspass");
+ properties.put("org.apache.ws.security.crypto.merlin.keystore.file",
"stsstore.jks");
+
+ return properties;
+ }
+
+
+
+}
Modified:
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java?rev=1310276&r1=1310275&r2=1310276&view=diff
==============================================================================
---
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
(original)
+++
cxf/trunk/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewerTest.java
Fri Apr 6 10:57:58 2012
@@ -314,6 +314,65 @@ public class SAMLTokenRenewerTest extend
assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
}
+ /**
+ * Renew a valid SAML1 Assertion
+ */
+ @org.junit.Test
+ public void renewValidSAML1Assertion() throws Exception {
+ // Create the Assertion
+ Crypto crypto = CryptoFactory.getInstance(getEncryptionProperties());
+ CallbackHandler callbackHandler = new PasswordCallbackHandler();
+ Element samlToken =
+ createSAMLAssertion(WSConstants.WSS_SAML_TOKEN_TYPE, crypto,
"mystskey", callbackHandler, 50000);
+ Document doc = samlToken.getOwnerDocument();
+ samlToken = (Element)doc.appendChild(samlToken);
+
+ // Validate the Assertion
+ TokenValidator samlTokenValidator = new SAMLTokenValidator();
+ TokenValidatorParameters validatorParameters =
createValidatorParameters();
+ TokenRequirements tokenRequirements =
validatorParameters.getTokenRequirements();
+ ReceivedToken validateTarget = new ReceivedToken(samlToken);
+ tokenRequirements.setValidateTarget(validateTarget);
+ validatorParameters.setToken(validateTarget);
+
+ assertTrue(samlTokenValidator.canHandleToken(validateTarget));
+
+ TokenValidatorResponse validatorResponse =
+ samlTokenValidator.validateToken(validatorParameters);
+ assertTrue(validatorResponse != null);
+ assertTrue(validatorResponse.getToken() != null);
+ assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
+
+ // Renew the Assertion
+ TokenRenewerParameters renewerParameters = new
TokenRenewerParameters();
+
renewerParameters.setAppliesToAddress("http://dummy-service.com/dummy";);
+
renewerParameters.setStsProperties(validatorParameters.getStsProperties());
+ renewerParameters.setPrincipal(new CustomTokenPrincipal("alice"));
+
renewerParameters.setWebServiceContext(validatorParameters.getWebServiceContext());
+
renewerParameters.setKeyRequirements(validatorParameters.getKeyRequirements());
+
renewerParameters.setTokenRequirements(validatorParameters.getTokenRequirements());
+ renewerParameters.setTokenStore(validatorParameters.getTokenStore());
+ renewerParameters.setToken(validatorResponse.getToken());
+
+ TokenRenewer samlTokenRenewer = new SAMLTokenRenewer();
+
assertTrue(samlTokenRenewer.canHandleToken(validatorResponse.getToken()));
+
+ TokenRenewerResponse renewerResponse =
+ samlTokenRenewer.renewToken(renewerParameters);
+ assertTrue(renewerResponse != null);
+ assertTrue(renewerResponse.getToken() != null);
+
+ // Now validate it again
+ validateTarget = new ReceivedToken(renewerResponse.getToken());
+ tokenRequirements.setValidateTarget(validateTarget);
+ validatorParameters.setToken(validateTarget);
+
+ validatorResponse =
samlTokenValidator.validateToken(validatorParameters);
+ assertTrue(validatorResponse != null);
+ assertTrue(validatorResponse.getToken() != null);
+ assertTrue(validatorResponse.getToken().getState() == STATE.VALID);
+ }
+
private TokenValidatorParameters createValidatorParameters() throws
WSSecurityException {
TokenValidatorParameters parameters = new TokenValidatorParameters();
