SWAMID-595, Keyrollover part 1 for idp-v2.konstfack.se

1 files changed, 61 insertions, 45 deletions

diff --git a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
index d0d41123..9655837d 100644
--- a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
@@ -5,18 +5,18 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="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">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml: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:AttributeValue>http://www.swamid.se/policy/assurance/al2</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://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" 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://idp-v2.konstfack.se/adfs/services/trust">
-    <Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" 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://idp-v2.konstfack.se/adfs/services/trust">
+    <md:Extensions>
       <shibmd:Scope regexp="false">konstfack.se</shibmd:Scope>
       <shibmd:Scope regexp="false">student.konstfack.se</shibmd:Scope>
       <mdui:UIInfo>
@@ -27,7 +27,7 @@
         <mdui:InformationURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.konstfack.se/sv/Om-Konstfack/Om-webbplatsen</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack/About-this-site</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.konstfack.se/en/About-Konstfack/About-the-website</mdui:PrivacyStatementURL>
         <mdui:Logo xml:lang="sv" height="75" width="335">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
         <mdui:Logo xml:lang="en" height="75" width="335">https://idp-v2.konstfack.se/adfs/portal/logo/logo.png</mdui:Logo>
       </mdui:UIInfo>
@@ -36,42 +36,58 @@
         <mdui:DomainHint>konstfack.se</mdui:DomainHint>
         <mdui:GeolocationHint>geo:59.2996777,17.9908419</mdui:GeolocationHint>
       </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC6DCCAdCgAwIBAgIQW9zTWlTiQq5L8qhHqqaC9DANBgkqhkiG9w0BAQsFADAwMS4wLAYDVQQDEyVBREZTIEVuY3J5cHRpb24gLSBpZHAtdjIua29uc3RmYWNrLnNlMB4XDTIxMDEyNTA3NDg0MFoXDTIyMDEyNTA3NDg0MFowMDEuMCwGA1UEAxMlQURGUyBFbmNyeXB0aW9uIC0gaWRwLXYyLmtvbnN0ZmFjay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSZjP55qxhWX73vCMvGS8nuWzvDvcCF5bCCBgJ6aXOcFb0Z6UQHE2/IYL6kjBWioMMDn+Yrp1coNH8WMk7pC0BTVbSDunI9wCgzJxdmckX97zKFHoPmneWDQdqk38y4UykcyBm5JrG5VeJw80cv0bSblOBXEdgwRJ5+2fW39MbuZWfDjk9/0yE9nT4eumJB12nQNkPd6ZvCWSStF1OtYdQtyi29STeEyRfd7dWuVHzVNqTnT+7tx+fVc0OGId7VUB854KsIiSjDL1oq6KcXMNpMnBprtLv5z1gtit0yvuK/jr3yuCaGRVNPBHLJKbNtSILBa2Vk+RoDSxFsBJ5XnxkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAlC4Ss8xDbXaBw2q/Y6dwJNmXUkoNk9RXO3zJKC+hoM7RMuvwCe5wGx4ZnF/00pTzguQj1xRwMukLcziJMo6zxA/rBlML5TFabNGuuv7aB5l9uSYGuNkxamNllWcGGldQoiNcO+PQbFjtCkue6upk1/YEx2LQNkKBUebJJXBG8PrTzv0mM2+yazEBxe7rBgNmg0CRh7TTJ3Mt+dfNJFrXFNEyRpI3KOiHTXJN96ArOnmw223qTFCPNK+Oe4MaE88N7JFIY0+qI+UGnwDi7FtLD0s8eDPqV4AzontMoVJpBG+CcmtU6tPHi957zwa75dcKdRli958EYxCF76YVs/HAqw==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC4jCCAcqgAwIBAgIQVn58QOiBNKpNBHsLypj7bzANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIFNpZ25pbmcgLSBpZHAtdjIua29uc3RmYWNrLnNlMB4XDTIxMDEyNTA3NDg0MVoXDTIyMDEyNTA3NDg0MVowLTErMCkGA1UEAxMiQURGUyBTaWduaW5nIC0gaWRwLXYyLmtvbnN0ZmFjay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN8hxp0gSOsWaEHV/wAAczSTSSVtuHsMOoLP8pQUYeVHE1Isct2vgCzwqUKA6axhHlT9bXbyw5ESJAI5AlA5dZC2Hxevrst2ypfB3OGNk6pndwLbS+pSC4c4Zh/N/HlJ0Utj3RsM6/nA5YeFyUWrxb9Yyx0EFhHs55YZkX37skfFf/bsR/WGIZ/IEfCaMGKLnMhpkqWpXydm4ep4hs3LJjXhqnPjHnjeHuUDUfEDMDhoPEiOMMimaiLiUiTdrTRG+P0VJL0byCnu+TJPGtZ+/qjFcUyw76++cIF2Zvkb96RBnENXzgnzey22Qr0rXcpy0Z53dUOoN0ptCZC9+LwT+kUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAdUYTr2fQIfH/t33Mve4tXIBVQg2Vm561Sv9JMKEOAkcMjBdhlg693z4OvA6Tyf3lvylT0zKWQNH8lRq3QD6ypjwaMggVINXjTKePVJjt+LHoh8gZX+D+G/gVhFHFBQ2m5dh4x604HpOfPkcAR1ShRdsFJ/fglUB/wr7iaprwVUfmyz08xvgwh5vgWu3U4I+KBdk2NYAkLn9RiHONsOXmrJFpviLeBHWrr1X0OsuIREgt5a/OQ7QjkaB9qRRQRHwvZvaDywDWFaazo4OqeyGR4J9Asfee6qb7At4j1kubdXmZsidtSz308sfOj0MuwZGgOD9NSMy24WmFK9Hw6IcHUw==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.konstfack.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Konstfack</OrganizationName>
