[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/r...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 14 21:58:01 2015
New Revision: 7827

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7827&view=rev
Log:
IDP-829 - Finish new config for decoder side, and adjust when we verify the primary key

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/StoredIdConnectorParser.java
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml
    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/StoredPersistentIdDecoder.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/StoredIdConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/StoredIdConnectorParser.java?rev=7827&r1=7826&r2=7827&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/StoredIdConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/impl/StoredIdConnectorParser.java	Wed Oct 14 21:58:01 2015
@@ -34,7 +34,7 @@
 import org.w3c.dom.Element;
 
 /**
- * Parser for Direct Principal Connector<br/>
+ * Parser for StoredId Principal Connector<br/>
  * <PrincipalConnector xsi:type="pc:StoredId">.
  */
 public class StoredIdConnectorParser extends AbstractPrincipalConnectorParser {
@@ -73,7 +73,7 @@
          * @param connector the data connector of interest
          */
         public EmbeddedStoredPersistentIdDecoder(StoredIDDataConnector connector) {
-            setPersistentIdStoreEx(connector.getStoredIDStore());
+            setPersistentIdStore(connector.getStoredIDStore());
         }
     }
 

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml?rev=7827&r1=7826&r2=7827&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml	Wed Oct 14 21:58:01 2015
@@ -39,7 +39,8 @@
             class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization" scope="prototype">
         <property name="decoder">
             <bean class="net.shibboleth.idp.saml.nameid.impl.StoredPersistentIdDecoder"
-                p:persistentIdStore="#{getObject('%{idp.persistentId.store:null}'.trim())}" />
+                p:persistentIdStore="#{getObject('%{idp.persistentId.store:undefined}'.trim())}"
+                p:dataSource="#{getObject('%{idp.persistentId.dataSource:undefined}'.trim())}" />
         </property>
     </bean>
 

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java?rev=7827&r1=7826&r2=7827&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/StoredIDDataConnector.java	Wed Oct 14 21:58:01 2015
@@ -115,6 +115,7 @@
     @Override protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
 
+        idStore.setVerifyDatabase(false);
         idStore.initialize();
 
         storedIdStrategy.setIDStore(idStore);

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoder.java?rev=7827&r1=7826&r2=7827&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoder.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/StoredPersistentIdDecoder.java	Wed Oct 14 21:58:01 2015
@@ -28,6 +28,7 @@
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
+import net.shibboleth.idp.saml.nameid.IPersistentIdStore;
 import net.shibboleth.idp.saml.nameid.NameDecoderException;
 import net.shibboleth.idp.saml.nameid.NameIDDecoder;

[... 128 lines stripped ...]