From b7edf216ce82ec30422464cecb3f8869e8ec5fdd Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 31 Jul 2013 09:18:38 +0200
Subject: resolves SWAMIDOPS-6964

---
 swamid-2.0/wiki.edugain.org-shibboleth.xml | 91 ++++++++----------------------
 1 file changed, 24 insertions(+), 67 deletions(-)

diff --git a/swamid-2.0/wiki.edugain.org-shibboleth.xml b/swamid-2.0/wiki.edugain.org-shibboleth.xml
index 57fd276a..6b6015f9 100644
--- a/swamid-2.0/wiki.edugain.org-shibboleth.xml
+++ b/swamid-2.0/wiki.edugain.org-shibboleth.xml
@@ -1,22 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EntityDescriptor
-  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-  xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-  xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"
-  entityID="https://wiki.edugain.org/shibboleth">
-     <Extensions>
-      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-         <saml:Attribute 
-            Name="http://macedir.org/entity-category" 
-            NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-            xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-            <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd" entityID="https://wiki.edugain.org/shibboleth">
+  <Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
-      </mdattr:EntityAttributes>
-   </Extensions>
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.edugain.org/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.edugain.org/Shibboleth.sso/Login" index="1"/>
@@ -55,56 +46,22 @@ nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService index="1"  
-      Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-      Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/POST"/>
-    <AssertionConsumerService index="2"  
-      Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
-      Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact"/>
-    <AssertionConsumerService index="3"  
-      Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS"
-      Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP"/>
-    <AssertionConsumerService index="4"  isDefault="true"  
-      Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
-      Location="https://wiki.edugain.org/Shibboleth.sso/SAML/POST"/>
-    <AssertionConsumerService index="5"  
-      Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
-      Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact"/>
+    <AssertionConsumerService index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/POST"/>
+    <AssertionConsumerService index="2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact"/>
+    <AssertionConsumerService index="3" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP"/>
+    <AssertionConsumerService index="4" isDefault="true" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/POST"/>
+    <AssertionConsumerService index="5" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact"/>
     <AttributeConsumingService index="1">
-        <ServiceName xml:lang="en">eduGAIN Wiki</ServiceName>
-        <ServiceDescription xml:lang="en">Provides recommendations and instructions on how to eduGAIN-enable a web service.</ServiceDescription>
-      <RequestedAttribute 
-        FriendlyName="email" 
-        isRequired="true"
-        Name="urn:oid:0.9.2342.19200300.100.1.3" 
-        NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
-      <RequestedAttribute 
-        FriendlyName="displayName" 
-        isRequired="true"
-        Name="urn:oid:2.16.840.1.113730.3.1.241" 
-        NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
-      <RequestedAttribute 
-        FriendlyName="surname" 
-        isRequired="true"
-        Name="urn:oid:2.5.4.4" 
-        NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
-      <RequestedAttribute 
-        FriendlyName="givenName" 
-        isRequired="true"
-        Name="urn:oid:2.5.4.42" 
-        NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
-      <RequestedAttribute 
-        FriendlyName="eduPersonPrincipalName" 
-        isRequired="true"
-        Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" 
-        NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
-      <RequestedAttribute 
-        FriendlyName="eduPersonTargetedID" 
-        isRequired="true"
-        Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" 
-        NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" />
+      <ServiceName xml:lang="en">eduGAIN Wiki</ServiceName>
+      <ServiceDescription xml:lang="en">Provides recommendations and instructions on how to eduGAIN-enable a web service.</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" isRequired="true" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="surname" isRequired="true" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="givenName" isRequired="true" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </AttributeConsumingService>
-    </SPSSODescriptor>
+  </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">geant.net</OrganizationName>
     <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
@@ -120,4 +77,4 @@ nzhoxAesljRTtndfuhYcEnXorpwi2N+4SCaYnF1inyMnJz7xau5lKyxPhA==
     <SurName>Operation</SurName>
     <EmailAddress>mailto:edugain-ot@geant.net</EmailAddress>
   </ContactPerson>
-</EntityDescriptor>
\ No newline at end of file
+</EntityDescriptor>
-- 
cgit v1.2.3