[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/metadata/example-metadata.xml idp-conf/src/mai...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Apr  7 18:30:17 2014
New Revision: 5705

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5705&view=rev
Log:
Factor out inbound handler chains into dynamically executed policy rulesets, and convert testbed trust engines to be metadata-based.

Added:
    trunk/idp-conf/src/main/resources/system/conf/security-policy.xml   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/InboundMessageHandlerLookupFunction.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/OutboundMessageHandlerLookupFunction.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.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/sso-abstract-beans.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/sso-abstract-beans.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java

Modified: trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/metadata/example-metadata.xml?rev=5705&r1=5704&r2=5705&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/metadata/example-metadata.xml (original)
+++ trunk/idp-conf/src/main/resources/metadata/example-metadata.xml Mon Apr  7 18:30:17 2014
@@ -1,5 +1,32 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.example.org">
     <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="false">
+        
+        <KeyDescriptor>
+            <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+                <X509Data>
+                    <X509Certificate>
+MIIDCTCCAfGgAwIBAgIJAN5X7xMzDu64MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDnNwLmV4YW1wbGUub3JnMB4XDTEzMDUyNDIxMzU0NloXDTIzMDUyMjIxMzU0
+NlowGTEXMBUGA1UEAxMOc3AuZXhhbXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDAVA9a1ip1mvd5rQJe9xhL6TXvIHxPm+FLxabvQJA48sJh
+XsXmLAsyGzSm/HviqdkdR3VxyFhzLoj03TqqPP8/IoTFA2Lp+q9PnaeEHKaYeJGH
+g4RozQ0UKhiuyppWptO2Syls302haIaWWXz+p3iOgjuZKg/ESs1udGEJvAC/OUVu
+Eo08b6BuySxO/KsX9kWYoCF6vm+tN1kpOrMTceCqcJlRDyFzxUo4JTaku/81k88v
+iF+5/b0p7McB3IGqCFHR6MhZol880Dgxeze3o6/hmvXwGbJgOeWc46jgKareWwYn
+CSQ7/08TDvX0RhCca39IJXqSP/Wv4QOkALTdobQhAgMBAAGjVDBSMDEGA1UdEQQq
+MCiCDnNwLmV4YW1wbGUub3JnhhZodHRwczovL3NwLmV4YW1wbGUub3JnMB0GA1Ud
+DgQWBBQ1FR+wdqXqtICqb7G0fms7ELdt1zANBgkqhkiG9w0BAQUFAAOCAQEAoW/5
+uKnQMuQJfEx11uVCItAvRNmjWSmGFXpQ3rown3XbRkdX78PztcIdgwwtNZoTlMmA
+122Kdb8ViXw2tsZaB1iOaBiavMtLgdxbg9j6B6UmQrzERQm+zq5rBAzSTh6VRyDP
+kCMYnlX4+PyjWXGVADI65cRBbFBnED6By0NhJesDfaH8VpY19LN9AYpXVJRv4/Dc
+zlnQds4vPKzOaJGvt01Ni9jqZtcUDzKt9UdmDATbukoStvCKTwcr4gAPvfCfNZgo
+CUaW4GEmfyDkCahd5qNlWw0++Z2kNoSRyPA1PTJIkZhagv+VbO85ua2SDJWVgF4I
+h+XNZ5oAql/cjrwDWw==
+                    </X509Certificate>
+                </X509Data>
+            </KeyInfo>
+        </KeyDescriptor>
+        
         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost/sp/SAML2/POST/ACS" index="1"/>
         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:8443/sp/SAML2/POST/ACS" index="2"/>
         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://localhost/sp/SAML2/POST/ACS" index="3"/>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5705&r1=5704&r2=5705&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Mon Apr  7 18:30:17 2014
@@ -32,6 +32,7 @@
 
     <import resource="session-manager.xml" />
     <import resource="saml-binding-config.xml" />
+    <import resource="security-policy.xml" />
     <import resource="subject-config-system.xml" />
     <import resource="utilities.xml" />
     

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=5705&r1=5704&r2=5705&view=diff
==============================================================================

[... 462 lines stripped ...]