[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml idp-...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 24 23:12:50 2014
New Revision: 5472

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5472&view=rev
Log:
IDP-123 - refactor into OpenSAML and add strategy function to get assertion lifetime

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/navigate/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/navigate/AssertionLifetimeLookupFunction.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/navigate/package-info.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/logic/NotBeforeProfileConfigPredicate.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotOnOrAfterConditionToAssertions.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddNotOnOrAfterConditionToAssertionsTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml?rev=5472&r1=5471&r2=5472&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml Mon Feb 24 23:12:50 2014
@@ -267,8 +267,13 @@
 
     <bean
         id="AddNotOnOrAfterConditionToAssertions"
-        class="net.shibboleth.idp.saml.impl.profile.saml1.AddNotOnOrAfterConditionToAssertions"
-        scope="prototype" />
+        class="org.opensaml.saml.saml1.profile.impl.AddNotOnOrAfterConditionToAssertions"
+        scope="prototype"
+        p:defaultAssertionLifetime="PT5M">
+        <property name="assertionLifetimeStrategy">
+            <bean class="net.shibboleth.idp.saml.impl.profile.config.navigate.AssertionLifetimeLookupFunction" />
+        </property>
+    </bean>
 
     <bean
         id="AddAudienceRestrictionToAssertions"

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/logic/NotBeforeProfileConfigPredicate.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/logic/NotBeforeProfileConfigPredicate.java?rev=5472&r1=5471&r2=5472&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/logic/NotBeforeProfileConfigPredicate.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/logic/NotBeforeProfileConfigPredicate.java Mon Feb 24 23:12:50 2014
@@ -34,7 +34,9 @@
 /**
  * A predicate that returns {@link SAMLProfileConfiguration#includeConditionsNotBefore()}
  * if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
- * by defaul a child of the {@link ProfileRequestContext}.
+ * by default a child of the {@link ProfileRequestContext}.
+ * 
+ * <p>If unable to locate a specific setting, the predicate is true.</p>
  */
 public class NotBeforeProfileConfigPredicate implements Predicate<ProfileRequestContext> {