Merge branch 'master' of md-master.swamid.se:swamid-metadata

3 files changed, 96 insertions, 0 deletions

diff --git a/swamid-1.0/idp2.hig.se.xml b/swamid-1.0/idp2.hig.se.xml
index ab6253a5..7f6301fe 100644
--- a/swamid-1.0/idp2.hig.se.xml
+++ b/swamid-1.0/idp2.hig.se.xml
@@ -8,6 +8,13 @@
 
         <Extensions>
             <shibmd:Scope regexp="false">hig.se</shibmd:Scope>
+            <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+               <mdui:DisplayName xml:lang="sv">Högskolan i Gävle (Alumni)</mdui:DisplayName>
+               <mdui:DisplayName xml:lang="en">University of Gävle (Alumni)</mdui:DisplayName>
+               <mdui:Description xml:lang="sv">Identity Provider för alumni vid Högskolan i Gävle.</mdui:Description>
+               <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by alumni at the university.</mdui:Description>
+               <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+            </mdui:UIInfo>
         </Extensions>
 
         <KeyDescriptor>
diff --git a/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml b/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml
new file mode 100644
index 00000000..7d38995c
--- /dev/null
+++ b/swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml
@@ -0,0 +1,88 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_63cc5ccdd1293cac0b7de9b1607a5426" entityID="https://crowd-test.it.su.se/Shibboleth.sso">

+

+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">

+    <md:Extensions>

+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd-test.it.su.se/Shibboleth.sso/WAYF" index="1"/>

+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://crowd-test.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>

+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">

+        <mdui:DisplayName xml:lang="sv">Testimplementation av Crowd vid Stockholms universitet</mdui:DisplayName>

+        <mdui:Description xml:lang="sv">Denna tjänst ger användare tillgång till test implantationen av Crowd vid Stockholms universitet.</mdui:Description>

+        <mdui:DisplayName xml:lang="en">Test implementation of Crowd at Stockholm University</mdui:DisplayName>

+        <mdui:Description xml:lang="sv">This service allows users to access the test implantation of Crowd at Stockholm University.</mdui:Description>

+      </mdui:UIInfo>

+      <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">

+        <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"

+          NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"

+          Name="http://macedir.org/entity-category">

+          <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>

+        </samla:Attribute>

+      </mdattr:EntityAttributes>

+    </md:Extensions>

+    <md:KeyDescriptor use="signing">

+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">

+        <ds:KeyName>mino-lab02</ds:KeyName>

+        <ds:X509Data>

+          <ds:X509SubjectName>CN=mino-lab02</ds:X509SubjectName>

+          <ds:X509Certificate>MIIC5TCCAc2gAwIBAgIJAMatSzUiGYC+MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV

+BAMTCm1pbm8tbGFiMDIwHhcNMTMwNDE5MDY0MzI5WhcNMjMwNDE3MDY0MzI5WjAV

+MRMwEQYDVQQDEwptaW5vLWxhYjAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB

+CgKCAQEAp+49hJCsA/5loQJX/jLCVDxHAu9yxE3Z0qoJCjLP7dw+/gPTk9l0TRIk

+QtUNEiZfDT56mi8VyW4UXuGN8/fFSSRG4gUGGqyvJxloykBjb2INT5VR4Lq4UMfm

+nEi5rPmvdU3r2p7LMWERg5t+Q7h9pmlje7hcxcg+5RkMN8ajOYEST71BIV1qw8I6

+f0yEPDDTqKDBcZbtuSDmUqT7Pn/s0alnRGW14TYliqS/jcFjr5TASxoewTj+wOR2

+2WJDlH+jl2REnLh7D24FtY8qLwFlBytv47yQ2DHbSe/upHU/T31T/t8a/XoKwUXV

+1HCcFmNn3RswrIPHVNyjku2eJhDpsQIDAQABozgwNjAVBgNVHREEDjAMggptaW5v

+LWxhYjAyMB0GA1UdDgQWBBROPqY7m/x1ubOhNpSaEFG+X6uC/TANBgkqhkiG9w0B

+AQUFAAOCAQEABLSrJnnIvhyy41FHzdK3YKjWL7FmQ0265fshjDimly4F3BD8bcW1

