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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul  8 23:38:58 2014
New Revision: 6248

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6248&view=rev
Log:
- Simplify boolean property.
- Wire in an optional attribute lookup during authn when a session exists.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-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=6248&r1=6247&r2=6248&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Jul  8 23:38:58 2014
@@ -71,8 +71,8 @@
 #idp.nameid.saml2.default = urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 #idp.nameid.saml1.default = urn:mace:shibboleth:1.0:nameIdentifier
 
-# Set to shibboleth.Conditions.False to disable the IdP session layer
-#idp.session.enabled = shibboleth.Conditions.True
+# Set to false to disable the IdP session layer
+#idp.session.enabled = true
 
 # Set to "shibboleth.StorageService" for server-side storage
 #idp.session.StorageService = shibboleth.ClientStorageService
@@ -107,6 +107,10 @@
 # Whether to prioritize "active" results when an SP requests more than
 # one possible matching login method (V2 behavior was to favor them)
 #idp.authn.favorSSO = true
+
+# Set to a quoted attribute ID to resolve prior to selecting
+# authentication flows, making more data available to flow selection
+#idp.authn.resolveAttribute = 'eduPersonAssurance'
 
 # Reload "failfast" (stop the IdP if a configuration is bad)
 # and reload check interval (0 == never reload).

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=6248&r1=6247&r2=6248&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Tue Jul  8 23:38:58 2014
@@ -49,15 +49,24 @@
         c:type="#{ T(net.shibboleth.idp.attribute.filter.context.AttributeFilterContext) }"
         c:createContext="true" />
 
+    <bean id="shibboleth.ChildLookup.AuthenticationContext"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(net.shibboleth.idp.authn.context.AuthenticationContext) }" />
     <bean id="shibboleth.ChildLookup.SubjectCanonicalizationContext"
         class="org.opensaml.messaging.context.navigate.ChildContextLookup"
         c:type="#{ T(net.shibboleth.idp.authn.context.SubjectCanonicalizationContext) }" />
+    <bean id="shibboleth.ChildLookup.SessionContext"
+        class="org.opensaml.messaging.context.navigate.ChildContextLookup"
+        c:type="#{ T(net.shibboleth.idp.session.context.SessionContext) }" />
 
     <bean id="shibboleth.ResponderIdLookup.Simple"
         class="net.shibboleth.idp.profile.context.navigate.ResponderIdLookupFunction" />
 
     <bean id="shibboleth.RelyingPartyIdLookup.Simple"
         class="net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction" />
+
+    <bean id="shibboleth.PrincipalNameLookup.Session"
+        class="net.shibboleth.idp.profile.context.navigate.SessionContextPrincipalLookupFunction" />
 
     <bean id="shibboleth.SignatureValidationConfigurationLookup"
         class="net.shibboleth.idp.profile.config.navigate.SignatureValidationConfigurationLookupFunction"

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml?rev=6248&r1=6247&r2=6248&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml Tue Jul  8 23:38:58 2014
@@ -25,13 +25,30 @@
 
     <bean id="PopulateSessionContext"
         class="net.shibboleth.idp.session.impl.PopulateSessionContext" scope="prototype"
-        p:activationCondition-ref="%{idp.session.enabled:shibboleth.Conditions.True}"
+        p:activationCondition-ref="#{ %{idp.session.enabled:true} ? 'shibboleth.Conditions.True' : 'shibboleth.Conditions.False' }"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
         p:sessionResolver-ref="shibboleth.SessionManager" />
     
     <bean id="ExtractActiveAuthenticationResults"

[... 97 lines stripped ...]