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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Feb 26 18:23:00 2016
New Revision: 8107

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8107&view=rev
Log:
IDP-740 - Custom Prinicipal Serialization

https://issues.shibboleth.net/jira/browse/IDP-740

Reworked system file to accomodate extending the serializer and symbolic collections.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/general-authn-system.xml

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=8107&r1=8106&r2=8107&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	Fri Feb 26 18:23:00 2016
@@ -46,13 +46,10 @@
         </property>
     </bean>
 
-    <!--
-    Defining this allows us to specify symbolic text replacements that shrink the size of results
-    saved to client-side storage such as cookies.
-    -->
-    <bean id="shibboleth.DefaultAuthenticationResultSerializer"
-            class="net.shibboleth.idp.authn.impl.DefaultAuthenticationResultSerializer">
-        <property name="principalSerializers">
+    <!-- Default list of custom Principal serializers; users can define their own list and merge it with this one. -->
+    <bean id="shibboleth.DefaultPrincipalSerializers"
+            class="org.springframework.beans.factory.config.ListFactoryBean">
+        <property name="sourceList">
             <list>
                 <bean class="net.shibboleth.idp.authn.principal.impl.UsernamePrincipalSerializer" />
                 <bean class="net.shibboleth.idp.authn.principal.impl.LDAPPrincipalSerializer" />
@@ -61,7 +58,15 @@
                     p:dataSealer-ref="shibboleth.DataSealer" />
             </list>
         </property>
-        <property name="genericPrincipalSerializer.symbolics">
+    </bean>
+    
+    <!--
+    Defining this allows us to specify symbolic text replacements that shrink the size of results
+    saved to client-side storage such as cookies.
+    -->
+    <bean id="shibboleth.DefaultPrincipalSymbolics"
+            class="org.springframework.beans.factory.config.MapFactoryBean">
+        <property name="sourceMap">
             <map>
                 <!-- Custom principal types. -->
                 <entry key="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal" value="1" />
@@ -114,6 +119,19 @@
             </map>
         </property>
     </bean>
+    
+    <!-- The serializer machinery injected into authentication flows by default. -->
+    <bean id="shibboleth.DefaultAuthenticationResultSerializer"
+            class="net.shibboleth.idp.authn.impl.DefaultAuthenticationResultSerializer">
+        <property name="principalSerializers">
+            <ref bean="#{getObject('shibboleth.PrincipalSerializers') != null
+                ? 'shibboleth.PrincipalSerializers' : 'shibboleth.DefaultPrincipalSerializers'}" />
+        </property>
+        <property name="genericPrincipalSerializer.symbolics">
+            <ref bean="#{getObject('shibboleth.PrincipalSymbolics') != null
+                ? 'shibboleth.PrincipalSymbolics' : 'shibboleth.DefaultPrincipalSymbolics'}" />
+        </property>
+    </bean>
 
     <!-- Registry of comparison rules configured by deployer and injected into authentication flow. -->
     <bean id="shibboleth.AuthnComparisonRegistry"