Merge branch 'master' of git.swamid.se:swamid-metadata

6 files changed, 6 insertions, 85 deletions

diff --git a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
index a2bf2d91..3e5d6876 100644
--- a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -39,28 +39,6 @@
     <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAMGFkfoHjxyVMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5pdC5zdS5zZTAeFw0xMDExMDkwODIyMDFaFw0yMDExMDYwODIyMDFa
-MBcxFTATBgNVBAMTDGlkcC5pdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALy4tcsCvWZi8mo07/AwkbbokGh9VLf9Nae6t8AXX+ul9AOfW6nT
-OJS4UsSafJ/fLhNJTjtMr1lXyl2Ah2zhhrhCsFpe0T7iYaX+rKlcZ8/V/BkgVbKm
-5obDh/CGW32dPGS6quDSTw2876X5sOl72IE4h038Z6t9XJCdQwDK9YNPgb5Zu+XH
-PHLJZD/kx+VwAPfx34YoKCpB2C/3U2Nj+KsojMtRcNTLeb+PJ5t0B9vEsGOcOlko
-7VT9EjEuSkyxRPEmssaekotHDlkKB9R3d/LS/OvWdHd4UjgQGJO8YIebTjIYQDk+
-HPs9HhL4mJBUqTYK7aKE/gelBwEKgm9myzkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-aWRwLml0LnN1LnNlMB0GA1UdDgQWBBQ3SkZT5Th4yF7H6i2+x0beJnXTEzANBgkq
-hkiG9w0BAQUFAAOCAQEAiatjbM0+PvK1enL0CCoVHoPSBwT45eq5e4YGVabqX2Vt
-kuuZpg3O/POnPI4VUENEPZqrsRQJwjvfVlptgU/0C1IdBdKZbQPdci2kTcNHPtj9
-+AjFPs8D/rRAHufDCO/yUV7v6rDaLwVDlGA+Tof/2OISRubHA+qzWtsmkCij8epu
-zu+8YH3ao8Z9KwXE7lsiugc3fBzFPRLVt3i1Ub9CyHbSNt8zIeoQjdFXnRSFt1aF
-nqSwQqyaQMsQOyHiGNfFl0bcvK3if21MSob/uUwXHgE9wn6wD7fHHp8Ek8Pa7F1Y
-VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>
             MIID9zCCAl+gAwIBAgIVAKM4svIX/6tsrDcGeAmq/Nkr4crjMA0GCSqGSIb3DQEB
             CwUAMBcxFTATBgNVBAMMDGlkcC5pdC5zdS5zZTAeFw0yMDEwMTIwNzU3MDJaFw00