-    <OrganizationName xml:lang="en">Konstfack</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Konstfack</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Konstfack</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.konstfack.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.konstfack.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Håkan</GivenName>
-    <SurName>Pettersson</SurName>
-    <EmailAddress>mailto:netsupport@konstfack.se</EmailAddress>
-    <TelephoneNumber>+46-8-4504100</TelephoneNumber>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC6DCCAdCgAwIBAgIQW9zTWlTiQq5L8qhHqqaC9DANBgkqhkiG9w0BAQsFADAwMS4wLAYDVQQDEyVBREZTIEVuY3J5cHRpb24gLSBpZHAtdjIua29uc3RmYWNrLnNlMB4XDTIxMDEyNTA3NDg0MFoXDTIyMDEyNTA3NDg0MFowMDEuMCwGA1UEAxMlQURGUyBFbmNyeXB0aW9uIC0gaWRwLXYyLmtvbnN0ZmFjay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSZjP55qxhWX73vCMvGS8nuWzvDvcCF5bCCBgJ6aXOcFb0Z6UQHE2/IYL6kjBWioMMDn+Yrp1coNH8WMk7pC0BTVbSDunI9wCgzJxdmckX97zKFHoPmneWDQdqk38y4UykcyBm5JrG5VeJw80cv0bSblOBXEdgwRJ5+2fW39MbuZWfDjk9/0yE9nT4eumJB12nQNkPd6ZvCWSStF1OtYdQtyi29STeEyRfd7dWuVHzVNqTnT+7tx+fVc0OGId7VUB854KsIiSjDL1oq6KcXMNpMnBprtLv5z1gtit0yvuK/jr3yuCaGRVNPBHLJKbNtSILBa2Vk+RoDSxFsBJ5XnxkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAlC4Ss8xDbXaBw2q/Y6dwJNmXUkoNk9RXO3zJKC+hoM7RMuvwCe5wGx4ZnF/00pTzguQj1xRwMukLcziJMo6zxA/rBlML5TFabNGuuv7aB5l9uSYGuNkxamNllWcGGldQoiNcO+PQbFjtCkue6upk1/YEx2LQNkKBUebJJXBG8PrTzv0mM2+yazEBxe7rBgNmg0CRh7TTJ3Mt+dfNJFrXFNEyRpI3KOiHTXJN96ArOnmw223qTFCPNK+Oe4MaE88N7JFIY0+qI+UGnwDi7FtLD0s8eDPqV4AzontMoVJpBG+CcmtU6tPHi957zwa75dcKdRli958EYxCF76YVs/HAqw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC4jCCAcqgAwIBAgIQVn58QOiBNKpNBHsLypj7bzANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIFNpZ25pbmcgLSBpZHAtdjIua29uc3RmYWNrLnNlMB4XDTIxMDEyNTA3NDg0MVoXDTIyMDEyNTA3NDg0MVowLTErMCkGA1UEAxMiQURGUyBTaWduaW5nIC0gaWRwLXYyLmtvbnN0ZmFjay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN8hxp0gSOsWaEHV/wAAczSTSSVtuHsMOoLP8pQUYeVHE1Isct2vgCzwqUKA6axhHlT9bXbyw5ESJAI5AlA5dZC2Hxevrst2ypfB3OGNk6pndwLbS+pSC4c4Zh/N/HlJ0Utj3RsM6/nA5YeFyUWrxb9Yyx0EFhHs55YZkX37skfFf/bsR/WGIZ/IEfCaMGKLnMhpkqWpXydm4ep4hs3LJjXhqnPjHnjeHuUDUfEDMDhoPEiOMMimaiLiUiTdrTRG+P0VJL0byCnu+TJPGtZ+/qjFcUyw76++cIF2Zvkb96RBnENXzgnzey22Qr0rXcpy0Z53dUOoN0ptCZC9+LwT+kUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAdUYTr2fQIfH/t33Mve4tXIBVQg2Vm561Sv9JMKEOAkcMjBdhlg693z4OvA6Tyf3lvylT0zKWQNH8lRq3QD6ypjwaMggVINXjTKePVJjt+LHoh8gZX+D+G/gVhFHFBQ2m5dh4x604HpOfPkcAR1ShRdsFJ/fglUB/wr7iaprwVUfmyz08xvgwh5vgWu3U4I+KBdk2NYAkLn9RiHONsOXmrJFpviLeBHWrr1X0OsuIREgt5a/OQ7QjkaB9qRRQRHwvZvaDywDWFaazo4OqeyGR4J9Asfee6qb7At4j1kubdXmZsidtSz308sfOj0MuwZGgOD9NSMy24WmFK9Hw6IcHUw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC4jCCAcqgAwIBAgIQaTJtYaZwjbxI3iHsDIQGLTANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIFNpZ25pbmcgLSBpZHAtdjIua29uc3RmYWNrLnNlMB4XDTIxMTIxNjE4MTYwN1oXDTIyMTIxNjE4MTYwN1owLTErMCkGA1UEAxMiQURGUyBTaWduaW5nIC0gaWRwLXYyLmtvbnN0ZmFjay5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKFKQrzQqrFkFYNAG+20Dr1HMzDIXgmYT+HHEWLAaZlsFsfTGTpOYOwmuumbSkeugszYCiGDHu+jEPp3qKrA90lHzbDuqCSfUQ/O21dHddKSk0Mf75gft8scKYJNPvIUoBL9qs5CI7CemVp3B/lBb/HSm1fo95wuzYZNSiAsWgewN2x9+51n1yz0yULuN/lz25YEB2SmxoEFn0oT26NT4t5L+pFt9Sfq0WuwHWSFc3uSW5nC95e9JHgBMsrkppsSqRYiKkWK746PNZQYvHH51sJdhzic5m5Cr8wpJQWVjPNvCgLbU7MejzEtOmqsgINJjTX4jt8pOu6m4NWgrk884gECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAf5iQsDuqe1ywdodBe4R4uDgqL5CQO6RiQ/I2B20bQlnWiNGR7FzWAecqFc6+A0G8RRM6b2IlvLwXwOOy688afMhrQxwAh/X1zbClhRvv/3EcgybGJ75P6GwFEAud8xo8vj5RrQ75Yckhnrp9jvXFfaKKHsKXSrrzxLBjo4WSvN0WEaYd5brkT6rPcTwloKTRo/cyTPHd0j+5rQ7VGgAFq42yjAnU0GWclJIZwhqv7/7PXTnjpKs9qfcRNeUUGjVCOD0G8GK96PKEtVUOr/FizKdSqaaBWGWtnfBpT1jDxaE/L6fDI+LPpj2JY/hBK4ER8WhIpBw8rTgQMwKy7Toa3Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.konstfack.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <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:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Konstfack</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Konstfack</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Konstfack</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Konstfack</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.konstfack.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.konstfack.se/en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:IT-helpdesk@konstfack.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-8-4504100</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>