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

6 files changed, 290 insertions, 1 deletions

diff --git a/swamid-2.0/blender.c3se.chalmers.se-a.xml b/swamid-2.0/blender.c3se.chalmers.se-a.xml
new file mode 100644
index 00000000..3440c1af
--- /dev/null
+++ b/swamid-2.0/blender.c3se.chalmers.se-a.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blender.c3se.chalmers.se/a">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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#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/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/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>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://blender.c3se.chalmers.se/Shibboleth.sso/DS/ds.swamid.se"/>
+      <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://blender.c3se.chalmers.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">SUPR testserver Blender</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SUPR test server Blender</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Testserver (Bleder) för SNIC User and Project Repository (SUPR).</mdui:Description>
+        <mdui:Description xml:lang="en">Test server (Blender) for the SNIC User and Project Repository (SUPR).</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>blender</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=blender</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJANNMJ7yc9qvmMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+BAMTB2JsZW5kZXIwHhcNMTQxMDIyMTI0NzU1WhcNMjQxMDE5MTI0NzU1WjASMRAw
+DgYDVQQDEwdibGVuZGVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+ycq1F54xhth3uUvpr4lxftTZAE84k6LFlFkDBCtULpfyRhyMaQfJaDzxFlOVJkIn
+03WzAxkrL7iP+jFnix2RNFLJ3kH7PRk8M0riDNTsbOYQu363lZR7Ncs3udEo/XCa
+RKFDwy1kciUo7hReXqRm02ksFFKK1C6w7qtaacaHchkM0dxB/Ayo+qk2fndxkGf6
+vsZpSMRGv4bMUP/aDdltQKmfm5L7NJtRFJpalmGxAei+nBob3Y7NFSU5sCEJdqiW
+X7EEHd/XmtZBmtac4ra1sFNchEkSOK1Ck5r2V4UnkE+9jaCzZsEcR4WZ5IO/ylY9
+MFmyq679QnU/9MQkh6ehCwIDAQABozUwMzASBgNVHREECzAJggdibGVuZGVyMB0G
+A1UdDgQWBBRE3li20My8oEktpqJ99fJtpS9vEzANBgkqhkiG9w0BAQUFAAOCAQEA
+Be88ex3VQoUdYc59jamJyYFvI7OQlJTSqoT580xIQGOEIBAguNqx4jDMR1J/yktR
+kvmDsyTk4K+ffUH+FImgyxFxncIDG6qel8ZvZFEQEJE7cfkOEdpcW9C40wzKXpdg
+9v8yAk0EVgjXiZH3qpOmtz24T6odd9df7TFz8Ra8xW9rcRWs1X/7ddEstAKb5zAv
+iRZMW9h3/0zvnfiotCSWcyRlvaC4W34Jon2JOdG/dDn7dx71OKBWnVIvojMR97NY
+l7/8pvi1GPfE2Nswhi8G5dZLNWNh2+mNO1E/zMRaYZPZJW+3Pw7hmF8kCVFXNBeA
+wtfo4cuUZJ2I0K9K0VcFYQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <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://blender.c3se.chalmers.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blender.c3se.chalmers.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/data.kb.se-shibboleth.xml b/swamid-2.0/data.kb.se-shibboleth.xml
index 2965857e..61158b05 100644
--- a/swamid-2.0/data.kb.se-shibboleth.xml
+++ b/swamid-2.0/data.kb.se-shibboleth.xml
@@ -16,6 +16,13 @@ and do *NOT* provide it in real time to your partners.
     <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
     <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/eu-adequate-protection</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>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
