SWAMID-815 idp-v2.suni.se updates

1 files changed, 62 insertions, 49 deletions

diff --git a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
index 57246da7..dc6f0803 100644
--- a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
@@ -4,67 +4,80 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-22T08:06:40Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <shibmd:Scope xmlns="" regexp="false">suni.se</shibmd:Scope>
     <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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.suni.se/adfs/services/trust">
-    <Extensions>
-      <shibmd:Scope xmlns="" regexp="false">suni.se</shibmd:Scope>
+  <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.suni.se/adfs/services/trust">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Södertörns högskola</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Södertörn University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Identity Provider för Södertörns högskola</mdui:Description>
         <mdui:Description xml:lang="en">Identity Provider for Södertörn University</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sh.se/p3/ext/content.nsf/aget?openagent&amp;key=startsideportal_engelsk_1308725461229</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="118" width="604">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="118" width="604">https://www.sh.se/p3/ext/res.nsf/vRes/global_1448973984543_sh_ny_logo_eng_png/$File/sh-ny-logo-eng.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://www.sh.se/english/sodertorn-university</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="118" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="118" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sh.se/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.sh.se/english/sodertorn-university</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC3jCCAcagAwIBAgIQIkwNwJfVWptHttTrpB3rNDANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBpZHAtdjIuc3VuaS5zZTAeFw0xOTAzMTkxMTA5NDlaFw0yOTAzMTYxMTA5NDlaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGlkcC12Mi5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqMlb2IIsV9GO1iS5FLuhJsrLbnWd/0OXt1Wj14ezOxF53BwgLtV41SM0pkKt3z8UHD2zREc7xNsTitbPAkgTPclxFzGB+mtKUEzAwgrexEJ9JH6jTdVGP2OBKFhUAu/HRE5o650rZnhk2nB9sIw70EucHdjVuNe05SZRCmZAQ4HfoDXmk8ErJD31vD/JZLgtrErEM0biIr9d/5q5iSla0AQu57pkQe8WPw+HDvKMDpUZlRGq+lnk5DtMb4RC80aMA5isvKwtK0JszB+QFCLoUJN6BQHfK+Rx96htlaQjRwBvTv5zEhMPO2q+nlaAifRAtxlpYUPm2TgnZi+DCwXH/QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCjrunhaobr/YVPRa+19IYgA6fnatRHqaT+oScinTHqErsi6j9ixyK2WvVAMnjIa4miu/6HK6Vg7l7/RcsOXUJt+YFQYV+sPM/O6BbqZPDgF6tHVFBFiR378WMmgDttm8w5aVQu1JlE3fqY3iswuas6lIoKV6g3PQC3IzspJbIb6B3euzmcZ3G1rOWod5tN3laEMgknqJgrl5qQs641bEZa76quQEFC8cEEN/neudh4pWdWjHbmjRqOum3E4uzB6raOzKDuSAI3OxITFlAHoPxsHxr4QbmRaVmq1b00hVS+BVjNbFO73mtnq5rQOl/cUj+gJ3k4oG1fWOMV0t/Q0p0p</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC2DCCAcCgAwIBAgIQbkY9lWXDKI1D4sdF+i8NgDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBpZHAtdjIuc3VuaS5zZTAeFw0xOTAzMTkxMTA5NDhaFw0yOTAzMTYxMTA5NDhaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGlkcC12Mi5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA39GVqOrXOHszgzr/gu9b/qbpUvPyib4KHoPULNewurYFJIZn4zwPwkJlh6cVgzOhzxoj9GS64tWmVF7+6ycG+XER6m6qNmCgcWTWBhEgiBl9208h831RndRK06TwxRbWL1WdxQ00v6II+s35AO9CN9HYHZoQMH8ga/LEnOlGNXhHoPbaec4WfKAWfWXqy/eei9P4YeKWkefuKjhUkD3twZ+9S6b7rHMvf4gOvnIL4+dOOzlgrIzSBSEJeW2kHTVkuLfUsjIqWu51hM/9+LW1mHV16Ewx1DVqff2N/9h+xxtZHDjaHr/Haa1YW9HjgtPzaUxKKcJUS/r1cGp8oILUsQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAmfCcEwPUaq04Wgs3SS+OYtbiJQp2twSlY6rPSeVSVU5c4F9Epefjw0VEHMZupg5ZV6NRtHV0S5znx3yRe1w/hqCSphgQcfyPUcx/a4+lO4XM0glPJ9W/PkzjgiylPuCvrtVk1n15iC7xudxtb29B4IRL0l4NNJJhKzva1ZnGB+joC1p9xuuswgm1RWK+dgyyRAicps9ynpVMMZZ8uZCTMmawE2NfrTUcEhs4JSWpZBFaWLN25gaR4yHZlk1itL7SByWSM7pFCIKKcbjc5T67il7mZOSmChfBcgm5mGtgkj1xd+E/X+FPtQkzS9aX17hw94G/3O6iTV2t9EcDQvRvl</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.suni.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.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.suni.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Södertörns högskola</OrganizationName>
