Implements ExpirationTimeout in WSSecurity data type. (#536)

iroqueta · web-flow · commit c555e8054ba2 · 2022-03-16T18:20:40.000-03:00
Issue: 94939
diff --git a/common/src/main/java/com/genexus/common/interfaces/IGXWSSecurity.java b/common/src/main/java/com/genexus/common/interfaces/IGXWSSecurity.java
@@ -6,5 +6,7 @@ public interface IGXWSSecurity
 	void setSignature(IGXWSSignature signature);
 	IGXWSEncryption getEncryption();
 	void setEncryption(IGXWSEncryption encryption);
+	int getExpirationTimeout();
+	void setExpirationTimeout(int expiresTimeout);
 }
 
diff --git a/java/src/main/java/com/genexus/ws/security/GXWSSecurity.java b/java/src/main/java/com/genexus/ws/security/GXWSSecurity.java
@@ -8,6 +8,7 @@ public class GXWSSecurity implements IGXWSSecurity
 {
 	private IGXWSSignature signature;
 	private IGXWSEncryption encryption;
+	private int expirationTimeout;
 
 	public GXWSSecurity()
 	{
@@ -33,6 +34,16 @@ public IGXWSEncryption getEncryption()
 	public void setEncryption(IGXWSEncryption encryption)
 	{
 		this.encryption = encryption;
-	}	
+	}
+
+	public int getExpirationTimeout()
+	{
+		return expirationTimeout;
+	}
+
+	public void setExpirationTimeout(int expirationTimeout)
+	{
+		this.expirationTimeout = expirationTimeout;
+	}
 }
 
diff --git a/wrapperjakarta/src/main/java/com/genexus/ws/GXHandlerConsumerChain.java b/wrapperjakarta/src/main/java/com/genexus/ws/GXHandlerConsumerChain.java
@@ -17,6 +17,7 @@
 import org.apache.ws.security.message.WSSecEncrypt;
 import org.apache.ws.security.message.WSSecHeader;
 import org.apache.ws.security.message.WSSecSignature;
+import org.apache.ws.security.message.WSSecTimestamp;
 import org.w3c.dom.*;
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
@@ -123,9 +124,11 @@ public boolean handleMessage(SOAPMessageContext messageContext)
 			//ws-security
 			IGXWSSignature wsSignature = null;
 			IGXWSEncryption wsEncryption = null;
+			int expirationTimeout = 0;
 			if (location.getWSSecurity() != null) {
 				wsSignature = location.getWSSecurity().getSignature();
 				wsEncryption = location.getWSSecurity().getEncryption();
+				expirationTimeout = location.getWSSecurity().getExpirationTimeout();
 			}
 
 			if (Boolean.TRUE.equals(outboundProperty) && soapHeaderRaw == null && ((wsSignature != null && !wsSignature.getAlias().isEmpty()) || (wsEncryption != null && !wsEncryption.getAlias().isEmpty())))
@@ -149,6 +152,13 @@ public boolean handleMessage(SOAPMessageContext messageContext)
 					sign.setKeyIdentifierType(wsSignature.getKeyIdentifierType());
 					sign.setUserInfo(wsSignature.getAlias(), wsSignature.getKeystore().getPassword());
 					signedDoc = sign.build(doc, signatureCrypto, secHeader);
+
+					if (expirationTimeout > 0)
+					{
+						WSSecTimestamp timestamp = new WSSecTimestamp();
+						timestamp.setTimeToLive(expirationTimeout);
+						signedDoc = timestamp.build(signedDoc, secHeader);
+					}
 				}
 
 				//Encryption
diff --git a/wrapperjavax/src/main/java/com/genexus/ws/GXHandlerConsumerChain.java b/wrapperjavax/src/main/java/com/genexus/ws/GXHandlerConsumerChain.java
@@ -17,6 +17,7 @@
 import org.apache.ws.security.message.WSSecEncrypt;
 import org.apache.ws.security.message.WSSecHeader;
 import org.apache.ws.security.message.WSSecSignature;
+import org.apache.ws.security.message.WSSecTimestamp;
 import org.w3c.dom.*;
 import java.io.InputStream;
 import java.io.ByteArrayInputStream;
@@ -123,9 +124,11 @@ public boolean handleMessage(SOAPMessageContext messageContext)
 			//ws-security
 			IGXWSSignature wsSignature = null;
 			IGXWSEncryption wsEncryption = null;
+			int expirationTimeout = 0;
 			if (location.getWSSecurity() != null) {
 				wsSignature = location.getWSSecurity().getSignature();
 				wsEncryption = location.getWSSecurity().getEncryption();
+				expirationTimeout = location.getWSSecurity().getExpirationTimeout();
 			}
 
 			if (Boolean.TRUE.equals(outboundProperty) && soapHeaderRaw == null && ((wsSignature != null && !wsSignature.getAlias().isEmpty()) || (wsEncryption != null && !wsEncryption.getAlias().isEmpty())))
@@ -149,6 +152,13 @@ public boolean handleMessage(SOAPMessageContext messageContext)
 					sign.setKeyIdentifierType(wsSignature.getKeyIdentifierType());
 					sign.setUserInfo(wsSignature.getAlias(), wsSignature.getKeystore().getPassword());
 					signedDoc = sign.build(doc, signatureCrypto, secHeader);
+
+					if (expirationTimeout > 0)
+					{
+						WSSecTimestamp timestamp = new WSSecTimestamp();
+						timestamp.setTimeToLive(expirationTimeout);
+						signedDoc = timestamp.build(signedDoc, secHeader);
+					}
 				}
 
 				//Encryption

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,7 @@ public interface IGXWSSecurity`
`6`	`6`	`void setSignature(IGXWSSignature signature);`
`7`	`7`	`IGXWSEncryption getEncryption();`
`8`	`8`	`void setEncryption(IGXWSEncryption encryption);`
	`9`	`+ int getExpirationTimeout();`
	`10`	`+ void setExpirationTimeout(int expiresTimeout);`
`9`	`11`	`}`
`10`	`12`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ public class GXWSSecurity implements IGXWSSecurity`
`8`	`8`	`{`
`9`	`9`	`private IGXWSSignature signature;`
`10`	`10`	`private IGXWSEncryption encryption;`
	`11`	`+ private int expirationTimeout;`
`11`	`12`
`12`	`13`	`public GXWSSecurity()`
`13`	`14`	`{`
`@@ -33,6 +34,16 @@ public IGXWSEncryption getEncryption()`
`33`	`34`	`public void setEncryption(IGXWSEncryption encryption)`
`34`	`35`	`{`
`35`	`36`	`this.encryption = encryption;`
`36`		`- }`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ public int getExpirationTimeout()`
	`40`	`+ {`
	`41`	`+ return expirationTimeout;`
	`42`	`+ }`
	`43`	`+`
	`44`	`+ public void setExpirationTimeout(int expirationTimeout)`
	`45`	`+ {`
	`46`	`+ this.expirationTimeout = expirationTimeout;`
	`47`	`+ }`
`37`	`48`	`}`
`38`	`49`