From f9ca4cb9a9757ae27d3de182b7e91933246b15eb Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Thu, 12 Nov 2020 08:35:56 +0100
Subject: Resolved SWAMID-3292

---
 .../miunidtest.test.miun.se-saml-miun-metadata.xml | 66 ++++++++++++++++++++++
 .../miunidutv.test.miun.se-saml-miun-metadata.xml  | 66 ++++++++++++++++++++++
 swamid-testing-sp-1.0.mxml                         |  2 +
 3 files changed, 134 insertions(+)
 create mode 100644 swamid-2.0/miunidtest.test.miun.se-saml-miun-metadata.xml
 create mode 100644 swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml

diff --git a/swamid-2.0/miunidtest.test.miun.se-saml-miun-metadata.xml b/swamid-2.0/miunidtest.test.miun.se-saml-miun-metadata.xml
new file mode 100644
index 00000000..58caa253
--- /dev/null
+++ b/swamid-2.0/miunidtest.test.miun.se-saml-miun-metadata.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://miunidtest.test.miun.se/saml/miun/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Studentinformationsverktyg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Student Information Tools</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Tjänster för studenter.</mdui:Description>
+        <mdui:Description xml:lang="en">Services for student.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDZTCCAk2gAwIBAgIUPqt3KoPwgXU1NxKQGo6pC+HBdKEwDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxHjAcBgNVBAoMFU1pZCBTd2VkZW4gVW5pdmVyc2l0eTAeFw0yMDA0MTcxMzU5MDFaFw0zMDA0MTcxMzU5MDFaMEIxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMR4wHAYDVQQKDBVNaWQgU3dlZGVuIFVuaXZlcnNpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY6KIUQNALQPAeBCWbDwVbYY0iFU3Awy59rZx6DNjksqYVnOV6IAgZHc72NSrgk8Hytx1DufoSXVq90PeBAhnQep4bll61oe2Z74KoAbEd8ys+JtvloMZ61V3IeNVria7AgjXyI7AALydiu4GW/H/+eXISjC8gAkSzMpxBmGI4oZdDiKYn16D9vJncQFW7HtR2xKqu4oEeIV1mrUHQ8dhQIgJgeKA3MEdvywC0pQePwkuncWEy2E8syPSWr/+Axtw04CQQGtRGAGk4yGHyRrDWt6zdQ02ayiH8+FsdswjSZUuSii/wuo1GYBnFDbWPO/FM2f+E5Z8EPdPtGCgeBAohAgMBAAGjUzBRMB0GA1UdDgQWBBQPU0Sczduvg9nyck0RhUptiSv8DTAfBgNVHSMEGDAWgBQPU0Sczduvg9nyck0RhUptiSv8DTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCB5ggnFQMmCTgmYP8RXQyVIagTqzS5vHlqcwn86HN00v3ov69C+kNMYCV3e+xTY2HmABGIbh5SiqxHq36A7BPrX7H5c7CuNhDhG6ol+Xeeg/mzbyKD0DbsJ/KmUF6iLICCKiQoJC1hck1ApRJP8F30MW8yeJlJDu9vvefKqbXaTS83uYpzy0yQBk6z+nDLlaU20Hx2sSHqXOQS9i8dxb5TNcZlHS36IEW5I2SgRRJ+SYxFrytI+8TJQkQoueJ7n8SGd+VjyXUcMXx7HsZwgzMyYoJyolMY5Ts6mHr+REn+xk+PB5V5J40WXAMwCQg7OjL0P+yjgFThKvo03etq6xfG</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidtest.test.miun.se/saml/miun/sls"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidtest.test.miun.se/saml/miun/acs" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Studentinformationsverktyg</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">MIUN</OrganizationName>
+    <OrganizationName xml:lang="en">MIUN</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Mittuniversitetet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Mid Sweden University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.miun.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.miun.se/en/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
+    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
+    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml b/swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml
new file mode 100644
index 00000000..05d22dfc
--- /dev/null
+++ b/swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://miunidutv.test.miun.se/saml/miun/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Studentinformationsverktyg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Student Information Tools</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Tjänster för studenter.</mdui:Description>
+        <mdui:Description xml:lang="en">Services for student.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEoTCCAwmgAwIBAgIJALr6KmPgG+ebMA0GCSqGSIb3DQEBCwUAMGcxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxIDAeBgNVBAMMF21pdW5pZHB1dHYudGVzdC5taXVuLnNlMB4XDTIwMDkyMjA4MjY0N1oXDTMwMDkyMjA4MjY0N1owZzELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEgMB4GA1UEAwwXbWl1bmlkcHV0di50ZXN0Lm1pdW4uc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDG6ZhVyA1nYDkcjSOWTBHSVUWwo0ku36oZ/+KWo4KHK9PaA66FpQc0iisOO7aXXFFbtR2WS3dkymUp4wGiOCuda/omF1SMTmYyYKAcPXAei+dsVxNsJ+5notWj5JRKnRQxJ4TnS7GJiS1pK2JBAifx4ssPZCIa5F941iQDiJk6r3/S9C4+AxCkQej7zrNr9AzFYksNSOzLcOxZatG6X+L6EV+ujAtIiwtiJ8rnh4jFyY33LrXuVWty3fGPBn4HG7NiCnjRt+MopEPc0TAM0XX+5xY6TTEYwQASK66ScypIfSBuhTiVixpRcKcMcAENHKQJTNueS+f0w23ESKpGgKGn98MwIy93PzEgX3T9f3wefKLVSxHuPizOs5tWPoGEtzT1RDqYR7gZxkKw0vz8fFmt/JQPOvX0xTZzxomaiFCgyyZsHk6gtlYnTtFZf4ULI/NiK8mC9oQA6VR3FqOAsYpV3i6atVl55g4gUs4lXuRKFW2HbNrarDhZ2IEvLHrzCasCAwEAAaNQME4wHQYDVR0OBBYEFChMG93llg10eQb2YkbVrxb9k5ZpMB8GA1UdIwQYMBaAFChMG93llg10eQb2YkbVrxb9k5ZpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggGBABz2u3FfSXJyLyMpuTdGV2H0G1t2hRQi6F+uMdCQEwZ5dXbX5sutEl5JzKR57amtNfXodeCQck1pgXDoT3dM8lgi8f4Oz1tKo0PZQfXL+zQiev0/9X6iC1cXWqjuMw28c4o0YYz+j+8WFdaNjW4zxYNBay9hBsPoofxWZeaTGV5Y93svy4xe+9G0Mbo42LOUDXEhOnHMip3TdBMGsNu2VEcUzLiKjKZBmzUtqISofD61fdI8d22je/bRim7MV69i9uGHw4pmbWEd3OAmMGFIIyOZOM/fPAIxLKV7kZs11xVBL14ViHFBKklQcYqZ1ws+N0fUhwaBzQzzUzaPz9wN4X0ixvr0wNM9M3Sv/dM4Cfq7fkvp5qJBuj+nIX7YgBPllMwUtf9XddGYxZJZrkpjNlt03WPTmPU3wZDiR125442ANoPZZ1TAC5W3z7Q+5SKCSMaZxNRagwwr5oeA3iLdfaJsHEln6f215KAMTisHCVuscmX0kA/YwWTkIMztb5JUcg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidutv.test.miun.se/saml/miun/sls"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidutv.test.miun.se/saml/miun/acs" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Studentinformationsverktyg</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" 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" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="sv">MIUN</OrganizationName>
+    <OrganizationName xml:lang="en">MIUN</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv">Mittuniversitetet</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Mid Sweden University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv">http://www.miun.se/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.miun.se/en/</OrganizationURL>
+  </Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
+    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
+    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>IT Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 42c362f4..55a70e3d 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -60,4 +60,6 @@
   <xi:include href="swamid-2.0/test.ortrac.com-saml-sp.xml"/>
   <xi:include href="swamid-2.0/permitwinstaging1.caleaccess.com.xml"/>
   <xi:include href="swamid-2.0/test.lu.ortrac.com-saml-sp.xml"/>
+  <xi:include href="swamid-2.0/miunidtest.test.miun.se-saml-miun-metadata.xml"/>
+  <xi:include href="swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3