[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties conf/saml-nameid-gen.xml c...

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 30 00:12:17 2014
New Revision: 6002

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6002&view=rev
Log:
Split and simplify nameid-gen config files, add some properties.

Added:
    trunk/idp-conf/src/main/resources/conf/saml-nameid.xml
      - copied, changed from r5991, trunk/idp-conf/src/main/resources/conf/saml-nameid-gen.xml
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/saml-nameid-gen.xml
    trunk/idp-conf/src/main/resources/conf/services.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=6002&r1=6001&r2=6002&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Fri May 30 00:12:17 2014
@@ -32,7 +32,7 @@
 idp.session.enabled = true
 
 # Set the entityId of the IdP
-idp.entity.id=https://idp.example.org
+idp.entity.id = https://idp.example.org
 
 # Set to true to expose more detailed errors in responses to SPs
 idp.errors.detailed = false
@@ -49,6 +49,14 @@
 idp.persistentId.salt = changethistosomethingrandom
 idp.persistentId.algorithm = SHA
 idp.persistentId.store = PersistentIdStore
+
+# Comment out to disable legacy NameID generation via Attribute Resolver
+idp.nameid.saml2.legacyGenerator = shibboleth.LegacySAML2NameIDGenerator
+idp.nameid.saml1.legacyGenerator = shibboleth.LegacySAML1NameIdentifierGenerator
+
+# Default NameID formats to use when nothing else is called for
+idp.nameid.saml2.default = urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+idp.nameid.saml1.default = urn:mace:shibboleth:1.0:nameIdentifier
 
 # Size of session IDs
 idp.session.idSize = 32
@@ -81,10 +89,6 @@
 # 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 = false
-
-# Default NameID formats to use when nothing else is specified
-idp.saml1.nameid.default = urn:mace:shibboleth:1.0:nameIdentifier
-idp.saml2.nameid.default = urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 
 idp.service.nameidGeneration.checkInterval=PT5M
 

Copied: trunk/idp-conf/src/main/resources/conf/saml-nameid.xml (from r5991, trunk/idp-conf/src/main/resources/conf/saml-nameid-gen.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/saml-nameid.xml?p2=trunk/idp-conf/src/main/resources/conf/saml-nameid.xml&p1=trunk/idp-conf/src/main/resources/conf/saml-nameid-gen.xml&r1=5991&r2=6002&rev=6002&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/saml-nameid-gen.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/saml-nameid.xml Fri May 30 00:12:17 2014
@@ -22,23 +22,19 @@
     <!--
     These generator lists handle NameID/Nameidentifier generation going forward. By default,
     transient IDs for both SAML versions are enabled. The other examples are for persistent IDs
-    and generating more one-off formats based on resolved attributes. A suggested approach is to
+    and generating more one-off formats based on resolved attributes. The suggested approach is to
     control their use via release of the underlying source attribute in the filter policy rather
     than here, but you can set a property on any generator called "activationCondition" to limit
-    use. 
+    use in the most generic way.
     -->
     
     <!-- SAML 2 NameID Generation -->
     <util:list id="shibboleth.SAML2NameIDGenerators">
     
-        <bean id="transient" class="net.shibboleth.idp.saml.nameid.impl.TransientSAML2NameIDGenerator"
-            p:transientIdGenerator-ref="${idp.transientId.generator}" />
-            
-        <bean id="persistent" class="net.shibboleth.idp.saml.nameid.impl.PersistentSAML2NameIDGenerator"
-            p:attributeSourceIds="#{ {'${idp.persistentId.sourceAttribute}'} }"
-            p:persistentIdGenerator-ref="${idp.persistentId.generator}" />
+        <ref bean="shibboleth.SAML2TransientGenerator" />
+        <ref bean="shibboleth.SAML2PersistentGenerator" />
 
-        <bean id="email" class="net.shibboleth.idp.saml.nameid.impl.AttributeSourcedSAML2NameIDGenerator"
+        <bean parent="shibboleth.SAML2AttributeSourcedGenerator"
             p:format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
             p:attributeSourceIds="#{ {'email'} }" />
                 
@@ -46,55 +42,13 @@
 
     <!-- SAML 1 NameIdentifier Generation -->
     <util:list id="shibboleth.SAML1NameIdentifierGenerators">
-    

[... 101 lines stripped ...]