[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Mar  8 14:26:10 2013
New Revision: 1060

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1060&view=rev
Log:
SIDP-575 - Add option to omit NotBefore from assertion conditions

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationBeanDefinitionParser.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationFactoryBean.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/relyingparty/provider/AbstractSAMLProfileConfiguration.java
    branches/REL_1/src/main/resources/schema/shibboleth-2.0-relying-party-saml.xsd

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1060&r1=1059&r2=1060&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Fri Mar  8 14:26:10 2013
@@ -5,6 +5,7 @@
 [SC-186] -  AttributeInMetadata rule for the attribute filter (copied back from uApprove)
 [SIDP-499] - Allow signed requests to bypass ACS verification
 [SIDP-559] - Attribute queries are ignoring input designators
+[SIDP-575] - Add option to omit NotBefore from assertion conditions
 [JOST-200] - Reduce memory usage of unit tests
 [JXT-98] -  Add support for configuring PKIX policy checking in the PKIX trust engine 
 

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationBeanDefinitionParser.java?rev=1060&r1=1059&r2=1060&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationBeanDefinitionParser.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationBeanDefinitionParser.java Fri Mar  8 14:26:10 2013
@@ -66,6 +66,14 @@
         }
         builder.addPropertyValue("assertionLifetime", lifetime);
 
+        if (element.hasAttributeNS(null, "includeConditionsNotBefore")) {
+            builder.addPropertyValue("includeConditionsNotBefore",
+                    XMLHelper.getAttributeValueAsBoolean(
+                            element.getAttributeNodeNS(null, "includeConditionsNotBefore")));
+        } else {
+            builder.addPropertyValue("includeConditionsNotBefore", true);
+        }
+
         String artifactType = DatatypeHelper.safeTrimOrNullString(element.getAttributeNS(null, "outboundArtifactType"));
         if (artifactType != null) {
             byte[] artifactTypeBytes = DatatypeHelper.intToByteArray(Integer.parseInt(artifactType));

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationFactoryBean.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationFactoryBean.java?rev=1060&r1=1059&r2=1060&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationFactoryBean.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/relyingparty/saml/AbstractSAMLProfileConfigurationFactoryBean.java Fri Mar  8 14:26:10 2013
@@ -37,6 +37,9 @@
     /** Amount of time before an issued assertion expires. */
     private long assertionLifetime;
 
+    /** Whether assertions should include a NotBefore condition. */
+    private boolean includeConditionsNotBefore;
+
     /** 2-byte artifact type used for outbound messages. */
     private byte[] outboundArtifactType;
 
@@ -75,6 +78,15 @@
     }
 
     /**
+     * Gets whether assertions should include a NotBefore condition.
+     *
+     * @return whether assertions should include a NotBefore condition
+     */
+    public boolean includeConditionsNotBefore() {
+        return includeConditionsNotBefore;
+    }
+
+    /**
      * Gets the 2-byte artifact type used for outbound messages.
      * 
      * @return 2-byte artifact type used for outbound messages
@@ -144,6 +156,15 @@
      */
     public void setAudiences(List<String> newAudiences) {
         audiences = newAudiences;
+    }
+
+    /**
+     * Sets whether assertions should include a NotBefore condition.
+     *
+     * @param include whether assertions should include a NotBefore condition
+     */

[... 83 lines stripped ...]