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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jun 19 21:14:26 2014
New Revision: 6125

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6125&view=rev
Log:
More property cleanup/enhancement

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
    trunk/idp-conf/src/main/resources/system/conf/session-manager.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=6125&r1=6124&r2=6125&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Thu Jun 19 21:14:26 2014
@@ -46,19 +46,21 @@
 #idp.errors.signed = true
 
 # Set to "shibboleth.StorageService" for server-side storage
-idp.session.StorageService = shibboleth.ClientStorageService
+#idp.session.StorageService = shibboleth.ClientStorageService
 
 # Set to shibboleth.StoredTransientIdGenerator for server-side storage
-idp.transientId.generator = shibboleth.CryptoTransientIdGenerator
+#idp.transientId.generator = shibboleth.CryptoTransientIdGenerator
 
 # Set to shibboleth.StoredPersistentIdGenerator for server-side storage
-# and uncomment/name the DataSource to use. Otherwise set the source
-# attribute and salt below.
-idp.persistentId.generator = shibboleth.ComputedPersistentIdGenerator
+# and uncomment/name the DataSource to use
+#idp.persistentId.generator = shibboleth.ComputedPersistentIdGenerator
 #idp.persistentId.store = PersistentIdStore
+# Set this to null to skip hash-based generation of first stored ID
+#idp.persistentId.computed = shibboleth.ComputedPersistentIdGenerator
+# Otherwise for computed IDs set the source attribute and salt.
 idp.persistentId.sourceAttribute = changethistosomethingreal
 idp.persistentId.salt = changethistosomethingrandom
-idp.persistentId.algorithm = SHA
+#idp.persistentId.algorithm = SHA
 
 # Comment out to disable legacy NameID generation via Attribute Resolver
 idp.nameid.saml2.legacyGenerator = shibboleth.LegacySAML2NameIDGenerator

Modified: trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml?rev=6125&r1=6124&r2=6125&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml Thu Jun 19 21:14:26 2014
@@ -28,16 +28,16 @@
 
     <bean id="shibboleth.SAML2TransientGenerator"
         class="net.shibboleth.idp.saml.nameid.impl.TransientSAML2NameIDGenerator"
-        p:transientIdGenerator-ref="${idp.transientId.generator}" />
+        p:transientIdGenerator-ref="${idp.transientId.generator:shibboleth.CryptoTransientIdGenerator}" />
 
     <bean id="shibboleth.SAML2PersistentGenerator"
         class="net.shibboleth.idp.saml.nameid.impl.PersistentSAML2NameIDGenerator"
         p:attributeSourceIds="#{ {'${idp.persistentId.sourceAttribute}'} }"
-        p:persistentIdGenerator-ref="${idp.persistentId.generator}" />
+        p:persistentIdGenerator-ref="${idp.persistentId.generator:shibboleth.ComputedPersistentIdGenerator}" />
 
     <bean id="shibboleth.SAML1TransientGenerator"
         class="net.shibboleth.idp.saml.nameid.impl.TransientSAML1NameIdentifierGenerator"
-        p:transientIdGenerator-ref="${idp.transientId.generator}" />
+        p:transientIdGenerator-ref="${idp.transientId.generator:shibboleth.CryptoTransientIdGenerator}" />
 
     <!--
     These are strategy implementations for generating transient and persistent identifiers.
@@ -60,11 +60,11 @@
 
     <bean id="shibboleth.ComputedPersistentIdGenerator"
         class="net.shibboleth.idp.saml.nameid.impl.ComputedPersistentIdGenerationStrategy"
-        p:salt="${idp.persistentId.salt}" p:algorithm="${idp.persistentId.algorithm}" />
+        p:salt="${idp.persistentId.salt}" p:algorithm="${idp.persistentId.algorithm:SHA}" />
 
     <bean id="shibboleth.StoredPersistentIdGenerator" lazy-init="true"
         class="net.shibboleth.idp.saml.nameid.impl.StoredPersistentIdGenerationStrategy"
-        p:computedIdStrategy-ref="shibboleth.ComputedPersistentIdGenerator"
+        p:computedIdStrategy="#{getObject('${idp.persistentId.computed:shibboleth.ComputedPersistentIdGenerator}')}"
         p:IDStore="#{getObject('${idp.persistentId.store:null}')}" />
     
     <!-- These two beans handle legacy support for NameID generation in the Attribute Resolver. -->

Modified: trunk/idp-conf/src/main/resources/system/conf/session-manager.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/session-manager.xml?rev=6125&r1=6124&r2=6125&view=diff
==============================================================================

[... 12 lines stripped ...]