[java-identity-provider COMMIT] /trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGene...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec  3 20:53:04 2014
New Revision: 7041

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7041&view=rev
Log:
IDP-528 -  Generated metadata has SLO and SSO endpoint collections swapped

Modified:
    trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java

Modified: trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java?rev=7041&r1=7040&r2=7041&view=diff
==============================================================================
--- trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java (original)
+++ trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java Wed Dec  3 20:53:04 2014
@@ -74,7 +74,7 @@
         /** IDPSSODescriptor. Artfact */
         SAML1Artifact, SAML2Artifact,
         /** IDPSSODescriptor. SLO */
-        RedirectSLO, POSTSLO, SOAPSLO,
+        RedirectSLO, POSTSLO, POSTSimpleSignSLO, SOAPSLO,
         /** IDPSSODescriptor. SSO */
         ShibbolethSSO, POSTSSO, POSTSimpleSignSSO, RedirectSSO,
 
@@ -96,16 +96,16 @@
             Endpoints.SAML2Artifact));
 
     /**
+     * the SSO endpoints.
+     */
+    static final ImmutableSet<Endpoints> SSO_ENDPOINTS = ImmutableSet.copyOf(EnumSet.of(Endpoints.ShibbolethSSO,
+            Endpoints.POSTSSO, Endpoints.POSTSimpleSignSSO, Endpoints.RedirectSSO));
+
+    /**
      * the SLO endpoints.
      */
-    static final ImmutableSet<Endpoints> SLO_ENDPOINTS = ImmutableSet.copyOf(EnumSet.of(Endpoints.ShibbolethSSO,
-            Endpoints.POSTSSO, Endpoints.POSTSimpleSignSSO, Endpoints.RedirectSSO));
-
-    /**
-     * the SSO endpoints.
-     */
-    static final ImmutableSet<Endpoints> SSO_ENDPOINTS = ImmutableSet.copyOf(EnumSet.of(Endpoints.RedirectSLO,
-            Endpoints.POSTSLO, Endpoints.SOAPSLO));
+    static final ImmutableSet<Endpoints> SLO_ENDPOINTS = ImmutableSet.copyOf(EnumSet.of(Endpoints.RedirectSLO,
+            Endpoints.POSTSLO, Endpoints.POSTSimpleSignSLO, Endpoints.SOAPSLO));
 
     /**
      * AttributeAuthority endpoints.
@@ -715,6 +715,18 @@
                 writer.newLine();
                 break;
 
+            case POSTSimpleSignSLO:
+                writer.write("        ");
+                writer.write("<");
+                writer.write(SingleLogoutService.DEFAULT_ELEMENT_LOCAL_NAME);
+                writer.write(" Binding=\"");
+                writer.write(SAMLConstants.SAML2_POST_SIMPLE_SIGN_BINDING_URI);
+                writer.write("\" Location=\"https://");
+                writer.write(getDNSName());
+                writer.write("/idp/profile/SAML2/POST-SimpleSign/SLO\"/>");
+                writer.newLine();
+                break;
+
             case SOAPSLO:
                 writer.write("        ");
                 writer.write("<");
@@ -758,7 +770,7 @@
                 writer.write(SAMLConstants.SAML2_POST_SIMPLE_SIGN_BINDING_URI);
                 writer.write("\" Location=\"https://");
                 writer.write(getDNSName());
-                writer.write("/idp/profile/SAML2/POST/SSO-SimpleSign\"/>");
+                writer.write("/idp/profile/SAML2/POST-SimpleSign/SSO\"/>");
                 writer.newLine();
                 break;