diff --git a/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt b/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt
new file mode 100644
index 00000000..93529b1c
--- /dev/null
+++ b/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt
@@ -0,0 +1,63 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_d2986734dcdc5674ace6fe12d153beec095ab2e8" entityID="https://expert.uhrdemo.antagning.se/aws-sp-en">
+  <md:Extensions>
+    <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:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://www.swamid.se/assurance-requirement">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://expert.uhrdemo.antagning.se:446/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>expert.uhrdemo.antagning.se</ds:KeyName>
+        <ds:KeyName>https://expert.uhrdemo.antagning.se/aws-sp-en</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=expert.uhrdemo.antagning.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDRzCCAi+gAwIBAgIJAJfxsCaOWkxRMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZTAeFw0xNDEwMjAxMjUzMTha
+Fw0yNDEwMTcxMjUzMThaMCYxJDAiBgNVBAMTG2V4cGVydC51aHJkZW1vLmFudGFn
+bmluZy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANDwqlMZ9iz5
+VJANM6co6vl//O6rIjhm/dbqwqwPWRUQJEi9a3wp47tpCraKfAd2iIjsTa3+dvuc
+jvIuxp355ZOe9wkXADkeqpdD3HqxgRMf31v1zxd6ABeaBmmFLihSTShmrf69wvTN
+aaU2N0pXUCTM6prEQ/EOMvk7kxFJOTf2ciELWCGAO+bcLoTZ8pXnKZ1hze9vUGJy
+9SSAq4gDgzB2yKRV2UwXRCYUthcewb0RlejYtJkJlu21XzJKo5A+CIx7DEj66ZOG
+fk8OdrTVtKZTqzZD2yl7F82yIoo1UCFkVWSmUDj1ObXEzI5x940UoYr0twwQ5jMg
+/AmOdFBD/qkCAwEAAaN4MHYwVQYDVR0RBE4wTIIbZXhwZXJ0LnVocmRlbW8uYW50
+YWduaW5nLnNlhi1odHRwczovL2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZS9h
+d3Mtc3AtZW4wHQYDVR0OBBYEFKCp9bZIbKEPAefJavvCWNo4ZbQDMA0GCSqGSIb3
+DQEBBQUAA4IBAQCa8NZ091egdPM83IaUIIBBCQjWWkynQWC5mANETQ3kkNOk0+Ex
+W+DnlOpzRUf0zgsDFnyaGxX2AUWwldzUPE1Sbx8iGxMrlvRFgsRIIhgvcs4g27Fz
+R9x/WVKJnAO3RIkIBmAcN/fpnoxNUiSnM3CumjuTWzOUPXlpRApoXvfLeBOdNljL
+uCP0zpdAAilt9SIJtPY16GGUxf3Q7MLtXM6wlMMwTwNFqybbLED1h5sWWzgy6f2L
+o5gjWAsejZSBtsnrDMnIiVxmpC0lRAs01YZNzubAE/4nOgK0UkDcUvKRe71maUng
+t73BO6E9LjRk4iDy6Je9FYTwCAosy3V6dZxD
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.uhrdemo.antagning.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt b/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt
new file mode 100644
index 00000000..777d3ff1
--- /dev/null
+++ b/swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt
@@ -0,0 +1,63 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_310466456749a09f87bb3835cdc60263e7d05e48" entityID="https://expert.uhrdemo.antagning.se/aws-sp">
+  <md:Extensions>
+    <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:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://www.swamid.se/assurance-requirement">
+        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://expert.uhrdemo.antagning.se:444/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>expert.uhrdemo.antagning.se</ds:KeyName>
+        <ds:KeyName>https://expert.uhrdemo.antagning.se/aws-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=expert.uhrdemo.antagning.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDRDCCAiygAwIBAgIJALz2sBBLqMf6MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZTAeFw0xNDEwMjAxMzQ1MzNa
+Fw0yNDEwMTcxMzQ1MzNaMCYxJDAiBgNVBAMTG2V4cGVydC51aHJkZW1vLmFudGFn
+bmluZy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALbOIRmxfwWb
+yMkMOPODCqatRVJtc0eEDa5JCTcv03K+Ctrm0ERm1tfFpgRyBMp4gTFlAb6x/sUQ
+Y0LOsbupRN4jy9zLYYTMGDZtPclKWTmeYghYnVYk4uDNqRZhPoQ5jThb1ZN1cF6a
+EPde+GqpLNP/6vSlkmTb8fQMR+jTiAHIar5wgjrdy71czFrVNzLvE6aeAAj1Ltgo
+OpRkvUvv6tJvGNy/zIDWMCwXOp2g19c1fjsv9cGZDOzXUDDkDKp64yTAYVW7JlAX
+9e0mP5Y7cMVAbrygaoPqZWpuRIrLXm09rHXO1IwZr84FvslzMPga/AeUHuEOaPId
+4PqGc6M4k88CAwEAAaN1MHMwUgYDVR0RBEswSYIbZXhwZXJ0LnVocmRlbW8uYW50
+YWduaW5nLnNlhipodHRwczovL2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZS9h
+d3Mtc3AwHQYDVR0OBBYEFDvjW1sTBeDuIGWsbEZD/P/16bwnMA0GCSqGSIb3DQEB
+BQUAA4IBAQBSlW+rxm2rcJuJrKWcrosdHV2NvebZs7hEofN2HFVc6N4i1mT72p6i
+zysIRUq+w9kJJO8DZMHnp2/jijg1zheWOmazsbNW1oEJX3xp9PCT6chxWepZpLjg
+jGJgC6cCj5y+m7QKTIwVeqwzPJbDfcN2B3IXaplfuBG4psDoTYlirymCRQQtSewY
+peixelFpX7cxoKJriN2mIV9KnCyfNJIAe+fmUHhqBZKVsz1m72jr7dtbMPo6Mo8Z
+PsIf/yVavv75z7lQcOvuV3H8wECX4rTZV860ByFV6hSCYSpS7/L5M8SD2vyhhJUs
+06JLG6j3mY0H9dW9Ty9RzPYf97RSHj4k
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.uhrdemo.antagning.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-2.0/expert.uhrdemo.antagning.se_ecs-sp.txt b/swamid-2.0/expert.uhrdemo.antagning.se_ecs-sp.txt
new file mode 100644
index 00000000..58bd813c
--- /dev/null
+++ b/swamid-2.0/expert.uhrdemo.antagning.se_ecs-sp.txt
@@ -0,0 +1,59 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_0e9ed0f1e6a055f7e5a5c89de7b073cf4b660fad" entityID="https://expert.uhrdemo.antagning.se/ecs-sp">
+  <md:Extensions>
+    <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/eu-adequate-protection</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>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.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://expert.uhrdemo.antagning.se/Shibboleth.sso/Login"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>expert.uhrdemo.antagning.se</ds:KeyName>
+        <ds:KeyName>https://vhs501.logica.se/ecs-sp</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=expert.uhrdemo.antagning.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIJAM+Qwbl5eGuwMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMTG2V4cGVydC51aHJkZW1vLmFudGFnbmluZy5zZTAeFw0xNDEwMjAxMzE2MjRa
+Fw0yNDEwMTcxMzE2MjRaMCYxJDAiBgNVBAMTG2V4cGVydC51aHJkZW1vLmFudGFn
+bmluZy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANuM/WLyOlj6
+KNf5FzyIDpe9c5l9LPN28IDacvUyPjxnU2qRfaIMEK45+mhH7UiLvGK9kXLfr3d8
+mUicmUnAjQlRB2T7953J1f2KWW2afHfW/rH0fC5C9sWNBrGAcmOAWaBpc/MDympu
+6mJdGQjhmehpNAueBakh2YaEgs50hiWWttKnrPtl4RQ0qXfCuKQhy+bxa0DjGVTD
+eWuDNQxFrxaTAPQiUf6386G+vbAOjRvyq0UDNBrkg9yb5knHv0XfCKGi7rOapHIu
+hWi7dYDfHh4Lc0SIX43Hkublda+/nzCjT52im1x6wRC/jGTFfhCW3IX8QL8ANCJQ
+RGtXNgIiFOECAwEAAaNqMGgwRwYDVR0RBEAwPoIbZXhwZXJ0LnVocmRlbW8uYW50
+YWduaW5nLnNlhh9odHRwczovL3ZoczUwMS5sb2dpY2Euc2UvZWNzLXNwMB0GA1Ud
+DgQWBBSHWa+2Jop2CpGUr06qtCQnqlusDzANBgkqhkiG9w0BAQUFAAOCAQEAHRQt
+IlgweHsTUN2eYDdZ0gN0E16GxzorMbLGfFQkqNaY7CvXj0WjOPrUnPGYEAw9XnF1
+SITKiZj9qLLBqx5K/agKuudhAFdDTMqJWY5Rw2PBk9Io4AJRwGfeEkkmMTEQolyI
+fN5Rwcz/3w84SQiJ2WVhS6CA+fNmKYnF0sfdyMnpSMWIkigoiFOFDkNr/WOT9r6G
+ElWOLHyh8jwJJgKIRA/EMVGtYinP8otUp1JO2wluG5xGNYtlP2RzBRC41iWCw+MU
+d0GThiLcDn9khv9UmyYHuG5uUaN+1z/XCmQGMNQD50MR/NQFupaKlHMmb+bYLc7S
+rlE8uHfQTinDQ9HpOw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://expert.uhrdemo.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
index d231518f..2f253ea2 100644
--- a/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfu-gemdev.it.su.se/Shibboleth.sso">
+  <md:Extensions>
+    <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:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/WAYF" index="1"/>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/WAYF/idp.secure.su.se" index="3"/>
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SWAMID" index="4"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">VFU-Portalen utvecklingsmiljö</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">VFU-Portalen development environment</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">VFU-portalen utvecklingsmiljlö, Stockholms univsersitet</mdui:Description>
+        <mdui:Description xml:lang="en">VFU-portalen development environment, Stockholm University</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -67,7 +85,6 @@ UaFs0ulwkp2uVhPCL1SV0KFnIWeKpY9rkcacQlpaDxwK5TKUnmw3zA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
   </md:SPSSODescriptor>