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

2 files changed, 54 insertions, 0 deletions

diff --git a/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml b/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
new file mode 100644
index 00000000..63206558
--- /dev/null
+++ b/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://stipendier-test.its.uu.se/stipendium">
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Scholarship </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Stipendiehantering - (Test)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">System (Test) som hanterar stipendium vid Uppsala universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Scholarship (Test) management system at Uppsala university</mdui:Description>
+        <mdui:Logo height="125" width="125">https://stipendier-test.its.uu.se/stipendium/img/UU-logga_125x125.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://stipendier-test.its.uu.se/stipendium/stipac/login?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://stipendier-test.its.uu.se/stipendium/stipac/login</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDYzCCAkugAwIBAgIEfScBOzANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQGEwJzZTEQMA4GA1UE
+CBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMCVVUxCzAJBgNVBAsTAklUMRUw
+EwYDVQQDEwxUb21teSBTdGVudmkwHhcNMTcwMzAzMDcwMDA3WhcNMzcwMjI2MDcwMDA3WjBiMQsw
+CQYDVQQGEwJzZTEQMA4GA1UECBMHU3ZlcmlnZTEQMA4GA1UEBxMHVXBwc2FsYTELMAkGA1UEChMC
+VVUxCzAJBgNVBAsTAklUMRUwEwYDVQQDEwxUb21teSBTdGVudmkwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCcxAvJuFC8orIPNpsam9iXZJekHs2dSmDd/ex50A0vf3l60cpkxg3cAMcR
+EH5Bk+h9PSO0eRjj7pzPFE1Ok0MQEsmCljXQPcMfOOXGAD6g+cR3ZyLqiZ7k8/oog5G+S5HFAY+4
+7y6loEkYsJ1iLTPhgBLeoWjFP2T8S67l5WSHAeeUVEyeXfodxGA4zee3w3V9XtaNc/ldiEZnF905
+dITQX4D5gew3Tb9ezP79+GrHQwv3Q3xWjU4EILJ6uGFcBhO0fbj7hS7GGvmzMgI9vyq10xVdUAY6
+kFpwwnfFiJm3gkusTvluuWnyscA3RTzrNab290jrXzHQQcP1AoeA/WdjAgMBAAGjITAfMB0GA1Ud
+DgQWBBTCDLvl0/fpImvNkS9Wsg1fZ+fu1jANBgkqhkiG9w0BAQsFAAOCAQEAHXbUQzYX7q5tE7f6
+VuU2YtI+XFOBdrw4SE1uDcd1XeWMcBsMvcEFbeWrwhYdVlv9+ni1A3/pGgy6Do9EvJfu79Jj6QgQ
+GdbL+RJ/8oBt09w+zGJ00m86g5JpN5l19CIi+yIVBGL1v+aK6c3AHC+9y8f2965mHk/YZknIw1xR
+1EXQ1/KXwlHzvBpEU3EfWRxhZ+B66zWHfekr659A3T5wCUpPWrzVCTaXh2ZNEBY95bGhuECZnVVY
+yRw902t0AGgUk9jhJ83aMPdrSk3IZTFa5YOC9OQcwJ6nfAGXNgsn/taFleA8+GaIBwhKF95s8h1J
+l+6u+L3FBjFOWmy9EQZdyA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SingleLogout/alias/defaultAlias"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SingleLogout/alias/defaultAlias"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="1"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tommy</md:GivenName>
+    <md:SurName>Stenvi</md:SurName>
+    <md:EmailAddress>mailto:tommy.stenvi@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 1c23518d..df736529 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -64,4 +64,5 @@
   <xi:include href="swamid-2.0/lingon.ladok.umu.se-8087-rs-sp.xml"/>
   <xi:include href="swamid-2.0/devrb.lbic.lu.se.xml"/>
   <xi:include href="swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/stipendier-test.its.uu.se-stipendium.xml"/>
 </EntitiesDescriptor>