Added SAMLIssuer property

Added SAMLIssuer property to Wss4jSecurityInterceptor. Issue: SWS-856
spring-projects · Apr 25, 2014 · 195a625 · 195a625
1 parent 1a5416d
commit 195a625
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/...ty/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java b/...ty/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java
@@ -36,6 +36,7 @@
 import org.apache.ws.security.handler.WSHandlerConstants;
 import org.apache.ws.security.handler.WSHandlerResult;
 import org.apache.ws.security.message.token.Timestamp;
+import org.apache.ws.security.saml.SAMLIssuer;
 import org.apache.ws.security.util.WSSecurityUtil;
 import org.apache.ws.security.validate.Credential;
 import org.apache.ws.security.validate.SignatureTrustValidator;
@@ -88,6 +89,8 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
 
     public static final String SECUREMENT_USER_PROPERTY_NAME = "Wss4jSecurityInterceptor.securementUser";
 
+    private static final String SAML_ISSUER_PROPERTY_NAME = "Wss4jSecurityInterceptor.samlIssuer";
+
     private int securementAction;
 
     private String securementActions;
@@ -119,6 +122,8 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
     private int securementTimeToLive = 300;
 
 	private int futureTimeToLive = 60;
+
+	private SAMLIssuer samlIssuer;
 
     private WSSConfig wssConfig;
 
@@ -489,6 +494,14 @@ public void setFutureTimeToLive(int futureTimeToLive) {
 		this.futureTimeToLive = futureTimeToLive;
 	}
 
+	/**
+	 * Sets the SAML issuer.
+	 */
+	public void setSamlIssuer(SAMLIssuer samlIssuer) {
+		handler.setOption(WSHandlerConstants.SAML_PROP_REF_ID, SAML_ISSUER_PROPERTY_NAME);
+		this.samlIssuer = samlIssuer;
+	}
+
 	@Override
 	public void afterPropertiesSet() throws Exception {
         Assert.isTrue(validationActions != null || securementActions != null,
@@ -566,6 +579,8 @@ protected RequestData initializeRequestData(MessageContext messageContext) {
 
 	    messageContext.setProperty(WSHandlerConstants.TTL_TIMESTAMP, Integer.toString(securementTimeToLive));
 
+	    messageContext.setProperty(SAML_ISSUER_PROPERTY_NAME, samlIssuer);
+
         return requestData;
     }