Resolves SWAMIDOPS-388

2 files changed, 81 insertions, 0 deletions

diff --git a/swamid-2.0/studium.uu.se-studium.xml b/swamid-2.0/studium.uu.se-studium.xml
new file mode 100644
index 00000000..2e5d9043
--- /dev/null
+++ b/swamid-2.0/studium.uu.se-studium.xml
@@ -0,0 +1,80 @@
+<?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://studium.uu.se/studium">
+  <md:Extensions>
+    <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:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisco:DiscoveryResponse xmlns:idpdisco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studium.uu.se/auth-saml/saml/login/alias/_122_1?disco=true" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Studium</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Studium</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Studium är Uppsala universitets system för lärande och utbildning.</mdui:Description>
+        <mdui:Description xml:lang="en">Studium is Uppsala University’s learning management system.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIICrTCCAZWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9CbGFja2JvYXJkIFNB
+						TUwwHhcNMTcxMTA2MTAwODIzWhcNMjcxMTA2MTAwODIzWjAaMRgwFgYDVQQDEw9CbGFja2JvYXJk
+						IFNBTUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCI2zg1w5GWeoscGK5H0BR/T4JR
+						TsG4LGubUowFvvmrA3PzjB8BOAoYgoxuUfH/x3QB7TD9HKvmxi1Jq0FfcpFoH8e3TcGOSqGLPL11
+						UeE5pomcEX8TGv/1I0PhkgX5S7ByYjK0tnQOPHtKGfyrDUfbd8JsB3ZpC1eYJ6loBHYvNYZYG8Q4
+						dz4jP4YlbjKFUDjmaNughjtjwKb9imXlmhvn01VFPiwliSGskJMCMQVzaliBkr5HVVaJMUK1JsP5
+						LU1F9wvpJPppU4e9befsLV1PPPkMHhmf5/E45A7Otax2B7NN8Z9FayAtXP27xW7duRluC8GBHcXs
+						wbckVLz5DYdtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADhjqwGdjzNXTpOwFl9EmNizO7C1hpzn
+						ejwuklyBxaMRkd3Ynv/inhZ8GMda69pS9jcep9IdugI3QR5qJgy7HyXMP6fGAmkTnifp9UbGMtKU
+						+NgsSRr9hrzEzrW/RPLtmhY7nXDpOSyq8rzQ9hotjAJ+ceom6AicwzHr4gibrca0sQQ2Bvh5r7/Z
+						ufFULWajnc0Y+K+BVaeBIDSv3PpPoHPLrqvMaDwseDwCHGS0S7Bd3Iq6tDGGQKZpl5Wehd1G8ZJz
+						bbz/BPZWppTeODXigWeBXxeqWqNhYb3eHEycl99rf14O5ejoxMu5L/+lwDUpGmgZCubvGIjRKdtb
+						UDnsXC8=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIICrTCCAZWgAwIBAgIBATANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9CbGFja2JvYXJkIFNB
+						TUwwHhcNMTcxMTA2MTAwODIzWhcNMjcxMTA2MTAwODIzWjAaMRgwFgYDVQQDEw9CbGFja2JvYXJk
+						IFNBTUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCI2zg1w5GWeoscGK5H0BR/T4JR
+						TsG4LGubUowFvvmrA3PzjB8BOAoYgoxuUfH/x3QB7TD9HKvmxi1Jq0FfcpFoH8e3TcGOSqGLPL11
+						UeE5pomcEX8TGv/1I0PhkgX5S7ByYjK0tnQOPHtKGfyrDUfbd8JsB3ZpC1eYJ6loBHYvNYZYG8Q4
+						dz4jP4YlbjKFUDjmaNughjtjwKb9imXlmhvn01VFPiwliSGskJMCMQVzaliBkr5HVVaJMUK1JsP5
+						LU1F9wvpJPppU4e9befsLV1PPPkMHhmf5/E45A7Otax2B7NN8Z9FayAtXP27xW7duRluC8GBHcXs
+						wbckVLz5DYdtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADhjqwGdjzNXTpOwFl9EmNizO7C1hpzn
+						ejwuklyBxaMRkd3Ynv/inhZ8GMda69pS9jcep9IdugI3QR5qJgy7HyXMP6fGAmkTnifp9UbGMtKU
+						+NgsSRr9hrzEzrW/RPLtmhY7nXDpOSyq8rzQ9hotjAJ+ceom6AicwzHr4gibrca0sQQ2Bvh5r7/Z
+						ufFULWajnc0Y+K+BVaeBIDSv3PpPoHPLrqvMaDwseDwCHGS0S7Bd3Iq6tDGGQKZpl5Wehd1G8ZJz
+						bbz/BPZWppTeODXigWeBXxeqWqNhYb3eHEycl99rf14O5ejoxMu5L/+lwDUpGmgZCubvGIjRKdtb
+						UDnsXC8=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studium.uu.se/auth-saml/saml/SingleLogout/alias/_122_1"/>
+    <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://studium.uu.se/auth-saml/saml/SSO/alias/_122_1" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studium.uu.se/auth-saml/saml/SSO/alias/_122_1" index="1"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Studium</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ead50828..c26935b7 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -667,4 +667,5 @@
   <xi:include href="swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nfg.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/test-lubcat.lub.lu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/studium.uu.se-studium.xml"/>
 </md:EntitiesDescriptor>