[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attrib...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 14 12:20:21 2015
New Revision: 7823

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7823&view=rev
Log:
IDP-829 - "Final" design/config changes and test fixes to support migration to new plugin

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/IPersistentIdStore.java   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql
    trunk/idp-conf/src/main/resources/conf/saml-nameid.properties
    trunk/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/PersistentIdStore.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/JDBCPersistentIdStoreEx.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/PersistentIdStoreEx.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdGenerationStrategy.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/PersistentSAML2NameIDGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoderTest.java

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql?rev=7823&r1=7822&r2=7823&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/pc/StoredIdStore.sql	Wed Oct 14 12:20:21 2015
@@ -1,9 +1,11 @@
 CREATE TABLE shibpid (
-	localEntity VARCHAR(50) NOT NULL, 
-	peerEntity VARCHAR(50) NOT NULL,
+	localEntity VARCHAR(255) NOT NULL, 
+	peerEntity VARCHAR(255) NOT NULL,
+    persistentId VARCHAR(50) NOT NULL, 
 	principalName VARCHAR(50) NOT NULL, 
 	localId VARCHAR(50) NOT NULL, 
-	persistentId VARCHAR(50) NOT NULL, 
-	peerProvidedId VARCHAR(50), 
+	peerProvidedId VARCHAR(50) NULL, 
 	creationDate TIMESTAMP NOT NULL, 
-	deactivationDate TIMESTAMP);
+	deactivationDate TIMESTAMP NULL,
+	PRIMARY KEY (localEntity, peerEntity, persistentId)
+	);

Modified: trunk/idp-conf/src/main/resources/conf/saml-nameid.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/saml-nameid.properties?rev=7823&r1=7822&r2=7823&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/saml-nameid.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/saml-nameid.properties	Wed Oct 14 12:20:21 2015
@@ -4,27 +4,32 @@
 # identifiers. See saml-nameid.xml and c14n/subject-c14n.xml for advanced
 # settings
 
-# Set to shibboleth.StoredTransientIdGenerator for server-side storage
-#idp.transientId.generator = shibboleth.CryptoTransientIdGenerator
-
-# Set to shibboleth.StoredPersistentIdGenerator for db-backed storage
-# and uncomment/name the PersistentIdStore bean 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 PersistentIDs set the source attribute and salt.
-#idp.persistentId.sourceAttribute = changethistosomethingreal
-#idp.persistentId.useUnfilteredAttributes = true
-# Do *NOT* share the salt with other people, it's like divulging your private key.
-#idp.persistentId.salt = changethistosomethingrandom
-#idp.persistentId.algorithm = SHA
-
 # 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
+# Default NameID Formats to use when nothing else is called for.
+# Don't change these just to change the Format used for a single SP!
 #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.StoredTransientIdGenerator for server-side transient ID storage
+#idp.transientId.generator = shibboleth.CryptoTransientIdGenerator
+
+# Persistent IDs can be computed on the fly with a hash, or managed in a database
+
+# For computed IDs, set a source attribute and a secret salt:
+#idp.persistentId.sourceAttribute = changethistosomethingreal

[... 284 lines stripped ...]