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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Apr 14 17:27:48 2014
New Revision: 5726

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5726&view=rev
Log:
Implement prelim. SAML status code mapping.

Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.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=5726&r1=5725&r2=5726&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Mon Apr 14 17:27:48 2014
@@ -16,4 +16,46 @@
     <import resource="subject-config.xml" />
 	<import resource="attribute-params-config.xml" />
 
+    <!-- Mappings of error events during requests to SAML status codes. -->
+
+    <util:map id="shibboleth.SAML1StatusMappings">
+        <entry key="InvalidMessageVersion" value-ref="Shibboleth.SAML1Status.VersionMismatch" />
+        
+        <entry key="UnableToDecode" value-ref="Shibboleth.SAML1Status.Requester" />
+        
+        <entry key="UnableToEncode" value-ref="Shibboleth.SAML1Status.Requester" />
+
+        <entry key="RequestUnsupported" value-ref="Shibboleth.SAML1Status.Requester" />
+        
+        <entry key="NoPotentialFlow" value-ref="Shibboleth.SAML1Status.Requester" />
+        <entry key="NoCredentials" value-ref="Shibboleth.SAML1Status.Requester" />
+        <entry key="InvalidCredentials" value-ref="Shibboleth.SAML1Status.Requester" />
+        <entry key="AccountError" value-ref="Shibboleth.SAML1Status.Requester" />
+        <entry key="AuthenticationException" value-ref="Shibboleth.SAML1Status.Requester" />
+        
+        <entry key="InvalidSubject" value-ref="Shibboleth.SAML1Status.Requester" />
+        <entry key="SubjectCanonicalizationError" value-ref="Shibboleth.SAML1Status.Requester" />
+    </util:map>
+    
+    <util:map id="shibboleth.SAML2StatusMappings">
+        <entry key="InvalidMessageVersion" value-ref="Shibboleth.SAML2Status.VersionMismatch" />
+        
+        <entry key="UnableToDecode" value-ref="Shibboleth.SAML2Status.RequestUnsupported" />
+        
+        <entry key="UnableToEncode" value-ref="Shibboleth.SAML2Status.UnsupportedBinding" />
+        
+        <entry key="RequestUnsupported" value-ref="Shibboleth.SAML2Status.NoAuthnContext" />
+        
+        <entry key="NoPotentialFlow" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
+        <entry key="NoCredentials" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
+        <entry key="InvalidCredentials" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
+        <entry key="AccountError" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
+        <entry key="AuthenticationException" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
+        
+        <entry key="InvalidSubject" value-ref="Shibboleth.SAML2Status.UnknownPrincipal" />
+        <entry key="SubjectCanonicalizationError" value-ref="Shibboleth.SAML2Status.UnknownPrincipal" />
+        
+        <entry key="InvalidNameIDPolicy" value-ref="Shibboleth.SAML2Status.InvalidNameIDPolicy" />
+    </util:map>
+
 </beans>

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=5726&r1=5725&r2=5726&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 14 17:27:48 2014
@@ -27,6 +27,32 @@
             </KeyInfo>
         </KeyDescriptor>
         
+        <KeyDescriptor>
+            <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+                <X509Data>
+                    <X509Certificate>
+MIIDDzCCAfegAwIBAgIJAN5ThWwNrvJxMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHNub3dkb2ctcHJvLmVsYW4ub3N1LmVkdTAeFw0xMzExMDYxNjUyMzBaFw0y
+MzExMDQxNjUyMzBaMCMxITAfBgNVBAMTGHNub3dkb2ctcHJvLmVsYW4ub3N1LmVk
+dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAODCRHObLNAJ6xaxDmeA
+sJl2Mw3pTGCrWXe2H77n8TjZz68I9fgYLeamCONHFx1qaQUZXim/TANhzOSMCIs+
+/Ma/XVaB8H1lB2EJlob0gDa3wqpnd+ltUI+pirG0t1CDrP8RhBWaZWTRB8Oj9uMV
+lBarznvvSuJIOYnEt5OjLpHe3fbpstiI6dlkViB/jFMOT1G+MSfkPRXQopJ5PfnM
+LhrQa1iJ2hEwE4xviQUHbtqtIcw0xMOlse/GvdV6WMixxQ5Yr9tksb/hzOFG29Nk
+E+ZNxEoxeFQNl73pU3DuA8ogjBpGYDX9jGt0zvyDRlUyXferSIxZy4lauYaxw10o
+WyUCAwEAAaNGMEQwIwYDVR0RBBwwGoIYc25vd2RvZy1wcm8uZWxhbi5vc3UuZWR1
+MB0GA1UdDgQWBBS1KTq0OfsmdgBoqLkINa0wTnM9FzANBgkqhkiG9w0BAQUFAAOC

[... 135 lines stripped ...]