[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/global-user.xml conf/idp.properties conf/...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Apr 22 03:57:23 2014
New Revision: 5758

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5758&view=rev
Log:
IDP-391 Wire the MetadataResolver-from-relying-party and the RPConfigResolver-from-relying-party into the configuration.  Leave profiles alone for now but put in an alias as a bandaid

Added:
    trunk/idp-conf/src/main/resources/conf/relying-party.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5758&r1=5757&r2=5758&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Tue Apr 22 03:57:23 2014
@@ -77,37 +77,22 @@
         <entry key="InvalidNameIDPolicy" value-ref="Shibboleth.SAML2Status.InvalidNameIDPolicy" />
     </util:map>
 
-    <!-- TODO: remove once we get real metadata config in place -->
-    <bean id="ExampleMetadata" class="org.springframework.core.io.FileSystemResource" c:path="${idp.home}/metadata/example-metadata.xml" />
-    <bean id="ExampleMetadataResolver" class="org.opensaml.saml.metadata.resolver.impl.FilesystemMetadataResolver"
-            p:parserPool-ref="shibboleth.ParserPool">
-        <constructor-arg>
-            <util:property-path path="ExampleMetadata.File" />
-        </constructor-arg>
-    </bean>
+    <!--  The (currently single) file which provides relying party configuration -->
+
+    <util:list id="shibboleth.MetadataResolverResources">
+        <value>file://${idp.home}/conf/relying-party.xml</value>
+        <value>file://${idp.home}/conf/property-placeholder.xml</value>
+    </util:list>
+
+    <!--  The (currently single) file which provides metdata configuration -->
+
+    <util:list id="shibboleth.RelyingPartyResolverResources">
+        <value>file://${idp.home}/conf/relying-party.xml</value>
+        <value>file://${idp.home}/conf/property-placeholder.xml</value>
+    </util:list>
+
+    <!-- TODO: replace ExampleMetadataResolver in configs with  shibboleth.MetadataResolver -->
+    <alias name="shibboleth.MetadataResolver" alias="ExampleMetadataResolver"/>
     
-    <!-- TODO: all this is probably wrong, but need it to get something working -->
-    
-    <bean id="shibboleth.MetadataCredentialResolver" class="org.opensaml.saml.security.impl.MetadataCredentialResolver">
-        <constructor-arg>
-            <bean class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
-                c:mdResolver-ref="ExampleMetadataResolver" />
-        </constructor-arg>
-    </bean>
-
-    <bean id="shibboleth.GlobalSecurityConfiguration" class="org.opensaml.xmlsec.SecurityConfigurationSupport"
-        factory-method="getGlobalXMLSecurityConfiguration" />
-    
-    <bean id="shibboleth.KeyInfoCredentialResolver" factory-bean="shibboleth.GlobalSecurityConfiguration"
-        factory-method="getDefaultKeyInfoCredentialResolver" />
-
-    <bean id="shibboleth.SignatureTrustEngine" class="org.opensaml.xmlsec.signature.support.impl.ExplicitKeySignatureTrustEngine">
-        <constructor-arg ref="shibboleth.MetadataCredentialResolver" />
-        <constructor-arg ref="shibboleth.KeyInfoCredentialResolver" />
-    </bean>
-
-    <bean id="shibboleth.X509TrustEngine" class="org.opensaml.security.trust.impl.ExplicitX509CertificateTrustEngine">
-        <constructor-arg ref="shibboleth.MetadataCredentialResolver" />
-    </bean>
 
 </beans>

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=5758&r1=5757&r2=5758&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Apr 22 03:57:23 2014
@@ -12,7 +12,7 @@
 # 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 = org.apache.xerces.util.SecurityManager
 idp.xml.securityManager = com.sun.org.apache.xerces.internal.util.SecurityManager
 
 # Settings for internal AES encryption key
@@ -31,6 +31,10 @@
 
 # Set to false to disable the IdP session layer
 idp.session.enabled = true
+
+# Set the entityId of the IdP
+idp.entity.id=https://idp.example.org
+
 
 # Set to "shibboleth.StorageService" for server-side storage
 idp.session.StorageService = shibboleth.ClientStorageService
@@ -97,6 +101,14 @@
 idp.service.attribute.filter.failFast=false

[... 80 lines stripped ...]