[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/conf/general-authn-...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jun 18 18:34:49 2014
New Revision: 6115

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6115&view=rev
Log:
Default more properties.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6115&r1=6114&r2=6115&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Jun 18 18:34:49 2014
@@ -87,8 +87,8 @@
 idp.authn.flows = IPAddress|LDAP
 
 # Default lifetime and timeout of various authentication methods
-idp.authn.defaultLifetime = PT60M
-idp.authn.defaultTimeout = PT30M
+#idp.authn.defaultLifetime = PT60M
+#idp.authn.defaultTimeout = PT30M
 
 # Whether to prioritize "active" results when an SP requests more than
 # one possible matching login method (V2 behavior was to favor them)
@@ -127,8 +127,8 @@
 idp.attribute.resolver.myLDAP.principalCredential = myServicePassword
 
 # Message freshness and replay cache tuning
-idp.policy.messageLifetime = PT3M
-idp.policy.clockSkew = PT3M
+#idp.policy.messageLifetime = PT3M
+#idp.policy.clockSkew = PT3M
 
 # Suppresses typical signing/encryption when artifact binding used
 #idp.artifact.secureChannel = true

Modified: trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml?rev=6115&r1=6114&r2=6115&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml Wed Jun 18 18:34:49 2014
@@ -29,8 +29,8 @@
             p:passiveAuthenticationSupported="false"
             p:forcedAuthenticationSupported="false"
             p:nonBrowserSupported="true"
-            p:lifetime="${idp.authn.defaultLifetime}"
-            p:inactivityTimeout="${idp.authn.defaultTimeout}">
+            p:lifetime="${idp.authn.defaultLifetime:PT60M}"
+            p:inactivityTimeout="${idp.authn.defaultTimeout:PT30M}">
         <property name="supportedPrincipals">
             <util:list>
                 <bean parent="shibboleth.SAML2AuthnContextClassRef"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml?rev=6115&r1=6114&r2=6115&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml Wed Jun 18 18:34:49 2014
@@ -21,7 +21,7 @@
         <constructor-arg name="messageHandler">
             <bean class="org.opensaml.saml.common.binding.security.impl.MessageReplaySecurityHandler" scope="prototype"
                 p:replayCache-ref="shibboleth.ReplayCache"
-                p:expires="${idp.policy.messageLifetime}" />
+                p:expires="${idp.policy.messageLifetime:PT3M}" />
         </constructor-arg>
         <property name="errorEvent">
             <util:constant static-field="org.opensaml.profile.action.EventIds.MESSAGE_REPLAY" />
@@ -35,7 +35,7 @@
             <bean class="org.opensaml.saml.common.binding.security.impl.MessageReplaySecurityHandler" scope="prototype"
                 p:requiredRule="false"
                 p:replayCache-ref="shibboleth.ReplayCache"
-                p:expires="${idp.policy.messageLifetime}" />
+                p:expires="${idp.policy.messageLifetime:PT3M}" />
         </constructor-arg>
         <property name="errorEvent">
             <util:constant static-field="org.opensaml.profile.action.EventIds.MESSAGE_REPLAY" />
@@ -47,8 +47,8 @@
             c:executionDirection="INBOUND">
         <constructor-arg name="messageHandler">
             <bean class="org.opensaml.saml.common.binding.security.impl.MessageLifetimeSecurityHandler" scope="prototype"
-                p:messageLifetime="${idp.policy.messageLifetime}"
-                p:clockSkew="${idp.policy.clockSkew}" />
+                p:messageLifetime="${idp.policy.messageLifetime:PT3M}"
+                p:clockSkew="${idp.policy.clockSkew:PT3M}" />
         </constructor-arg>
         <property name="errorEvent">
             <util:constant static-field="org.opensaml.profile.action.EventIds.MESSAGE_EXPIRED" />
@@ -61,8 +61,8 @@
         <constructor-arg name="messageHandler">
             <bean class="org.opensaml.saml.common.binding.security.impl.MessageLifetimeSecurityHandler" scope="prototype"

[... 9 lines stripped ...]