Cleanup part 1 skolverket.

9 files changed, 8 insertions, 111 deletions

diff --git a/swamid-2.0/am-sso-int.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/am-sso-int.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
index 344c5a16..fe64d7b0 100644
--- a/swamid-2.0/am-sso-int.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
+++ b/swamid-2.0/am-sso-int.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -6,8 +6,7 @@
     </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://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/am-sso-uat.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/am-sso-uat.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
index 3d9a5938..867c4f5f 100644
--- a/swamid-2.0/am-sso-uat.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
+++ b/swamid-2.0/am-sso-uat.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -6,8 +6,7 @@
     </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://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/am-sso-utb.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/am-sso-utb.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
index ea26a4f9..894d1aef 100644
--- a/swamid-2.0/am-sso-utb.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
+++ b/swamid-2.0/am-sso-utb.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -6,8 +6,7 @@
     </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://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/am-sso.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/am-sso.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
index 25e0b88d..166b24e2 100644
--- a/swamid-2.0/am-sso.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
+++ b/swamid-2.0/am-sso.skol.sonet.net.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -6,8 +6,7 @@
     </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://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/fidustest.skolverket.se-shibboleth.xml b/swamid-2.0/fidustest.skolverket.se-shibboleth.xml
index eaddb124..2b9b75fd 100644
--- a/swamid-2.0/fidustest.skolverket.se-shibboleth.xml
+++ b/swamid-2.0/fidustest.skolverket.se-shibboleth.xml
@@ -21,10 +21,8 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <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://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
index 28a63022..ea70346c 100644
--- a/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
+++ b/swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -6,8 +6,7 @@
     </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://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
index 2d84a38e..316ecbd6 100644
--- a/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
+++ b/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -6,8 +6,7 @@
     </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://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/test.fidus.sunet.se-shibboleth.xml b/swamid-2.0/test.fidus.sunet.se-shibboleth.xml
deleted file mode 100644
index 0e02df72..00000000
--- a/swamid-2.0/test.fidus.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,94 +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="https://test.fidus.sunet.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-10-08T17:22:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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://www.swamid.se/category/nren-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.fidus.sunet.se/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.fidus.sunet.se/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Skolverket Test SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Skolverket Test SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Skolverket Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är en applikation som låter dig testa federerad inloggning.</mdui:Description>
-        <mdui:Description xml:lang="en">This is an application for testing federated authentication.</mdui:Description>
-        <mdui:Description xml:lang="fr">Il s'agit d'une application pour tester l'authentification fédérée.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.skolverket.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.skolverket.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.skolverket.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>test.fidus.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=test.fidus.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIECzCCAnOgAwIBAgIUArIKrHx+ZmuG42HW/xAupXwUoPEwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAxMTdGVzdC5maWR1cy5zdW5ldC5zZTAeFw0xOTEwMDgwOTQ5
-MTVaFw0yOTEwMDUwOTQ5MTVaMB4xHDAaBgNVBAMTE3Rlc3QuZmlkdXMuc3VuZXQu
-c2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDm7Fwr6qFEU1pnAkiV
-nxjldwWBosMMAGXa9fvckyRknGlGdhSP780j8BNf+ON5AtawQfR0CWpyHW2EREKZ
-rVBhAIMo6gEuL1MrKGTG+SMZxypQR1u1ldUbm3G+uTAf+setdj5mhDWYUOImDmwO
-8I018BwCPEjExzl+29H33DuOeR6jlSFwiLSBdYrWrMqYQWpXaUY3MMEHTBRqQcna
-79PqeyuxorwscNtDRQbXDZHScouv/i5NmMWVTdzLljh81k490rqhBkYjTbBjEDTE
-A3moD1Acpp/6GtGjlKRlQ7injKybe1Ce+CACl5Olpt4KbcRFvFBBzB2w38WnpO7q
-EpEf/i5R2fMIcLL9Jl+zzGFO9F/RQNGuiY/dV+WvV/0AGLr2jurgNKVba1ymJ5Zt
-anydBaw9+TrHqMNulSOIND0EXsgp6uSsMCPpQe3CpEjf4fVKrhPgvt+HM55ezCDe
-4wH9w+DZWvFK3A5sIop2Y/eUB968h6Mc89w5VlB5OffPtlsCAwEAAaNBMD8wHgYD
-VR0RBBcwFYITdGVzdC5maWR1cy5zdW5ldC5zZTAdBgNVHQ4EFgQU0K4ThJ+Jmj37
-suRvspb7+PRMj/kwDQYJKoZIhvcNAQELBQADggGBAJpCA7tbBSYq/NMfMWiPxKhS
-cYGDk10q98kXFgYvU5g/BRqwpH7+/qmGttxu29J2jzsvBENR1vuAXGn9BL1ZX0l/
-eLk/OujwwL3OgikSnQ/sg0FUdLoImJFpllM6mLvNxJs59g9zhHyNy9nmB8bm5iFy
-X12sctsjGlmLBafhrgbv1/cwM0xUUgtYAD4lVQJ04UWGfvE+5u8JLM/PGKRaO4f6
-A51fmBiVczcvq61iBz1P6ov7fP8/KhWJZSUo6t0T56XzH4CLxN/cYzQyPXj2Wtrg
-z1I2pl3KMCOLEzMM/tZooWiWCq25Gxx/8kXd75abHbRNYZHLvvT2r94EFPudhYXp
-uh2HvbGuGG0mzzh/gEAUtDspXL1z4h1fMl7dAdwADJfJHoMkWfjLErX3FqgoCdKJ
-dIb8mmF5DnSxkx2/yZHAugGjT/Em7wFmxW4dGIcKW6E0SooEFipqL6DAc2eGUqW5
-cd+V1UUi75bzOFLIwOG+rlNfW0VrQahhszWu0UMHXA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.fidus.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.fidus.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.fidus.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.fidus.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.fidus.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.fidus.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 89f0cf38..50d9e444 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -467,7 +467,6 @@
   <xi:include href="swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/sig.idsec.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/halon-eu.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test.fidus.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml"/>