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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb 20 13:48:05 2014
New Revision: 5422

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5422&view=rev
Log:
IDP-359  Crypto Transient NameID C14N flow and test

Added:
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-flow.xml   (with props)
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/conf/webflow-config.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=5422&r1=5421&r2=5422&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Thu Feb 20 13:48:05 2014
@@ -12,8 +12,8 @@
 # Use the XML Parser SecurityManager appropriate for the chosen parser
 # Sun/Oracle, use com.sun.org.apache.xerces.internal.util.SecurityManager
 # Xerces, use org.apache.xerces.util.SecurityManager
-# idp.xml.securityManager = org.apache.xerces.util.SecurityManager
-idp.xml.securityManager = com.sun.org.apache.xerces.internal.util.SecurityManager
+idp.xml.securityManager = org.apache.xerces.util.SecurityManager
+# idp.xml.securityManager = com.sun.org.apache.xerces.internal.util.SecurityManager
 
 # Settings for internal AES encryption key
 idp.sealer.storeType = JCEKS
@@ -75,6 +75,7 @@
 idp.authn.ldap.userFilter = (uid={user})
 
 # Regular expression expressing subject c14n flows to enable
+#idp.c14n.flows = SAML2.*|Simple|Legacy.*
 idp.c14n.flows = Simple
 
 # Reload "failfast" (stop the IdP if a configuration is bad)

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=5422&r1=5421&r2=5422&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/subject-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/subject-config.xml Thu Feb 20 13:48:05 2014
@@ -47,6 +47,20 @@
                 </util:list>
             </property>
         </bean>
+        
+        <bean c:id="SubjectC14NFlow/SAML2/CryptoTransient" class="net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor"> 
+            <property name="activationCondition">
+                <bean
+                    class="net.shibboleth.idp.saml.impl.nameid.NameIDCanonicalization.ActivationCondition" />
+            </property>
+            <property name="formats">
+                <util:list>
+                    <value>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</value>
+                    <value>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</value>
+                </util:list>
+            </property>
+        </bean>
+        
 
         <bean c:id="SubjectC14NFlow/LegacyPrincipalConnector" class="net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor">
             <property name="activationCondition">

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=5422&r1=5421&r2=5422&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Thu Feb 20 13:48:05 2014
@@ -48,6 +48,7 @@
         <!-- C14N methods. -->
         <webflow:flow-location id="SubjectC14NFlow/Simple" path="/c14n/simple-subject-c14n-flow.xml" />
         <webflow:flow-location id="SubjectC14NFlow/SAML2/Transient" path="/c14n/saml2-transient-subject-c14n-flow.xml"  />
+        <webflow:flow-location id="SubjectC14NFlow/SAML2/CryptoTransient" path="/c14n/saml2-crypto-transient-subject-c14n-flow.xml"  />
         <webflow:flow-location id="SubjectC14NFlow/LegacyPrincipalConnector" path="/c14n/legacy-pc-subject-c14n-flow.xml"  />
                 
     </webflow:flow-registry>