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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Apr 19 23:20:08 2014
New Revision: 5750

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5750&view=rev
Log:
Convert inbound/outbound handler chains into subflows.

Added:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-security-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-security-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml/security-abstract-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml/security-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml/soap-security-flow.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/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/security-policy.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.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=5750&r1=5749&r2=5750&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Sat Apr 19 23:20:08 2014
@@ -25,6 +25,10 @@
         
         <entry key="UnableToEncode" value-ref="Shibboleth.SAML1Status.Requester" />
 
+        <entry key="MessageReplay" value-ref="Shibboleth.SAML1Status.Requester" />
+        <entry key="MessageExpired" value-ref="Shibboleth.SAML1Status.Requester" />
+        <entry key="MessageAuthenticationError" value-ref="Shibboleth.SAML1Status.Requester" />
+
         <entry key="RequestUnsupported" value-ref="Shibboleth.SAML1Status.Requester" />
         
         <entry key="NoPassive" value-ref="Shibboleth.SAML1Status.Requester" />
@@ -44,6 +48,10 @@
         <entry key="UnableToDecode" value-ref="Shibboleth.SAML2Status.RequestUnsupported" />
         
         <entry key="UnableToEncode" value-ref="Shibboleth.SAML2Status.UnsupportedBinding" />
+
+        <entry key="MessageReplay" value-ref="Shibboleth.SAML2Status.RequestDenied" />
+        <entry key="MessageExpired" value-ref="Shibboleth.SAML2Status.RequestDenied" />
+        <entry key="MessageAuthenticationError" value-ref="Shibboleth.SAML2Status.RequestDenied" />
         
         <entry key="RequestUnsupported" value-ref="Shibboleth.SAML2Status.NoAuthnContext" />
         
@@ -61,4 +69,37 @@
         <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>
+    
+    <!-- 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" />
+

[... 348 lines stripped ...]