+UIWeHkYmoMBqe+6VQORjI8DU6IuTm39+j47ccX9wd4a8Xoghu66yAdE2LAeo5W+7

+GhqJuug/eIRbYxlRjyC/1TKQdX2HakEoo5MGZM4HKA53bU3hGUok7WJgxnNMx460

+am2vwvGH7tTbqM3brwt4FfnWG881v//OZD50A62vWwSNg6qpDAaT52+qdrZ8TSRV

+VeDKoZXj5MlQdx5DCOpkboieItTO5OUCLb/3VFWtPLi6aF2/Wfbl0aYfE5FjV0Bj

+KhnlJurRHjddtxHmLCSOZInPrJEiXjn6ew==

+</ds:X509Certificate>

+        </ds:X509Data>

+      </ds:KeyInfo>

+    </md:KeyDescriptor>

+    <md:KeyDescriptor use="encryption">

+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">

+        <ds:KeyName>mino-lab02</ds:KeyName>

+        <ds:X509Data>

+          <ds:X509SubjectName>CN=mino-lab02</ds:X509SubjectName>

+          <ds:X509Certificate>MIIC5TCCAc2gAwIBAgIJAMatSzUiGYC+MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV

+BAMTCm1pbm8tbGFiMDIwHhcNMTMwNDE5MDY0MzI5WhcNMjMwNDE3MDY0MzI5WjAV

+MRMwEQYDVQQDEwptaW5vLWxhYjAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB

+CgKCAQEAp+49hJCsA/5loQJX/jLCVDxHAu9yxE3Z0qoJCjLP7dw+/gPTk9l0TRIk

+QtUNEiZfDT56mi8VyW4UXuGN8/fFSSRG4gUGGqyvJxloykBjb2INT5VR4Lq4UMfm

+nEi5rPmvdU3r2p7LMWERg5t+Q7h9pmlje7hcxcg+5RkMN8ajOYEST71BIV1qw8I6

+f0yEPDDTqKDBcZbtuSDmUqT7Pn/s0alnRGW14TYliqS/jcFjr5TASxoewTj+wOR2

+2WJDlH+jl2REnLh7D24FtY8qLwFlBytv47yQ2DHbSe/upHU/T31T/t8a/XoKwUXV

+1HCcFmNn3RswrIPHVNyjku2eJhDpsQIDAQABozgwNjAVBgNVHREEDjAMggptaW5v

+LWxhYjAyMB0GA1UdDgQWBBROPqY7m/x1ubOhNpSaEFG+X6uC/TANBgkqhkiG9w0B

+AQUFAAOCAQEABLSrJnnIvhyy41FHzdK3YKjWL7FmQ0265fshjDimly4F3BD8bcW1

+UIWeHkYmoMBqe+6VQORjI8DU6IuTm39+j47ccX9wd4a8Xoghu66yAdE2LAeo5W+7

+GhqJuug/eIRbYxlRjyC/1TKQdX2HakEoo5MGZM4HKA53bU3hGUok7WJgxnNMx460

+am2vwvGH7tTbqM3brwt4FfnWG881v//OZD50A62vWwSNg6qpDAaT52+qdrZ8TSRV

+VeDKoZXj5MlQdx5DCOpkboieItTO5OUCLb/3VFWtPLi6aF2/Wfbl0aYfE5FjV0Bj

+KhnlJurRHjddtxHmLCSOZInPrJEiXjn6ew==

+</ds:X509Certificate>

+        </ds:X509Data>

+      </ds:KeyInfo>

+    </md:KeyDescriptor>

+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd-test.it.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/SOAP"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/Redirect"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/POST"/>

+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/SLO/Artifact"/>

+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/SOAP"/>

+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/Redirect"/>

+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/POST"/>

+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/NIM/Artifact"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>

+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>

+  </md:SPSSODescriptor>

+

+</md:EntityDescriptor>

diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 13472f0a..02e473e9 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -45,4 +45,5 @@
    <xi:include href="swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml"/>
    <xi:include href="swamid-2.0/www.mit.ladok.se-gui-sp.xml"/>
    <xi:include href="swamid-2.0/rems.csc.fi.xml"/>
+   <xi:include href="swamid-2.0/crowd-test.it.su.se-Shibboleth.sso.xml"/>
 </md:EntitiesDescriptor>