You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/01/20 12:22:45 UTC

svn commit: r1233870 - in /webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder: SAML1ComponentBuilder.java SAML2ComponentBuilder.java

Author: coheigea
Date: Fri Jan 20 11:22:44 2012
New Revision: 1233870

URL: http://svn.apache.org/viewvc?rev=1233870&view=rev
Log:
[WSS-335] - SAML NotOnOrAfter Conditions not set correctly in certain circumstances

Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java?rev=1233870&r1=1233869&r2=1233870&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java Fri Jan 20 11:22:44 2012
@@ -269,6 +269,9 @@ public class SAML1ComponentBuilder {
         } else {
             DateTime newNotBefore = new DateTime();
             conditions.setNotBefore(newNotBefore);
+            if (tokenPeriodMinutes <= 0) {
+                tokenPeriodMinutes = 5;
+            }
             conditions.setNotOnOrAfter(newNotBefore.plusMinutes(tokenPeriodMinutes));
         }
         

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java?rev=1233870&r1=1233869&r2=1233870&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java Fri Jan 20 11:22:44 2012
@@ -198,6 +198,9 @@ public class SAML2ComponentBuilder {
         } else {
             DateTime newNotBefore = new DateTime();
             conditions.setNotBefore(newNotBefore);
+            if (tokenPeriodMinutes <= 0) {
+                tokenPeriodMinutes = 5;
+            }
             conditions.setNotOnOrAfter(newNotBefore.plusMinutes(tokenPeriodMinutes));
         }