SWAMID-948, SWAMID-949 Updated miunidp.miun.se and miunidutv.test.miun.se

2 files changed, 86 insertions, 69 deletions

diff --git a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
index a492c577..c776dd52 100644
--- a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
@@ -4,18 +4,18 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-05-17T10:14:42Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute 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 xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
+      </samla: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-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
-    </attr:EntityAttributes>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://miunidp.miun.se/idp/shibboleth">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://miunidp.miun.se/idp/shibboleth">
+    <md:Extensions>
       <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Mittuniversitetet</mdui:DisplayName>
@@ -24,11 +24,12 @@
         <mdui:Description xml:lang="en">IDP at Mid Sweden University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="111" width="225">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.miun.se/sv/Helpdesk/Student/MittNets-regler/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://miun.se/personuppgifterIdP</mdui:PrivacyStatementURL>
         <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
         <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
+        <mdui:Logo xml:lang="en" height="146" width="260">https://miunidp.miun.se/idp/images/miun-logo.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="146" width="260">https://miunidp.miun.se/idp/images/miun-logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://miun.se/en/personuppgifterIdP</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <mdui:DiscoHints>
         <mdui:DomainHint>miun.se</mdui:DomainHint>
@@ -36,8 +37,8 @@
         <mdui:GeolocationHint>geo:62.394626,17.284259</mdui:GeolocationHint>
         <mdui:GeolocationHint>geo:62.630989,17.946473</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -61,8 +62,8 @@ v4JiWygCcvQLG07TOeX/1sjsTTznbxfuAQzYA/Y/Z4nQAzQBmxO6aITFYmntRfJq
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -86,8 +87,8 @@ jjpzv0O7rvAVIaAJLA2wpt8fTSWnvRKac6E4AwjhTA3/w3HKA4LF5MgHASU=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -111,20 +112,20 @@ B9F/wgJ22q78SOeLzik0JTCya18K9vjuod/q7n5tM1zDi/pDyT2Fy/s+pw==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidp.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidp.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://miunidp.miun.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidp.miun.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidp.miun.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidp.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidp.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://miunidp.miun.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidp.miun.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidp.miun.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
       <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -148,8 +149,8 @@ v4JiWygCcvQLG07TOeX/1sjsTTznbxfuAQzYA/Y/Z4nQAzQBmxO6aITFYmntRfJq
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -173,8 +174,8 @@ jjpzv0O7rvAVIaAJLA2wpt8fTSWnvRKac6E4AwjhTA3/w3HKA4LF5MgHASU=
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
@@ -198,31 +199,39 @@ B9F/wgJ22q78SOeLzik0JTCya18K9vjuod/q7n5tM1zDi/pDyT2Fy/s+pw==
                         </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidp.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">MIUN</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Mittuniversitetet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Mid Sweden University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Mid Sweden University</Company>
-    <SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</SurName>
-    <EmailAddress>mailto:swamidcontact@miun.se</EmailAddress>
-    <TelephoneNumber>+46 10-142 80 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>Mid Sweden University</Company>
-    <SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</SurName>
-    <EmailAddress>mailto:swamidcontact@miun.se</EmailAddress>
-    <TelephoneNumber>+46 10-142 80 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>Mid Sweden University</Company>
-    <SurName>IT Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@miun.se</EmailAddress>
-    <TelephoneNumber>+46 771 976130</TelephoneNumber>
-  </ContactPerson>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidp.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.miun.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.miun.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>SystemDrift, INRA Department</md:SurName>
+    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
+    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:SurName>SystemDrift, INFRA Department</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 10-142 80 00</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>Mid Sweden University</md:Company>
+    <md:GivenName>Incident Manager</md:GivenName>
+    <md:SurName>Mid Sweden University Incident Manager</md:SurName>
+    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
+  </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
index fa8f458e..2ed44d16 100644
--- a/swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml
+++ b/swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml
@@ -19,6 +19,8 @@
         <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:InformationURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -39,19 +41,20 @@
     <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:ServiceName xml:lang="en">Student Information Tools</md:ServiceName>
+      <md:ServiceName xml:lang="sv">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:Organization>
+    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.miun.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.miun.se/en/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Mid Sweden University</md:Company>
     <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
@@ -70,4 +73,9 @@
     <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
     <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Incident Manager</md:GivenName>
+    <md:SurName>Mid Sweden University Icident Manager</md:SurName>
+    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>