-    <OrganizationName xml:lang="en">Södertörn University</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Södertörns högskola</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Södertörn University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.sh.se</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.sh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <GivenName>Tomas</GivenName>
-    <SurName>Legat</SurName>
-    <EmailAddress>mailto:server@sh.se</EmailAddress>
-    <TelephoneNumber>+46(0)8-6084000</TelephoneNumber>
-  </ContactPerson>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC3jCCAcagAwIBAgIQIkwNwJfVWptHttTrpB3rNDANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBpZHAtdjIuc3VuaS5zZTAeFw0xOTAzMTkxMTA5NDlaFw0yOTAzMTYxMTA5NDlaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGlkcC12Mi5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqMlb2IIsV9GO1iS5FLuhJsrLbnWd/0OXt1Wj14ezOxF53BwgLtV41SM0pkKt3z8UHD2zREc7xNsTitbPAkgTPclxFzGB+mtKUEzAwgrexEJ9JH6jTdVGP2OBKFhUAu/HRE5o650rZnhk2nB9sIw70EucHdjVuNe05SZRCmZAQ4HfoDXmk8ErJD31vD/JZLgtrErEM0biIr9d/5q5iSla0AQu57pkQe8WPw+HDvKMDpUZlRGq+lnk5DtMb4RC80aMA5isvKwtK0JszB+QFCLoUJN6BQHfK+Rx96htlaQjRwBvTv5zEhMPO2q+nlaAifRAtxlpYUPm2TgnZi+DCwXH/QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCjrunhaobr/YVPRa+19IYgA6fnatRHqaT+oScinTHqErsi6j9ixyK2WvVAMnjIa4miu/6HK6Vg7l7/RcsOXUJt+YFQYV+sPM/O6BbqZPDgF6tHVFBFiR378WMmgDttm8w5aVQu1JlE3fqY3iswuas6lIoKV6g3PQC3IzspJbIb6B3euzmcZ3G1rOWod5tN3laEMgknqJgrl5qQs641bEZa76quQEFC8cEEN/neudh4pWdWjHbmjRqOum3E4uzB6raOzKDuSAI3OxITFlAHoPxsHxr4QbmRaVmq1b00hVS+BVjNbFO73mtnq5rQOl/cUj+gJ3k4oG1fWOMV0t/Q0p0p</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIC2DCCAcCgAwIBAgIQbkY9lWXDKI1D4sdF+i8NgDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBpZHAtdjIuc3VuaS5zZTAeFw0xOTAzMTkxMTA5NDhaFw0yOTAzMTYxMTA5NDhaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGlkcC12Mi5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA39GVqOrXOHszgzr/gu9b/qbpUvPyib4KHoPULNewurYFJIZn4zwPwkJlh6cVgzOhzxoj9GS64tWmVF7+6ycG+XER6m6qNmCgcWTWBhEgiBl9208h831RndRK06TwxRbWL1WdxQ00v6II+s35AO9CN9HYHZoQMH8ga/LEnOlGNXhHoPbaec4WfKAWfWXqy/eei9P4YeKWkefuKjhUkD3twZ+9S6b7rHMvf4gOvnIL4+dOOzlgrIzSBSEJeW2kHTVkuLfUsjIqWu51hM/9+LW1mHV16Ewx1DVqff2N/9h+xxtZHDjaHr/Haa1YW9HjgtPzaUxKKcJUS/r1cGp8oILUsQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAmfCcEwPUaq04Wgs3SS+OYtbiJQp2twSlY6rPSeVSVU5c4F9Epefjw0VEHMZupg5ZV6NRtHV0S5znx3yRe1w/hqCSphgQcfyPUcx/a4+lO4XM0glPJ9W/PkzjgiylPuCvrtVk1n15iC7xudxtb29B4IRL0l4NNJJhKzva1ZnGB+joC1p9xuuswgm1RWK+dgyyRAicps9ynpVMMZZ8uZCTMmawE2NfrTUcEhs4JSWpZBFaWLN25gaR4yHZlk1itL7SByWSM7pFCIKKcbjc5T67il7mZOSmChfBcgm5mGtgkj1xd+E/X+FPtQkzS9aX17hw94G/3O6iTV2t9EcDQvRvl</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-v2.suni.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.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.suni.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Södertörn University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Södertörn University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.sh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.sh.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Tomas</md:GivenName>
+    <md:SurName>Legat</md:SurName>
+    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46(0)8-6084000</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tomas</md:GivenName>
+    <md:SurName>Legat</md:SurName>
+    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46(0)8-6084000</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Info</md:GivenName>
+    <md:SurName>Center</md:SurName>
+    <md:EmailAddress>mailto:info@sh.se</md:EmailAddress>
+    <md:TelephoneNumber>+46(0)8-6084000</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>