Resolves SWAMIDOPS-8328

3 files changed, 102 insertions, 5 deletions

diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index e83ba1a0..00ad0d73 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.mah.se/idp/shibboleth">
   <Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml b/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..94c376b9
--- /dev/null
+++ b/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://studeranuutv.its.umu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Testsite för Bedömningshandboken för ITS, Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Test site for Bedömningshandboken for ITS, Umeå University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Utveckling av Bedömningshandboken</mdui:Description>
+        <mdui:Description xml:lang="en">Development of Bedömningshandboken</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>its-studutv01.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=its-studutv01.ad.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAO5Cjru9EaeUMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMTF2l0cy1zdHVkdXR2MDEuYWQudW11LnNlMB4XDTE2MDgyNDA4NDA1NloXDTI2
+MDgyMjA4NDA1NlowIjEgMB4GA1UEAxMXaXRzLXN0dWR1dHYwMS5hZC51bXUuc2Uw
+ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCZK0gSWCW2v1SIshG5ZBjW
+uYtuj2iAqWd/QewIF2fS9grx0C+EAUB5ufurlGoSY4YcyKzxoq9L7CgDratVsdcm
+vBEkieESpGChxDpt5znZygE5QH6vV+32nofNEaatbJIR8zXOLYHva+UVIMfjQ7oj
+epgApdTDREk2wU4XcFhrK0OXu/XXDfNXkJkl10akS4em5/AQYeaCML5S7S06t0Ok
+dCQL1lSf3cDN4xTgpXtMMonmT3LLr21Q5jBe5n/AQIu8xv3IenVfX/cru6hoqB+d
+ctZMeBzYwRIxdcfIr+g6wFadggvCHRGF7YdfXXMMQXfjj5UV81m0xImCXClx9aME
+2nBXNT+WSmlGBMHzecb13r950bGwLYIyo9rgxlNJdsAmP4rW9zu2wCZA2kOvK0ZN
+z1GAR9pfUTv6rtp2T4lEZ2pxNzYw00PX7pRQWjdj13Uuh+c4Cy2fBdhCgS6SWZL/
+F6VXATCh2T1HEi2E5xWEpfi7sbJ3PDyOfFsmA6vZLqcCAwEAAaNFMEMwIgYDVR0R
+BBswGYIXaXRzLXN0dWR1dHYwMS5hZC51bXUuc2UwHQYDVR0OBBYEFF1RLZYx7wwE
+c+R7W7o5rHElUm/iMA0GCSqGSIb3DQEBCwUAA4IBgQAxF5fjqdfqeuM+5ZHFNq98
+qWzD6IzDhtGKMOTXd+SqSQ/RKFX8HZw5QHu6mnQ0rbyRX1DAjdU25IgbvtcnWT1A
+LLI1g4xAhXh9d/sMkXJtORU5VjjO+0QHYkyhsQ44h0ht7MIWbOArTaOqcWOiJWLC
+B4HrPxzoffpv9hblMj3fsbJL88QCWu7YfCEFLgxI/jJp1de7tVsaO4Q+Fk9AMSP5
+vAhz+7sXQOg4ywUAsygyyh7+xfkPenafrmjeNneMXez68bNRilUp3Jq1Aug+yYJG
+SDP/+ZWYz2mwuFAkxhuJKHjQZLlg/Abc3ZXNq9tw7JaOKDmvYxOb6zI1jIJs5diO
+CWYCnGEwb3vfKqREk3UlTGWxgyN2ndVkXvIP/3InqlG0xrA0wIyjiMkFNj+dGY2v
+OetizLpLG5SL/++9ALGrAQGtzKFtAAl6fa486zX6PsfpJ+2yQj9v83unnjzOYfXP
+A1TJgm8iwv1lbM4AwMqlLlWC+wOm7YV2zUrEYYcoPp8=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/POST" index="7"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Erik</md:GivenName>
+    <md:SurName>Jonsson</md:SurName>
+    <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 525702b5..1636da1e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -609,4 +609,5 @@
   <xi:include href="swamid-2.0/test.play.hv.se.xml"/>
   <xi:include href="swamid-2.0/play.hv.se.xml"/>
   <xi:include href="swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml"/>
+  <xi:include href="swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>