SWAMID-897: Updated flax.nettst.chalmers.se

1 files changed, 77 insertions, 45 deletions

diff --git a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
index b25e0be1..fe508ce6 100644
--- a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
@@ -4,53 +4,85 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-17T12:29:10Z">
       <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">
+      <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:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
+      </samla:Attribute>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <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=http://flax.nettst.chalmers.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=http://flax.nettst.chalmers.se/adfs/services/trust">
+    <md:Extensions>
       <shibmd:Scope regexp="false">nettst.chalmers.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>
+      <shibmd:Scope regexp="false">chalmers.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Chalmers test</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Chalmers test</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Identity Provider for Chalmers (test)</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for Chalmers (test)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.chalmers.se/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://www.chalmers.se/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="sv" height="81" width="625">https://www.chalmers.se/SiteCollectionImages/Logotyper/Chalmers%20logotyp/Chalmers_black.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="81" width="625">https://www.chalmers.se/SiteCollectionImages/Logotyper/Chalmers%20logotyp/Chalmers_black.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
             MIIDxTCCAq2gAwIBAgIUd6HjHPm3c+w9WK7GshdZwbGl394wDQYJKoZIhvcNAQELBQAwcjELMAkGA1UEBhMCU1YxCjAIBgNVBAgMASAxFDASBgNVBAcMC0fDg8K2dGVib3JnMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMSAwHgYDVQQDDBdmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0yMDAyMDUxNDQyMDlaFw0zMDAyMDQxNDQyMDlaMHIxCzAJBgNVBAYTAlNWMQowCAYDVQQIDAEgMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzERMA8GA1UECgwIQ2hhbG1lcnMxDDAKBgNVBAsMA0lUQTEgMB4GA1UEAwwXZmxheC5uZXR0c3QuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxUIvhpYaSc7UfeV0XDRifE9U/oSh2UZKI5PHhoIq8hwFFkjmpI5dSKCHZDypl4gIkuPr8hXdaIxdvLGNL021+ilpdBCUn9mZl8BdKraCOGxjuqBuq2yNdg+Ao3SgJvp4HiAJAaqtzfU1HY9Qb+Ab80mCzeS/6RpepDcrOMw4TGBopoDc4QoxPz7/AY6Q/F9qgRuNVxXBKDrwiE8lR4GyQgak1mHp+w5GtSG4dMWncqHupgtazS5lAzOO11cRi+/x8ooiEnJvAzdbtjEKOfd/ENRkVLtYrb19cEduC3YBzAgNXx931X/U8g8scIb1mwwiou3v/FfW7kkPBAXGz2i7pAgMBAAGjUzBRMB0GA1UdDgQWBBTjAEdvtF865Ag04s8z/Xjq6AEuJzAfBgNVHSMEGDAWgBTjAEdvtF865Ag04s8z/Xjq6AEuJzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDrtyrlt4VtpVZfPBB6MU+3AkINCAaQUsa2UK7enkLAf7PLxikspijRqDEGT45uygajxXAviZeLorLHEE/4sz2XJCvpyDy2h9YXQMNZhCEnrETgvmIc4TRpBzSwb63eUVHbasgYHTKB/WH+VtBGj22SeeMJlykDp25lwfmbudRPMXHUd9O7HNRCbKmG2kK+EOmkotikdxkFDcJWpES8GH7Jcjt3gE920Oin+2K4ZMJkaI+7YjqokJgrVPbprMX25ldS7fAKmNFBwiW7tFnITwOLqsmcMiEKe/6gkK6/n1i6isAeiyFpojU1kMikvFretXEGxJsiS01NZEvqD+3Ze1F5            
-          </X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
             MIIDxTCCAq2gAwIBAgIUd6HjHPm3c+w9WK7GshdZwbGl394wDQYJKoZIhvcNAQELBQAwcjELMAkGA1UEBhMCU1YxCjAIBgNVBAgMASAxFDASBgNVBAcMC0fDg8K2dGVib3JnMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMSAwHgYDVQQDDBdmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0yMDAyMDUxNDQyMDlaFw0zMDAyMDQxNDQyMDlaMHIxCzAJBgNVBAYTAlNWMQowCAYDVQQIDAEgMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzERMA8GA1UECgwIQ2hhbG1lcnMxDDAKBgNVBAsMA0lUQTEgMB4GA1UEAwwXZmxheC5uZXR0c3QuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxUIvhpYaSc7UfeV0XDRifE9U/oSh2UZKI5PHhoIq8hwFFkjmpI5dSKCHZDypl4gIkuPr8hXdaIxdvLGNL021+ilpdBCUn9mZl8BdKraCOGxjuqBuq2yNdg+Ao3SgJvp4HiAJAaqtzfU1HY9Qb+Ab80mCzeS/6RpepDcrOMw4TGBopoDc4QoxPz7/AY6Q/F9qgRuNVxXBKDrwiE8lR4GyQgak1mHp+w5GtSG4dMWncqHupgtazS5lAzOO11cRi+/x8ooiEnJvAzdbtjEKOfd/ENRkVLtYrb19cEduC3YBzAgNXx931X/U8g8scIb1mwwiou3v/FfW7kkPBAXGz2i7pAgMBAAGjUzBRMB0GA1UdDgQWBBTjAEdvtF865Ag04s8z/Xjq6AEuJzAfBgNVHSMEGDAWgBTjAEdvtF865Ag04s8z/Xjq6AEuJzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDrtyrlt4VtpVZfPBB6MU+3AkINCAaQUsa2UK7enkLAf7PLxikspijRqDEGT45uygajxXAviZeLorLHEE/4sz2XJCvpyDy2h9YXQMNZhCEnrETgvmIc4TRpBzSwb63eUVHbasgYHTKB/WH+VtBGj22SeeMJlykDp25lwfmbudRPMXHUd9O7HNRCbKmG2kK+EOmkotikdxkFDcJWpES8GH7Jcjt3gE920Oin+2K4ZMJkaI+7YjqokJgrVPbprMX25ldS7fAKmNFBwiW7tFnITwOLqsmcMiEKe/6gkK6/n1i6isAeiyFpojU1kMikvFretXEGxJsiS01NZEvqD+3Ze1F5
-          </X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://flax.nettst.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.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://flax.nettst.chalmers.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">CHALMERSTest</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Chalmers Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.chalmers.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Chalmers</Company>
-    <EmailAddress>mailto:appro@chalmers.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Chalmers</Company>
-    <EmailAddress>mailto:nrq@chalmers.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Chalmers</Company>
-    <EmailAddress>mailto:biorn@chalmers.se</EmailAddress>
-  </ContactPerson>
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://flax.nettst.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.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://flax.nettst.chalmers.se/adfs/ls/"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CHALMERSTest</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CHALMERSTest</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Chalmers Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Chalmers Test IdP</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.chalmers.se/en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.chalmers.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Chalmers</md:Company>
+    <md:GivenName>Björn</md:GivenName>
+    <md:SurName>Sandell</md:SurName>
+    <md:EmailAddress>mailto:biorn@chalmers.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Chalmers</md:Company>
+    <md:GivenName>Niklas</md:GivenName>
+    <md:SurName>Rosenqvist</md:SurName>
+    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Chalmers</md:Company>
+    <md:GivenName>Servicedesk</md:GivenName>
+    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>