From 567ef25fb9e7a968c8cd8fb7bf1ea88f9cf8d203 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 8 Dec 2015 14:05:34 +0100
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml   | 149 ++++++++++++++-------
 1 file changed, 99 insertions(+), 50 deletions(-)

(limited to 'swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml')

diff --git a/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml
index 97ffba2a..d2147c92 100644
--- a/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-brewdog.ucs.ed.ac.uk/idp/shibboleth">
-  <!--
-		This is a "dlib-brewdog test IdP" Shibboleth IdP for the University of Edinburgh.
-	-->
-  <Extensions>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dlib-brewdog.ucs.ed.ac.uk/idp/shibboleth">
+  <md: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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
@@ -12,17 +9,43 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-31T14:00:45Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brewdog.edina.ac.uk</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:Logo height="28" width="28">https://dlib-brewdog.ucs.ed.ac.uk/idp/images/brewdog.28x28.png</mdui:Logo>
         <mdui:Logo height="128" width="128">https://dlib-brewdog.ucs.ed.ac.uk/idp/images/brewdog.128x128.png</mdui:Logo>
         <mdui:DisplayName xml:lang="en">dlib-brewdog test IdP</mdui:DisplayName>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDTzCCAjegAwIBAgIUZZAevsduZb+ksg12hWJz0it6obcwDQYJKoZIhvcNAQEF
+						BQAwJDEiMCAGA1UEAxMZZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51azAeFw0xNTEx
+						MjUxMzUyNTdaFw0zNTExMjUxMzUyNTdaMCQxIjAgBgNVBAMTGWRsaWItYnJld2Rv
+						Zy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT
+						lxvyZDrQk4NmB/8eCqgu+4rOJp6JW7bPXMkmmnibVbGDuGzyeD66GKuN/p4ev/nS
+						Xz9uUgX/5Z/30hNEANLIMFRW2Ds3zytISLnZ9plSOWJ456CEb1ne84H7B9N/VAHB
+						/eM+7zbNnzL4BhkYC64Zu2KzJvZzdsCe6mEUr6is6imn82YLyy3jzKWyuEsTxesN
+						3XZqdPfehjy39jcgkG8DQJGgwqCxP4hyLhMCjo6lgZ7GO08wdTMHEkjP9Wf/WXPw
+						TP/VN3DBZmgHQ9XgCa45WYxab93+HnL258UscDOwYBeOuXLWnlNT2wfWqFU0lUD3
+						+2WH/tE3wjkCejiAXeaPAgMBAAGjeTB3MFYGA1UdEQRPME2CGWRsaWItYnJld2Rv
+						Zy51Y3MuZWQuYWMudWuGMGh0dHBzOi8vZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUHlvSVqIZuSLPEnkuljdJiy7YlzEw
+						DQYJKoZIhvcNAQEFBQADggEBAGV7em8jposBaytzgw3CYyCSLmAOkqaVMrUFVyQ1
+						KPA84EAS+K7/7d4hg1VMO3KQVB6oTUfzoMmz1AagDU8qeZbaD3zN/dPS1aNnEfPg
+						jizWl9pQeeiIYiLyVOY2+T2FYX+Kzf4w2tlIpM+1C2znVVJQcPTIIIwc3gQFgV3F
+						5MLKXUMlpo3O4npIUXzR61O8EfjScnIaE/D3+rjbNStxfMebuyUi9G5THXZOOrbd
+						APu5rR/r9x/dJ3F3YTXGx2Mw3NfYYX7XP3UxvKKSCwCb5aQ/kEIJjE9hUIEIEdma
+						oobJ79OhVG+IPVW5qutgYavQ5qKeSCCa5Pe6/7Yww8L9Lks=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -47,8 +70,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -73,21 +96,47 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brewdog.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDTzCCAjegAwIBAgIUZZAevsduZb+ksg12hWJz0it6obcwDQYJKoZIhvcNAQEF
+						BQAwJDEiMCAGA1UEAxMZZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51azAeFw0xNTEx
+						MjUxMzUyNTdaFw0zNTExMjUxMzUyNTdaMCQxIjAgBgNVBAMTGWRsaWItYnJld2Rv
+						Zy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT
+						lxvyZDrQk4NmB/8eCqgu+4rOJp6JW7bPXMkmmnibVbGDuGzyeD66GKuN/p4ev/nS
+						Xz9uUgX/5Z/30hNEANLIMFRW2Ds3zytISLnZ9plSOWJ456CEb1ne84H7B9N/VAHB
+						/eM+7zbNnzL4BhkYC64Zu2KzJvZzdsCe6mEUr6is6imn82YLyy3jzKWyuEsTxesN
+						3XZqdPfehjy39jcgkG8DQJGgwqCxP4hyLhMCjo6lgZ7GO08wdTMHEkjP9Wf/WXPw
+						TP/VN3DBZmgHQ9XgCa45WYxab93+HnL258UscDOwYBeOuXLWnlNT2wfWqFU0lUD3
+						+2WH/tE3wjkCejiAXeaPAgMBAAGjeTB3MFYGA1UdEQRPME2CGWRsaWItYnJld2Rv
+						Zy51Y3MuZWQuYWMudWuGMGh0dHBzOi8vZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51
+						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUHlvSVqIZuSLPEnkuljdJiy7YlzEw
+						DQYJKoZIhvcNAQEFBQADggEBAGV7em8jposBaytzgw3CYyCSLmAOkqaVMrUFVyQ1
+						KPA84EAS+K7/7d4hg1VMO3KQVB6oTUfzoMmz1AagDU8qeZbaD3zN/dPS1aNnEfPg
+						jizWl9pQeeiIYiLyVOY2+T2FYX+Kzf4w2tlIpM+1C2znVVJQcPTIIIwc3gQFgV3F
+						5MLKXUMlpo3O4npIUXzR61O8EfjScnIaE/D3+rjbNStxfMebuyUi9G5THXZOOrbd
+						APu5rR/r9x/dJ3F3YTXGx2Mw3NfYYX7XP3UxvKKSCwCb5aQ/kEIJjE9hUIEIEdma
+						oobJ79OhVG+IPVW5qutgYavQ5qKeSCCa5Pe6/7Yww8L9Lks=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -112,8 +161,8 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -138,25 +187,25 @@
 					</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">dlib-brewdog test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Edinburgh</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">dlib-brewdog test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ed.ac.uk/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Stuart</md:SurName>
+    <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Alex</md:GivenName>
+    <md:SurName>Stuart</md:SurName>
+    <md:EmailAddress>mailto:alex.stuart@ed.ac.uk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
-- 
cgit v1.2.3