Update version resources

[shibboleth/cpp-sp.git] / configs / protocols.xml

diff --git a/configs/protocols.xml b/configs/protocols.xml
index 22d69c0..648bcbc 100644 (file)
--- a/configs/protocols.xml
+++ b/configs/protocols.xml
@@ -1,42 +1,57 @@
-<Protocols xmlns="urn:mace:shibboleth:2.0:native:sp:protocols">\r
-  \r
-  <Protocol id="SAML2">\r
-    <Service id="SSO" in="SAML2" out="SAML2">\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" path="/SAML2/Redirect" response="false"/>\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" path="/SAML2/POST" />\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" path="/SAML2/POST-SimpleSign" />\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" path="/SAML2/Artifact" artifact="true"/>\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" path="/SAML2/ECP" request="false"/>\r
-    </Service>\r
-    <Service id="Logout" in="SAML2" out="SAML2">\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" path="/SLO/SOAP" />\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" path="/SLO/Redirect" />\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" path="/SLO/POST" />\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" path="/SLO/Artifact" artifact="true"/>\r
-    </Service>\r
-    <Service id="NameIDMgmt" in="SAML2">\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" path="/NIM/SOAP" />\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" path="/NIM/Redirect" />\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" path="/NIM/POST" />\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" path="/NIM/Artifact" artifact="true"/>\r
-    </Service>\r
-    <Service id="ArtifactResolution" in="SAML2">\r
-      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" path="/Artifact/SOAP" />\r
-    </Service>\r
-  </Protocol>\r
-\r
-  <Protocol id="SAML1">\r
-    <Service id="SSO" in="SAML1" out="Shib1">\r
-      <Binding id="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" path="/SAML/POST" />\r
-      <Binding id="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" path="/SAML/Artifact" artifact="true"/>\r
-    </Service>\r
-  </Protocol>\r
-\r
-  <Protocol id="ADFS">\r
-    <Service id="SSO" in="ADFS" out="ADFS">\r
-      <Binding id="http://schemas.xmlsoap.org/ws/2003/07/secext" path="/ADFS" />\r
-    </Service>\r
-    <Service id="Logout" out="ADFS"/>\r
-  </Protocol>\r
-\r
-</Protocols>\r
+<Protocols xmlns="urn:mace:shibboleth:2.0:native:sp:protocols">
+  
+  <!-- SAML 2.0 -->
+  <Protocol id="SAML2">
+    <Service id="SSO">
+      <Initiator id="SAML2" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" path="/SAML2/POST" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" path="/SAML2/POST-SimpleSign" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" path="/SAML2/Artifact" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" path="/SAML2/ECP" />
+    </Service>
+    <Service id="Logout">
+      <Initiator id="SAML2" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" path="/SLO/SOAP" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" path="/SLO/Redirect" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" path="/SLO/POST" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" path="/SLO/Artifact" />
+    </Service>
+    <Service id="NameIDMgmt">
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" path="/NIM/SOAP" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" path="/NIM/Redirect" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" path="/NIM/POST" />
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" path="/NIM/Artifact" />
+    </Service>
+    <Service id="ArtifactResolution">
+      <Binding id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" path="/Artifact/SOAP" />
+    </Service>
+  </Protocol>
+
+  <!-- SAML 1.1 and SAML 1.0 -->
+  <Protocol id="SAML1">
+    <Service id="SSO">
+      <Initiator id="Shib1" />
+      <Binding id="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" path="/SAML/POST" />
+      <Binding id="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" path="/SAML/Artifact" />
+    </Service>
+  </Protocol>
+
+  <!-- ADFSv1 / WS-Federation -->
+  <Protocol id="ADFS">
+    <Service id="SSO">
+      <Initiator id="ADFS" />
+      <Binding id="http://schemas.xmlsoap.org/ws/2003/07/secext" path="/ADFS" />
+    </Service>
+    <Service id="Logout">
+      <Initiator id="ADFS" />
+    </Service>
+  </Protocol>
+
+  <!-- Local Logout -->
+  <Protocol id="Local">
+    <Service id="Logout">
+      <Initiator id="Local" />
+    </Service>
+  </Protocol>
+  
+</Protocols>