[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties conf/subject-config.xml sy...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Mar  1 19:52:28 2014
New Revision: 5507

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5507&view=rev
Log:
Add transient ID generation to config.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/subject-config.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-config-system.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=5507&r1=5506&r2=5507&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Sat Mar  1 19:52:28 2014
@@ -34,6 +34,9 @@
 
 # Set to "shibboleth.StorageService" for server-side storage
 idp.session.StorageService = shibboleth.ClientStorageService
+
+# Set to shibboleth.StoredTransientIdGenerator for server-side storage
+idp.transientId.generator = shibboleth.StoredTransientIdGenerator
 
 # Size of session IDs
 idp.session.idSize = 32

Modified: trunk/idp-conf/src/main/resources/conf/subject-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/subject-config.xml?rev=5507&r1=5506&r2=5507&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Sat Mar  1 19:52:28 2014
@@ -32,22 +32,28 @@
     <!-- SAML 2 NameID Generation -->
     <util:list id="shibboleth.SAML2NameIDGenerators">
     
-        <!-- TODO: add transient/persistent generators -->
+        <bean id="transient" class="net.shibboleth.idp.saml.impl.nameid.TransientSAML2NameIDGenerator"
+            p:format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient"
+            p:transientIdGenerator-ref="${idp.transientId.generator}" />
     
         <bean id="email" class="net.shibboleth.idp.saml.impl.nameid.AttributeSourcedSAML2NameIDGenerator"
-                p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-                p:attributeSourceIds="#{ {'email'} }" />
+            p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+            p:attributeSourceIds="#{ {'email'} }"
+            p:activationCondition-ref="shibboleth.Predicates.False" />
                 
     </util:list>
 
     <!-- SAML 1 NameIdentifier Generation -->
     <util:list id="shibboleth.SAML1NameIdentifierGenerators">
     
-        <!-- TODO: add transient/persistent generators -->
+        <bean id="transient" class="net.shibboleth.idp.saml.impl.nameid.TransientSAML1NameIdentifierGenerator"
+            p:format="urn:mace:shibboleth:1.0:nameIdentifier"
+            p:transientIdGenerator-ref="${idp.transientId.generator}" />
 
         <bean id="email" class="net.shibboleth.idp.saml.impl.nameid.AttributeSourcedSAML1NameIdentifierGenerator"
-                p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
-                p:attributeSourceIds="#{ {'email'} }" />
+            p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+            p:attributeSourceIds="#{ {'email'} }"
+            p:activationCondition-ref="shibboleth.Predicates.False" />
                 
     </util:list>
     

Modified: trunk/idp-conf/src/main/resources/system/conf/subject-config-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/subject-config-system.xml?rev=5507&r1=5506&r2=5507&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/subject-config-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/subject-config-system.xml Sat Mar  1 19:52:28 2014
@@ -11,6 +11,9 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
+
+    <bean id="shibboleth.StoredTransientIdGenerator" class="net.shibboleth.idp.saml.impl.nameid.StoredTransientIdGenerator"
+        p:idStore-ref="shibboleth.StorageService" />
 
     <bean id="SubjectC14NFlow/LegacyPrincipalConnector" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
         <property name="activationCondition">