diff --git a/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml b/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
deleted file mode 100644
index 0d7d2852..00000000
--- a/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp1.artologik.net/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Artologik Survey&amp;Report</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Artologik Survey&amp;Report</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Survey&amp;Report är ett webbaserat och flerspråkigt program som gör det enkelt att skapa professionella enkäter för undersökningar och utvärderingar.</mdui:Description>
-        <mdui:Description xml:lang="en">Survey&amp;Report is a web based and multilingual program which makes it easy to create professional surveys for evaluations.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/en</mdui:InformationURL>
-        <mdui:Logo height="64" width="350" xml:lang="sv">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/sv/logo.png</mdui:Logo>
-        <mdui:Logo height="64" width="350" xml:lang="en">https://www.artologik.com/documents/artologik/pages/surveyandreport/swamid/en/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC5jCCAc6gAwIBAgIQfLtyFs6eGJ1HiLyQQOQWqzANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSBpZHAxLmFydG9sb2dpay5uZXQwHhcNMTgwOTI2MTgzMDU0WhcNMjMwOTI2MTgzMDU0WjAvMS0wKwYDVQQDEyRBREZTIEVuY3J5cHRpb24gLSBpZHAxLmFydG9sb2dpay5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtknWjEAW0GHN9fYKqCDMiGSTmvXZbQQ7YkYzVYb4IufVGKm48NwDrvQO1yeIyi3lQNsWv6hqQ8Ir2pg/jK+qqU84JzwWAh13Wqr1Y3ST5E/ivTzAsJnugcE9qDO1Andjg3YG0XQm6sOPwHdIgeFbm6+lCtE9b01BF2zRYjAM7OOghBHNLKY920g6x4neY7DBhLwlwSCRAWejRGuoAtb6YjBDy5H1jwW76eww0TX5tBhjYY83bGEozZ/JiM97TjYpjR3vGscml4gA1jw+SClClWaj861ePkGLE76eZyvmfmRq2vzPwdybfzm04D4AX5cbgqwyTm7ebd/hxRFCxkBJfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAG28EKsRUgx7o2hbIVGnnta9hPxwEnjabdbZHBB2rmK5CWUCflfkR3dfdVXTMKxDL8TmUKsniYXCKYwwmdLDoig67pmQJp/RlG/Pu/AqunWa2B+UJB98ig0yZ4Fq98zqmCNavB86pNEZzASWjbjek7UcYVHDZQEXhoh0DSpJNVtdt/XP9snUBA7cW/e0eEzldE1U3HaAZvo87/YQJLbrj8zJSlPuX8s4X77F+ciDcBc+0gaaoKwkVQ0qakWBVSAlvmtZ52m47SmaVadoBMgIY7rNxz1X4NksaDNnwsyI668eHuMtARxgB5U+T+M7diiEH74WH+8+Zay2yQIT0t2IXqE=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC4DCCAcigAwIBAgIQGg78S83wD5hLdA0QeCu3XTANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSBpZHAxLmFydG9sb2dpay5uZXQwHhcNMTgwOTI2MTgzMDU0WhcNMjMwOTI2MTgzMDU0WjAsMSowKAYDVQQDEyFBREZTIFNpZ25pbmcgLSBpZHAxLmFydG9sb2dpay5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnhBaL67YmepU0JdaJVIZedbjqjzP93H6Fwpsl2OHC62ve54h/Ts8PkIvWNifiEhLC/NZ2RZjSmHKUTMZ2MmNNZm2EDaNZFamqkMeSKnkhKKwAlyierYL0qFJPYGVJ+z3u52KsRMm4V5+2jGMEPcmzn/Y+/h9ptThhA94jejm3f0hFV3s+NyOA3nDsw6PotuHAL0IQWJ0jqFVQQM2uurIG2q8KAqcbMnM+hiRilMEQBI7RnRgfsdT/Ma24KSdEs/Ao6wIGxBN/0pfDh8avdJcd6LXSO/Z9aqAMOX5dap8K8mtP2jg3+8nFITddxzEBVCQeljjuw7nW+qdsyY1D+n6rAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACaY3QjUmbLMnERVOoYzuksfw/3aGoozNhfcpJuf7zWJIm0IghJwXBEYez6yS1xodqeHoB45iWr+UxEQaS1eYTg2kCF+pbztk+BtVi0Yly8STsL1lOsz9Yz1e3Doofva42zvJXh9TRl1u/pFnI2Xp8l3TIWafuj2tgwmmm6rN8RPdPmdCp4iAWOwqfU1xBd8+M+aa6Iql+TjUKLJVsteQbUwLwe5tH6/GxnZ0IJsB90R77EochF8SHgVSUY7e3Vzj2jQy5w8hl9c2PIdiUUOegrizDODKVLxhc9Iv7sjE0OzyUeSVAk0Jd15Fa1dqrStLBTU7qhle5Yx+BufBM5FyyE=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.artologik.net/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.artologik.net/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>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.artologik.net/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp1.artologik.net/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.artologik.net/adfs/ls/" index="2"/>
-  </SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@artologik.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <SurName>Info</SurName>
-    <EmailAddress>mailto:info@artisan.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <SurName>Hostmaster</SurName>
-    <EmailAddress>mailto:hostmaster@artisan.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/indico.fysik.su.se-shibboleth.sso.xml b/swamid-2.0/indico.fysik.su.se-shibboleth.sso.xml
index 4e47f0b3..165f3133 100644
--- a/swamid-2.0/indico.fysik.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/indico.fysik.su.se-shibboleth.sso.xml
@@ -95,6 +95,10 @@ FwgoenLfYvwhMMTrLnihQgG7zjiDK7bJrnONepZURLDmrykmJ9ORWxgAbpttnIPK
     <md:SurName>Fysikum, Stockholms Universitet</md:SurName>
     <md:EmailAddress>mailto:dsa@fysik.su.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Alex Kastanas</md:SurName>
+    <md:EmailAddress>mailto:kastanas@fysik.su.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:SurName>Alex Kastanas</md:SurName>
     <md:EmailAddress>mailto:kastanas@fysik.su.se</md:EmailAddress>
diff --git a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml b/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
index c051c1db..2814c880 100644
--- a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
+++ b/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
@@ -19,6 +19,7 @@
       <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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index f0be64cb..525ace00 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -48,4 +48,5 @@
   <xi:include href="swamid-2.0/signservice.edusign.sunet.se-sigservice.xml"/>
   <xi:include href="swamid-2.0/crowd.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nextcloud.fysik.su.se-swamidproxy-nextcloud.xml"/>
+  <xi:include href="swamid-2.0/indico.fysik.su.se-shibboleth.sso.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 8a569297..d04484c5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -547,7 +547,6 @@
   <xi:include href="swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/backweb.test.antagning.se-hubble-sp.xml"/>
   <xi:include href="swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml"/>
-  <xi:include href="swamid-2.0/idp1.artologik.net-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/backweb.antagning.se-hubble-sp.xml"/>
   <xi:include href="swamid-2.0/anvandare.antagning.se-anvandare-sp.xml"/>
   <xi:include href="swamid-2.0/proxytest.kib.ki.se-shibboleth.xml"/>
@@ -584,7 +583,6 @@
   <xi:include href="swamid-2.0/indico.nordu.net-mellon.xml"/>
   <xi:include href="swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml"/>
-  <xi:include href="swamid-2.0/indico.fysik.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/ams.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta-nyasidorna.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/appstest.convertus.se-shibboleth.xml"/>