summaryrefslogtreecommitdiff
path: root/swamid-2.0
diff options
context:
space:
mode:
Diffstat (limited to 'swamid-2.0')
-rw-r--r--swamid-2.0/ac-w01.nordu.net-shibboleth.xml77
-rw-r--r--swamid-2.0/account.hs.se-shibboleth.xml93
-rw-r--r--swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml12
-rw-r--r--swamid-2.0/auth.asiaportal.info.xml2
-rw-r--r--swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml2
-rw-r--r--swamid-2.0/cas.weblogin.uu.se-cas.xml4
-rw-r--r--swamid-2.0/ci.nordu.net-shibboleth.xml8
-rw-r--r--swamid-2.0/confluence.it.su.se-shibboleth.sso.xml12
-rw-r--r--swamid-2.0/connect-beta.sunet.se-shibboleth.xml2
-rw-r--r--swamid-2.0/connect.sunet.se-shibboleth.xml2
-rw-r--r--swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml2
-rw-r--r--swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml30
-rw-r--r--swamid-2.0/e5.onthehub.com.xml4
-rw-r--r--swamid-2.0/emrex.its.umu.se-gui-sp.xml95
-rw-r--r--swamid-2.0/fs.liu.se-adfs-services-trust.xml4
-rw-r--r--swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/hbidp.hb.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/hobel.c3se.chalmers.se.xml87
-rw-r--r--swamid-2.0/identity.mdh.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.bth.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.chalmers.se-adfs-services-trust.xml11
-rw-r--r--swamid-2.0/idp.hig.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/idp.his.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.hkr.se-idp-shibboleth.xml51
-rw-r--r--swamid-2.0/idp.irf.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.it.gu.se-idp-shibboleth.xml17
-rw-r--r--swamid-2.0/idp.it.su.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.kb.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.kkh.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/idp.kmh.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.konstfack.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.kva.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.lnu.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/idp.lu.se-idp-shibboleth.xml7
-rw-r--r--swamid-2.0/idp.mah.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.nordu.net-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.rkh.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/idp.sics.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/idp.student.bth.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp.suni.se-adfs-services-trust.xml2
-rw-r--r--swamid-2.0/idp.ths.se-idp-shibboleth.xml178
-rw-r--r--swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml13
-rw-r--r--swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml7
-rw-r--r--swamid-2.0/idp2.hig.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp2.hv.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/idp2.kau.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml8
-rw-r--r--swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml81
-rw-r--r--swamid-2.0/kiidp.ki.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml83
-rw-r--r--swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/login.du.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/login.idp.eduid.se-idp.xml.xml17
-rw-r--r--swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml2
-rw-r--r--swamid-2.0/login.ki.se-idp-shibboleth.xml199
-rw-r--r--swamid-2.0/login.liu.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml199
-rw-r--r--swamid-2.0/ludicris.lub.lu.se-shibboleth.xml86
-rw-r--r--swamid-2.0/ludwig.lub.lu.se-sp.xml56
-rw-r--r--swamid-2.0/mp.uu.se-shibboleth.sso.xml5
-rw-r--r--swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml (renamed from swamid-2.0/wisumstage.its.umu.se-shibboleth.xml)97
-rw-r--r--swamid-2.0/play.mah.se-shibboleth.xml58
-rw-r--r--swamid-2.0/play.mah.se.xml48
-rw-r--r--swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml71
-rw-r--r--swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/scalear-saml.herokuapp.com.xml21
-rw-r--r--swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/shibb1.hj.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/signon.hh.se-idp-shibboleth.xml6
-rw-r--r--swamid-2.0/swamid2.shh.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/ubas.lu.se-shibboleth.xml91
-rw-r--r--swamid-2.0/uraccess.net-shibboleth.xml99
-rw-r--r--swamid-2.0/urn-urkund-shibboleth-sp.xml12
-rw-r--r--swamid-2.0/vartuppdrag.se.xml73
-rw-r--r--swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml101
-rw-r--r--swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml13
-rw-r--r--swamid-2.0/webinar.nordu.net-shibboleth.xml2
-rw-r--r--swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml230
-rw-r--r--swamid-2.0/weblogin.uu.se-idp-shibboleth.xml9
-rw-r--r--swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml117
-rw-r--r--swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml92
-rw-r--r--swamid-2.0/www.egencia.com-auth-v1.xml82
-rw-r--r--swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml2
-rw-r--r--swamid-2.0/www.researchprofessional.com-shibboleth.xml20
-rw-r--r--swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml104
-rw-r--r--swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml102
-rw-r--r--swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml92
88 files changed, 2809 insertions, 421 deletions
diff --git a/swamid-2.0/ac-w01.nordu.net-shibboleth.xml b/swamid-2.0/ac-w01.nordu.net-shibboleth.xml
new file mode 100644
index 00000000..e687493a
--- /dev/null
+++ b/swamid-2.0/ac-w01.nordu.net-shibboleth.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ac-w01.nordu.net/shibboleth">
+ <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#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"/>
+ </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://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/nordu.net" index="2"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/ds.sunet.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://ac-w01.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="3"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/kalmar2"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/kalmar2" index="4"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/Login/feide"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/haka.funet.fi"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/DS/haka.funet.fi" index="5"/>
+ <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://ac-w01.nordu.net/Shibboleth.sso/Login/idp.funet.fi"/>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>ac-w01.nordu.net</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=ac-w01.nordu.net</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAK6IEFZqeYNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGFjLXcwMS5ub3JkdS5uZXQwHhcNMTUxMTI1MTQzMTMxWhcNMjUxMTIyMTQz
+MTMxWjAbMRkwFwYDVQQDExBhYy13MDEubm9yZHUubmV0MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAm5n/c1jQxsE6ZLDCaLkxAzMkYAveKeF0uMosuZAm
+LbKK88nSMRvrM4XZWUxw4Y7Hhuy4CaI2ief6DEIeCvp1zL1akcRARLKR2dcZwhaI
+Xk5ZmSk0nZFmfCx/Q1/1QkWRtlTWZN5QWjKYhMf8v6NWQUkPkzcnTn5JsFRC53XB
+ZGm4PDxbsj4iHoR+fL78gqcZ/lNlWkico8dF1Gb5ECT7RoFLwYg3j9mJegEueZCd
+zI9xK4J8D1gCv98JhMFDnUuzOsUetKI+ztzgk2kvA4UUXSg5jNQmw4CXXvR4On9F
+zuyrlB7fxfHIUW4+msGDlSIcG4D9fkpgJVggYYfogslzTQIDAQABoz4wPDAbBgNV
+HREEFDASghBhYy13MDEubm9yZHUubmV0MB0GA1UdDgQWBBTSzNfSHtoiM3DkR1ki
+UjaoX4s3KzANBgkqhkiG9w0BAQUFAAOCAQEAkKma/1Q8c9Bfhya5ZjZeVoTD/q0m
+rM+K4C7a88+bEHyIAVi5iKXrGRqcYRxiOFJ90Bqrif5Lu1kXk//WfAoijVVO7LHR
+DstraFrFHnAk+Tqz4hgN7ttzgM63hR9uEe9M5euw00UQ1MTDX2EjUtB22T9m1IPn
+A9ToIGUpGX3izWzTLU+7h2do56ZxbVwH5c+NtQAGEIqDCEbtLvAaWu4XVor8Shj7
+pdi0ryFf9fQWwe8aUhmC8BNl5KNnDMgo3ka39txGyo9bxjJHEHJDwiZNasMgHoCa
+o53aOf7QIMq0SMHnBJXRznGwibXlXP0Wtbl2hpcO5QxiZHziD434b0eYqQ==
+</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://ac-w01.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ac-w01.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ac-w01.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/account.hs.se-shibboleth.xml b/swamid-2.0/account.hs.se-shibboleth.xml
new file mode 100644
index 00000000..7fb612a9
--- /dev/null
+++ b/swamid-2.0/account.hs.se-shibboleth.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://account.hh.se/Shibboleth">
+ <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#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/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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: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://account.hh.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Halmstad University, account activation and password reset</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad, kontoaktivering och lösenordsåterställning</mdui:DisplayName>
+ <mdui:Description xml:lang="en">As a new user you can use this service to activate your university computer account or reset your password.</mdui:Description>
+ <mdui:Description xml:lang="sv">Med denna tjänst kan du aktivera ditt datorkonto vid högskolan eller återställa ditt glömda lösenord.</mdui:Description>
+ <mdui:Logo xml:lang="sv" height="116" width="350">https://account.hh.se/images/hh-logo-sv-350x116.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="116" width="350">https://account.hh.se/images/hh-logo-en-350x116.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">https://account.hh.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://account.hh.se</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>account.hh.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=account.hh.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJANrRd35k7LpWMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
+BAMTDWFjY291bnQuaGguc2UwHhcNMTUxMjA3MDkxODEzWhcNMjUxMjA0MDkxODEz
+WjAYMRYwFAYDVQQDEw1hY2NvdW50LmhoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA2HB+aZke+IC6XxLw2ZzHyJLBQhw/rgIUvdGOcTuU5ypQbKAO
+V1BQwBf/rt+BXg4pmms0zyGXZdwmmWTtdSmyVAWTIBHLigzbC15kjHBWNa7anCtU
+Dvs4ufdcc9H9dzaJ3l3rMnNUTtMWB4ejl8I2iJ/KGJxLr/WjG/Bqdd9vHC1vy6qk
+4EhsGdlEG9wGKex8zbd/ZfEW2BURpu6QzhVDOSxN9tmEjCqZgBdGeCS0eIYiSWou
+sLGHmsHuFkbj3N/X/C/liPNsrkZlRZTo7771P5ZXpCGPiUhy55c9w8DVJH3v/Eck
+MPn09RTv/07q4c+/KT44KTjPSbE/ViMO7z8mmwIDAQABozswOTAYBgNVHREEETAP
+gg1hY2NvdW50LmhoLnNlMB0GA1UdDgQWBBQNLv4rShYW33jjJr4ktO8USse3NjAN
+BgkqhkiG9w0BAQUFAAOCAQEAUbSIeQhGhRVh4WiAUQHC5YXG5bM2za7Ypwr01OtS
+10rGvweXYu0i5lTsuXDvkoZG3f16guXytmRnq0TT5maRJvfrWvVFbzaPCMOpXwFb
+Jiy+4HsIFEdqFrwUbCu5Q3KKXkTl+VZQb0GooFiZSdKGdA7Ij/uNU6U8ZnLKDJqq
+1rhu4mDXbyGP/9Mxhw62QMn9SDXFv/8t0XdM8nHu+Ai65BdSLmVwIo8V+Dcuf9cZ
+vw4SWII7yvqumgRvNcDvdMSYHvI3sxwtGMFz2FV4MKl9k6R46tt6kgnynyUThn4t
+bK0IFZ5apkn9N3YME8KiyAf5bSY31fBoQVszf+Gm2wN+qw==
+</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://account.hh.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.hh.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.hh.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.hh.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.hh.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
index 7a90b5db..0b72f4c0 100644
--- a/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs01.fhs.se-adfs-services-trust.xml
@@ -24,21 +24,21 @@
<KeyDescriptor use="encryption">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC3DCCAcSgAwIBAgIQFZiyu9vx3bVBXRoeCQUILTANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgwN1oXDTE1MTIyMzIxNDgwN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2+ePiq76UBNnhcXAGacPiTg6kLX5OAmUM0ehzmMYLEywp/eH65OjzD6Gz0mYxXL9xCw9U/m61LGhVLzZt7ZmYPs8SlxMHzsjawrGp5gsFXdo99nwbxGElbCYlJiS7Y+GMkXUtAIW3N4MoktO9j7Q7Iu4f6bnOkRLgdGXkvv2RTiD5CaOodAnzdwncVmFORk3ued1ZeS0S4AyFJFC4RqYmDrvU3eLyCdHQZoZ3SO1RkSicpTHibOaYZ1pP8keEHJ2aP63iw1WFF49cIucVcyeJ+1SBkorXPKBKhw5BJP17USD290ZWzPmTXLLieHyYKINxK3xe1xCESVLxJJgnca78CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZDl80K94WjYpIjpa2q6FZ7ZaLTGA7ffW5gdQfPcbJbCkuWCmCsCmOwDmFFZ5Gb+4tKJxHF2Z+Tzt8yIY/OCg0Y61lerXdoNC1bYahnUDDfU11m441vsCAyymftBZsOewupXdcyh3NPiduOlJd8iXybZ6BZaUoVUjfkFAmjkii+pJB+H+gXo2CBNksAXhUAbk4es/1FSSNdXGrDG8qj91uX+l69oQK1ERIpux2ALEv/j/zBNYNQgYiYPyP+/b06/MUTxNbFC4LGb3XcIk0OqOauhoZcoEcTLcmPycOYs8hJl80lWSEGhl9+qXhoxNpkh4ucYxvDArCsCgYQZd/HhN6w==</X509Certificate>
+ <X509Certificate>MIIC3DCCAcSgAwIBAgIQO7k5W9bEBJdDpzGopgV4OzANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTE1MTIwNDAwMTgxN1oXDTE2MTIwMzAwMTgxN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALfykzr9WnvSwX4yhG6rLbTwvvAXcvMWyUcbV5usDITt2FpdPyD7eMOJVoefIimvQGQ3JKlnoKwsTBMNZGJIaKXNRX06rYjOr2Isip0f7BLxiHXAJcif80MLqeuXRGELa0Z5en3irAscOGOWtpxYebslAAhZZqjOUbU4BlvutwCPa/FIqPhLhWoWkfXy8/Bs1VYnSCWCAO5UTRFzRi3K8glKy/1NFiP90LapP+/V1U+Zr3/rGg+2usWFjADPEFjFj7bnFC2pmxuEQf0F0XFC6s8mbXOOcsHGqvKrsQdgeqfBJMHofhh0hkTA9Gsl8TP4yRT5NQ80EA8ry6Zko6TmcC8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEANAq63e5sekNfz1PnSG1dLGa9xpMCz3Nk5IyPb5ED7hrPXHXZG2FXRJDXHm2ux0yIOhS0uLkoApAupXiE87pga/6aPod2fSGbBgihRIBNRuAr7g7HjL5w5N0gZPEzby3fYqFR0L4qRxALWbnYfFAjPbY+KfRs86TVgSBFoSY6N5+MYGtcoAL7wl0TRO3aua8uHsTZp8pZ4/CxSmLL1tC1abVuoqD7EcwWJq0tRdrI7UM1vjAWiLMvsp3XS+7LHvZXVXnYnp/rVpSnkA8C7ApthhV7s4ms2ecUYUO1t8AHBgYRQ/kme0Twd7SddHyAwN/PZVGwu3bPIPbUgg374YP69g==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC1jCCAb6gAwIBAgIQKEGE7N1PhqND4Izv6Nl9tzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MDExMjE5MjYwMloXDTE1MDExMjE5MjYwMlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgssWOg27ZeOAIofyLaYIxZxFPVyWVMoX8uaAeM0mYEj+ENT1pM4+G7sGNwKEIyOST6Lu7L7BMMku8jFF6Rt2GgV7dWDgWa2nNQ3H3XDQIH4ggZTmibrfBoyEpgNwuPhCqW+n4sr19jmO5aYs3elwSc4ogiaEPQy+CDpBKq9wO4hD4YOuD6jBtmkySvkG/rE7BSkC/fxg6qeNFdC4xVhkJZuU+tJRbBIHznqAD6kErdgHlM82sKoTN6q1dZk9AkE8ZwmI9T1s2g2eY1cB77Px7rqXCvbA2+Tjt2I3f8m99JxY5gHedR7UJfKLBPlo3V0rMJZlFfGOGKR8z9AphA/G0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAtbBphHKTw16aTAZ1ihlZQNnT3UgVC2JwlnZD16iczLa+96NiBNwu6il9K7UwjA/JD6t7dNWoVXEJTREGJUs9IzN1XP7PwqU8zlIiug8p7q8Efit8JppO1vmgpofom+OVxZ1A8vc5wmsuvwLoEQGu0Y/3JawPsaDvA7wdF+Bnqo+DTVCIe3wOGAY6D2C4XIvYZirz3cFoTd4BrGLx/dfRkmBmIeDJ39G1DcRfAZF59b1c7n4OeEhq2dg7yKP1ql0e1bKOKKqW0wXStNHamceJWU/hbCNid87rKpvTMvH8ClkC2pf3R2/bR27VuhWyAbPTp1+hhIJKmCWTkEtt/JOg4w==</X509Certificate>
+ <X509Certificate>MIIC1jCCAb6gAwIBAgIQYSuOi8k52qFDiHIcmLzhUzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgxMVoXDTE1MTIyMzIxNDgxMVowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeZpLVFfRtz3BFIEKaCOcf0w3041Vna4JAhxKT9hkhMW5TSh2S7hcgBiRm6Q2olmBtc+KMN9ReJT1ZJzQUa27qaGRepO/M+isJk4QqL9zOX/BpYFEWTRYMLlqqukZBhtwdtluIMCJlAClccRSikCx+bGN+fcPwfrv3T2y+C+MMp8GIN/QWJf97GEP5XR9VooItR8+nkUm1FOkvKMr5xFwZfilXQTzDer3Z42yMYRpr8rw7QdMJP11A7v7NIZTYRQIU+Qi0uPsvRI5FI7IG3NWyepslS1vwjU/dpKeBUYLQwwRxvV09YX+ULSKpClm2oZ7LuE/vt7Bok6vnPa3TG+i0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAktHUw5HNOOH/ETVIeAgdi5FXq5e8maX8Qe5vFsWRWPTP9MygRwNajY07XpXQmw2CKbAzY6ZD2RoA7g9swBpCcNYuJmAnA3LtyFiRrog/+XzWeRt7tbqDjiYZiBdVD84JbfVMD3q0Pi4iLn+KPAmYajYAzftf1vKr/fvwFt2D2eR+sXefEmcwNPSFFma0umEgSajxiN4gdTA3ZMTNV1J5tv1cwb9TYx0mDHP+FCwsEE2bHsDk5CDBWpgFVvEiQwfra1amz+BIPWG5Nln9bedfE0BjdGH5OK424DBwBTygzBV8OM9jB7dOcaA+0K0/UduM+ka42XxP7WFrq3VKmGfCbg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="signing">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
<X509Data>
- <X509Certificate>MIIC1jCCAb6gAwIBAgIQYSuOi8k52qFDiHIcmLzhUzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgxMVoXDTE1MTIyMzIxNDgxMVowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeZpLVFfRtz3BFIEKaCOcf0w3041Vna4JAhxKT9hkhMW5TSh2S7hcgBiRm6Q2olmBtc+KMN9ReJT1ZJzQUa27qaGRepO/M+isJk4QqL9zOX/BpYFEWTRYMLlqqukZBhtwdtluIMCJlAClccRSikCx+bGN+fcPwfrv3T2y+C+MMp8GIN/QWJf97GEP5XR9VooItR8+nkUm1FOkvKMr5xFwZfilXQTzDer3Z42yMYRpr8rw7QdMJP11A7v7NIZTYRQIU+Qi0uPsvRI5FI7IG3NWyepslS1vwjU/dpKeBUYLQwwRxvV09YX+ULSKpClm2oZ7LuE/vt7Bok6vnPa3TG+i0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAktHUw5HNOOH/ETVIeAgdi5FXq5e8maX8Qe5vFsWRWPTP9MygRwNajY07XpXQmw2CKbAzY6ZD2RoA7g9swBpCcNYuJmAnA3LtyFiRrog/+XzWeRt7tbqDjiYZiBdVD84JbfVMD3q0Pi4iLn+KPAmYajYAzftf1vKr/fvwFt2D2eR+sXefEmcwNPSFFma0umEgSajxiN4gdTA3ZMTNV1J5tv1cwb9TYx0mDHP+FCwsEE2bHsDk5CDBWpgFVvEiQwfra1amz+BIPWG5Nln9bedfE0BjdGH5OK424DBwBTygzBV8OM9jB7dOcaA+0K0/UduM+ka42XxP7WFrq3VKmGfCbg==</X509Certificate>
+ <X509Certificate>MIIC1jCCAb6gAwIBAgIQMXP1/ezaSIZIOp/pjOiCgDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE1MTIwNDAwMTgyMloXDTE2MTIwMzAwMTgyMlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALdO7kcKNsClDGcJNKysS7MxE6iNlMAYxIkoJju5qvxjazuHxKmOzScYv1x83pw0VhJRg3psmus52tynauQ0Rvsba8F7Ngk6W9e21MbPjpMdF68k2x0zWnNpg+fMDoEWTds5S6QNUzsKp3eaI2tkMny8Ng33ZD2XvjkG/T7BDkIeH1aZvA1COBqNPx0WS7usc9LYtdNghdn24H7ZlcPCokZJbeDnbuUNS7c/mjQLXKKExUFcoEKduEeUF3zeT2D531TSLNwiJ9iQJ9rRFWK7hrgr2oP+sdojvoeI8cwP/TSGWfvDoU1sRZ9qTlSN+b0W/MnSkdKBzRjTCMpRa/ABvWkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAo9sQIrRQ3uEENG/oyrmV65NUb3Ta9fd28VHq1Rk/M5UUeqzsO6Agyt3YBAdaeRgGw8l6NBG+XFyNjLsGY9gND64gQF+65zSrEwdbwqEFciR0ZNVw1E3Bqq7W4MjeH4EtG5eTplvR3A77vfKy/vFXn13draGgZOX7e2mJ/CNK4drUYNvMorf2+ZcP1FjvypV91bY8g168+0lZYHGYrmy4ajVBvFZ82LJuW2OCZ4KPLIY51qpNiMeikePzUNc6/CKJ0zLq4bRRSy2kCyj0Pq2dwV+N0WAVGFJ8uxDRZx7AFG5+JcajSyDYHVVjUIzzqS8UDVV7/XWAQmWcEU4eNid1Hg==</X509Certificate>
</X509Data>
</KeyInfo>
</KeyDescriptor>
@@ -83,19 +83,19 @@
<ContactPerson contactType="administrative">
<Company>Swedish Defence University</Company>
<SurName>FHS IT Helpdesk</SurName>
- <EmailAddress>helpdesk@fhs.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46 8 55342545</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Swedish Defence University</Company>
<SurName>FHS IT Helpdesk</SurName>
- <EmailAddress>helpdesk@fhs.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46 8 55342545</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Swedish Defence University</Company>
<SurName>FHS IT Helpdesk</SurName>
- <EmailAddress>helpdesk@fhs.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
<TelephoneNumber>+46 08 55342545</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/auth.asiaportal.info.xml b/swamid-2.0/auth.asiaportal.info.xml
index 3ce1c4b8..b3a09e34 100644
--- a/swamid-2.0/auth.asiaportal.info.xml
+++ b/swamid-2.0/auth.asiaportal.info.xml
@@ -42,6 +42,6 @@
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
<md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>bib@nias.ku.dk</md:EmailAddress>
+ <md:EmailAddress>mailto:bib@nias.ku.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index cb40ab70..564f8a9e 100644
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -59,6 +59,6 @@
<md:ContactPerson contactType="technical">
<md:GivenName>NORDUNet</md:GivenName>
<md:SurName>NOC</md:SurName>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/cas.weblogin.uu.se-cas.xml b/swamid-2.0/cas.weblogin.uu.se-cas.xml
index 870dd6cf..83d7361a 100644
--- a/swamid-2.0/cas.weblogin.uu.se-cas.xml
+++ b/swamid-2.0/cas.weblogin.uu.se-cas.xml
@@ -6,8 +6,8 @@
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DisplayName xml:lang="sv">Interna tjänster vid Uppsala universitet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Internal services at Uppsala University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Uppsala universitets central autentisering service</mdui:Description>
- <mdui:Description xml:lang="en">The central authentication service at Uppsala University</mdui:Description>
+ <mdui:Description xml:lang="sv">Uppsala universitets centrala autentiseringsservice (CAS)</mdui:Description>
+ <mdui:Description xml:lang="en">The Central Authentication Service (CAS) at Uppsala University</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
diff --git a/swamid-2.0/ci.nordu.net-shibboleth.xml b/swamid-2.0/ci.nordu.net-shibboleth.xml
index 938a34ff..9f9ef3b1 100644
--- a/swamid-2.0/ci.nordu.net-shibboleth.xml
+++ b/swamid-2.0/ci.nordu.net-shibboleth.xml
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ci.nordu.net/shibboleth">
+ <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/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</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://ci.nordu.net/Shibboleth.sso/Login"/>
diff --git a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
index 1fcd5ab3..bab3135f 100644
--- a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
@@ -1,9 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://confluence.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: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://confluence.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://confluence.it.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Confluence at Stockholm University</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Confluence vid Stockholms universitet</mdui:DisplayName>
+ </mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
index a0822151..2d85d7f0 100644
--- a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -100,6 +100,6 @@ H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/connect.sunet.se-shibboleth.xml b/swamid-2.0/connect.sunet.se-shibboleth.xml
index f934124e..a771dbce 100644
--- a/swamid-2.0/connect.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect.sunet.se-shibboleth.xml
@@ -103,6 +103,6 @@ bUs=
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml b/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
index 9c99a917..025747a6 100644
--- a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
+++ b/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
@@ -85,6 +85,6 @@ D265cqy6Le/toVg=
<md:ContactPerson contactType="technical">
<md:GivenName>Oleg</md:GivenName>
<md:SurName>Mirzov</md:SurName>
- <md:EmailAddress>oleg.mirzov@nateko.lu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..e09d0951
--- /dev/null
+++ b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://devsp.sweclarin.se/sp/module.php/saml/sp/metadata.php/default-sp">
+ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIID8TCCAtmgAwIBAgIJAMjuGy2xpLirMA0GCSqGSIb3DQEBCwUAMIGOMQswCQYDVQQGEwJTRTETMBEGA1UEBwwKR290aGVuYnVyZzEmMCQGA1UECgwdU3dlZGlzaCBOYXRpb25hbCBEYXRhIFNlcnZpY2UxDzANBgNVBAsMBlNORCBJVDEOMAwGA1UEAwwFREVWU1AxITAfBgkqhkiG9w0BCQEWEnBhYmxvLm1pbGxldEBndS5zZTAeFw0xNTEwMTkwNjUzNDdaFw0yNTEwMTgwNjUzNDdaMIGOMQswCQYDVQQGEwJTRTETMBEGA1UEBwwKR290aGVuYnVyZzEmMCQGA1UECgwdU3dlZGlzaCBOYXRpb25hbCBEYXRhIFNlcnZpY2UxDzANBgNVBAsMBlNORCBJVDEOMAwGA1UEAwwFREVWU1AxITAfBgkqhkiG9w0BCQEWEnBhYmxvLm1pbGxldEBndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANA1kq7UVTQLnkl1DEQxcfQxrvyw0ZYMmKQahlPo9whZgH6D9gD1oPtDasClDB7e8V6auSWEKvoqu3dlGq7wJL8YX7ga5I38KfRBelwIvEZqnKdSBl9e7npAxGtJvC2eNXCdQ3+PaKAL6dVzy7pA74unCVHckautCI3jTfuMx82l228vM/jzawCIc/N8ZX/IhU3F6v0RElPs9XKNLMua2ET6Ka1d3AeKE9aHVMs8qMG76cA0SzLoRC3iwE1OKiar6WngEWULiPmNiAZwBe6G3Q643cJo8ST+3jJYAHyxyZ/gZqZHJzhCJuCf6ShzigTOwtJiNNSkgs5G8ZPPJoMpXe8CAwEAAaNQME4wHQYDVR0OBBYEFMHrgb147rBxXzVonuVtg3hY/qlSMB8GA1UdIwQYMBaAFMHrgb147rBxXzVonuVtg3hY/qlSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKhPs4AdzzvTMjvIxAxaAFjcuW5PPm+JI9CRuXaeom+4JyEHL+v6GWgTYFKG9yOo/WDvKuknC4f8Oa534mUWS/KKesp2Jbfo3rNAvrkkDNWGID9fMMo/e+z4y0G+vt3QF/yU67LOwpLPzqA4MaSJ5MHB+atfeoMxbGcjYeDVbwhGfEasiJ534hRL3DfwIZ6bG0xC39bwdB2cnTW7kWHd9klMuTH/nrLJhJku7xqNYd6hhMRHYqvc4zy/v+/GjU3MtbhTqyeMy4Mi+haAmJ+HSGzxwpYNZ8XUIL9DjaFsS9UJNjIR7iE20Q+h+RkpSLx+cm8lMVg/G6PukyHEQsCnfRk=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIID8TCCAtmgAwIBAgIJAMjuGy2xpLirMA0GCSqGSIb3DQEBCwUAMIGOMQswCQYDVQQGEwJTRTETMBEGA1UEBwwKR290aGVuYnVyZzEmMCQGA1UECgwdU3dlZGlzaCBOYXRpb25hbCBEYXRhIFNlcnZpY2UxDzANBgNVBAsMBlNORCBJVDEOMAwGA1UEAwwFREVWU1AxITAfBgkqhkiG9w0BCQEWEnBhYmxvLm1pbGxldEBndS5zZTAeFw0xNTEwMTkwNjUzNDdaFw0yNTEwMTgwNjUzNDdaMIGOMQswCQYDVQQGEwJTRTETMBEGA1UEBwwKR290aGVuYnVyZzEmMCQGA1UECgwdU3dlZGlzaCBOYXRpb25hbCBEYXRhIFNlcnZpY2UxDzANBgNVBAsMBlNORCBJVDEOMAwGA1UEAwwFREVWU1AxITAfBgkqhkiG9w0BCQEWEnBhYmxvLm1pbGxldEBndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANA1kq7UVTQLnkl1DEQxcfQxrvyw0ZYMmKQahlPo9whZgH6D9gD1oPtDasClDB7e8V6auSWEKvoqu3dlGq7wJL8YX7ga5I38KfRBelwIvEZqnKdSBl9e7npAxGtJvC2eNXCdQ3+PaKAL6dVzy7pA74unCVHckautCI3jTfuMx82l228vM/jzawCIc/N8ZX/IhU3F6v0RElPs9XKNLMua2ET6Ka1d3AeKE9aHVMs8qMG76cA0SzLoRC3iwE1OKiar6WngEWULiPmNiAZwBe6G3Q643cJo8ST+3jJYAHyxyZ/gZqZHJzhCJuCf6ShzigTOwtJiNNSkgs5G8ZPPJoMpXe8CAwEAAaNQME4wHQYDVR0OBBYEFMHrgb147rBxXzVonuVtg3hY/qlSMB8GA1UdIwQYMBaAFMHrgb147rBxXzVonuVtg3hY/qlSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKhPs4AdzzvTMjvIxAxaAFjcuW5PPm+JI9CRuXaeom+4JyEHL+v6GWgTYFKG9yOo/WDvKuknC4f8Oa534mUWS/KKesp2Jbfo3rNAvrkkDNWGID9fMMo/e+z4y0G+vt3QF/yU67LOwpLPzqA4MaSJ5MHB+atfeoMxbGcjYeDVbwhGfEasiJ534hRL3DfwIZ6bG0xC39bwdB2cnTW7kWHd9klMuTH/nrLJhJku7xqNYd6hhMRHYqvc4zy/v+/GjU3MtbhTqyeMy4Mi+haAmJ+HSGzxwpYNZ8XUIL9DjaFsS9UJNjIR7iE20Q+h+RkpSLx+cm8lMVg/G6PukyHEQsCnfRk=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devsp.sweclarin.se/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devsp.sweclarin.se/sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devsp.sweclarin.se/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://devsp.sweclarin.se/sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://devsp.sweclarin.se/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://devsp.sweclarin.se/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Pablo</md:GivenName>
+ <md:SurName>Millet</md:SurName>
+ <md:EmailAddress>pablo.millet@gu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/e5.onthehub.com.xml b/swamid-2.0/e5.onthehub.com.xml
index 7e8436c6..c1c420e8 100644
--- a/swamid-2.0/e5.onthehub.com.xml
+++ b/swamid-2.0/e5.onthehub.com.xml
@@ -140,10 +140,10 @@ l8qQhkUldJphTqx2PEHORBM=
</md:Organization>
<md:ContactPerson contactType="technical">
<md:GivenName>Shibboleth Technical Team</md:GivenName>
- <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
+ <md:EmailAddress>mailto:Shibboleth@e-academy.com</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="administrative">
<md:GivenName>Shibboleth Administration Team</md:GivenName>
- <md:EmailAddress>Shibboleth@e-academy.com</md:EmailAddress>
+ <md:EmailAddress>mailto:Shibboleth@e-academy.com</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/emrex.its.umu.se-gui-sp.xml b/swamid-2.0/emrex.its.umu.se-gui-sp.xml
new file mode 100644
index 00000000..678116a5
--- /dev/null
+++ b/swamid-2.0/emrex.its.umu.se-gui-sp.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://emrex.its.umu.se/gui-sp">
+ <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#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/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: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://emrex.its.umu.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://emrex.its.umu.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">EMREX produktionsmiljö</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">EMREX production site</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">EMREX-projektet stödjer EU:s mål för 2020 att 20% av högskolestuderande ska kunna vara mobila under studietiden.</mdui:Description>
+ <mdui:Description xml:lang="en">The EMREX project addresses the EU 2020 target that 20% of higher education students should be mobile during their studies.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>emrex.its.umu.se</ds:KeyName>
+ <ds:KeyName>https://emrex.its.umu.se/gui-sp</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=emrex.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAMIUlWJ7xFZzMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEGVtcmV4Lml0cy51bXUuc2UwHhcNMTUxMTA1MTQ1MzU5WhcNMjUxMTAyMTQ1
+MzU5WjAbMRkwFwYDVQQDExBlbXJleC5pdHMudW11LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAu6IPSODdnS66qRsCbLYbc3i8U6tFUmCQ4Z5Ijg/n
+/yYiz0tg/1D7LCxh0ta3p8wF9MxDYh9nhviIU78uMV98NrX75EwF4D+9nW3XXero
+tRHiTlO7hY6CroLIefOsH9ISt0kIKT/mUI1L8ndBvBfCQvyzYEOy9PeOuru2QTg+
+dmDF9OCQPaBcoeoi+3zYLIO6OOAUutip4rnQuznOv8ddveP1HEjrei0XDBrCbIfJ
+0VzCJQdkW0vcIfXT5xwTOJcFYy6b4RPX3JSwENRrClMrunenPte+M5W1YJKCCi4I
+R900EiIufvuv+ZL2Jkklirley+uFnh9knSLIRM98Yy1j5wIDAQABo18wXTA8BgNV
+HREENTAzghBlbXJleC5pdHMudW11LnNlhh9odHRwczovL2VtcmV4Lml0cy51bXUu
+c2UvZ3VpLXNwMB0GA1UdDgQWBBRjTacbXCeuIkCrckKzgf8py2XPYzANBgkqhkiG
+9w0BAQUFAAOCAQEAdYdVEF1mEVnotpfzcrFXkmTsX+UwEXaePE2ZGbxHqSGPQ1mS
+1cWAIupgcxE2/pefCrWKIF+VDWQmVFWcALoQuWQMsya0SC2C5gnxzYQq1L6gkx8R
+HbVhdUuEJ38NPuWCQ3OFrEvdnlAx4NztXp2Gn2ItIeiEl3fLdGB8c/nRh0b09bY4
+1v7OnyOxAouCRGotnyHyd9aTwTVpBhG6LK2LYiA2v90c0fH24+BX4x5hrm54ysG0
+PHSmQco4ELsIfXuqrlyE3kVGajZ1BFwpp0gMGETRZE8nBZzPk0bgwq+hyfNIV2ZL
+uE4uozMTr+nt5X5/0Un+8KCKmppjT10d59uveg==
+</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://emrex.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://emrex.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 16a00571..da03a752 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -505,13 +505,13 @@ G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</X509Certificate>
<ContactPerson contactType="technical">
<Company>Linköping University (ADFS)</Company>
<SurName>Johan Peterson</SurName>
- <EmailAddress>johan.peterson@liu.se</EmailAddress>
+ <EmailAddress>mailto:johan.peterson@liu.se</EmailAddress>
<TelephoneNumber>+46 13 28 5730</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Linköping University (ADFS)</Company>
<SurName>LiU-IT:s Kundcenter</SurName>
- <EmailAddress>helpdesk@student.liu.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@student.liu.se</EmailAddress>
<TelephoneNumber>+46 13 28 5898</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
index 5cd31580..32e8c3c7 100644
--- a/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
+++ b/swamid-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
@@ -102,19 +102,19 @@ icptKTpDxrRjfCXibBT1
<ContactPerson contactType="administrative">
<Company>The Swedish School of Sport and Health Sciences</Company>
<SurName>Fredrik Nilsson</SurName>
- <EmailAddress>fredrik.nilsson@gih.se</EmailAddress>
+ <EmailAddress>mailto:fredrik.nilsson@gih.se</EmailAddress>
<TelephoneNumber>+46 8 12053734</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>The Swedish School of Sport and Health Sciences</Company>
<SurName>Michael Thunell</SurName>
- <EmailAddress>michael.thunell@gih.se</EmailAddress>
+ <EmailAddress>mailto:michael.thunell@gih.se</EmailAddress>
<TelephoneNumber>+46 8 12053807</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>The Swedish School of Sport and Health Sciences</Company>
<SurName>Charlie Skog</SurName>
- <EmailAddress>charlie.skog@gih.se</EmailAddress>
+ <EmailAddress>mailto:charlie.skog@gih.se</EmailAddress>
<TelephoneNumber>+46 8 12053792</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
index f2ae5ddd..ed05fb1f 100644
--- a/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/hbidp.hb.se-idp-shibboleth.xml
@@ -136,19 +136,19 @@ NtlzTU8oxWfErMa+Y2BMXWIALruQgeQrFxbO/k4RoPBHRvCul0uUsxak1IFtfT0x
<ContactPerson contactType="administrative">
<Company>University of Borås</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>it-avdelningen@hb.se</EmailAddress>
+ <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Borås</Company>
<SurName>Per-Olof Axelsson</SurName>
- <EmailAddress>Per-Olof.Axelsson@hb.se</EmailAddress>
+ <EmailAddress>mailto:Per-Olof.Axelsson@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4697</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Borås</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>it-avdelningen@hb.se</EmailAddress>
+ <EmailAddress>mailto:it-avdelningen@hb.se</EmailAddress>
<TelephoneNumber>+46 33 435 4690</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/hobel.c3se.chalmers.se.xml b/swamid-2.0/hobel.c3se.chalmers.se.xml
new file mode 100644
index 00000000..766495fa
--- /dev/null
+++ b/swamid-2.0/hobel.c3se.chalmers.se.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hobel.c3se.chalmers.se">
+ <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#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/hei-service</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 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://hobel.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://hobel.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 Hobel</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">SUPR test server Hobel</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Testserver (Hobel) för SNIC User and Project Repository (SUPR).</mdui:Description>
+ <mdui:Description xml:lang="en">Test server (Hobel) 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>hobel</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=hobel</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIJALfiApQszZJ/MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
+BAMTBWhvYmVsMB4XDTE1MTAyMjIyMDExN1oXDTI1MTAxOTIyMDExN1owEDEOMAwG
+A1UEAxMFaG9iZWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1PZdJ
+QQ7zmjH9a1Qgbr0ZAhhE+X9kcM3gg0C3yuE0BmQ5tOdZ5YcOCU8lxy2TMQe+x8v6
+gYw3QKLOSDexeQ4/a5Nj3TP8BiNDzoMHPJL3JywuliMxty3GD9IhtP3oQa3MZ2ak
+Rv0AJgduWOKK+qFrkhuFC4NVHIb/VEEcQwQZwm18Rjj5T3u+BAvkHzRl6fPPhaSc
+s2XJ9celJVRr/Ytf0zA0FuDu2hxnECIKVIVLtNaCN0Crt03bA2yrX/OeUkpPhWen
+pfAopiw78JU51D+eB+SsTN8+WXjlGuK7phnqYf/M+2lPde0UfkRIYBTvWiZKBmSs
+KoB89ou8DI53jZ0pAgMBAAGjMzAxMBAGA1UdEQQJMAeCBWhvYmVsMB0GA1UdDgQW
+BBQiHeg1j+9rj9Z8Yl9QvmMbnqyu5TANBgkqhkiG9w0BAQUFAAOCAQEAn+x/S/bh
+UIkhtJu4T1rDTV7k9vLoQeVxj2RV6wUldIFySFYsDyCBbdxB44BeItA8+ZguAgB0
+kjeE21udA8ymkGB+HDW9ge3bDCr28+p8UcLvo77DpErEhT2K3jHYHGaLXYvhJ9WM
+wLIVqOx8qwhmM27X4N22EIGa53J6aHvYq6kkHqKeqvYBWw/jut1iQwJKEwCRPQr0
+mhtbW9lo/gLw2vORv8/2jEX0O0HAoexJY/e0fHjx59kDx6xBcmCYYevk9sUVWiei
+M6Fjc5NRyOLB/NyBlK9jQoAc3kWwx4HIG+8GH8SZtv4b+r5rVLtEns7ULhOIjzov
+ygU2QaW0OcFFXw==
+</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://hobel.c3se.chalmers.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hobel.c3se.chalmers.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/identity.mdh.se-idp-shibboleth.xml b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
index 14eb3f5d..7a14fceb 100644
--- a/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
+++ b/swamid-2.0/identity.mdh.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ P7nZB2+XoE3sf8xqd2a9xO7vy1r17Q7bx8PzwklL9GdFppuRnimioYoF3atEQM6R
<ContactPerson contactType="administrative">
<Company>Mälardalen University</Company>
<SurName>Peter Falck</SurName>
- <EmailAddress>peter.falck@mdh.se</EmailAddress>
+ <EmailAddress>mailto:peter.falck@mdh.se</EmailAddress>
<TelephoneNumber>+46 21 101499</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Mälardalen University</Company>
<SurName>MDH Drift</SurName>
- <EmailAddress>drift.ita@mdh.se</EmailAddress>
+ <EmailAddress>mailto:drift.ita@mdh.se</EmailAddress>
<TelephoneNumber>+46 21 101499</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Mälardalen University</Company>
<SurName>Helpdesk MDH</SurName>
- <EmailAddress>helpdesk@mdh.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@mdh.se</EmailAddress>
<TelephoneNumber>+46 16 101550</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
index 507f0e70..c58b6ca4 100644
--- a/swamid-2.0/idp.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.bth.se-idp-shibboleth.xml
@@ -96,19 +96,19 @@ n9Phr4P3FEL3YKQK+xQiKCJXUb5WgRI=
<ContactPerson contactType="administrative">
<Company>Blekinge Institute of Technology- Personnel</Company>
<SurName>IT Helpdesk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Blekinge Institute of Technology- Personnel</Company>
<SurName>IT Helpdesk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Blekinge Institute of Technology- Personnel</Company>
<SurName>IT Helpdesk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 381500</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
index 3e5c1ac6..feeddcd1 100644
--- a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp.chalmers.se/adfs/services/trust">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se">
<KeyDescriptor use="encryption">
<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -344,10 +351,10 @@
</Organization>
<ContactPerson contactType="technical">
<Company>Chalmers</Company>
- <EmailAddress>nrq@chalmers.se</EmailAddress>
+ <EmailAddress>mailto:nrq@chalmers.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Chalmers</Company>
- <EmailAddress>biorn@chalmers.se</EmailAddress>
+ <EmailAddress>mailto:biorn@chalmers.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.hig.se-idp-shibboleth.xml b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
index ea2380d9..9dca094e 100644
--- a/swamid-2.0/idp.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hig.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hig.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">hig.se</shibmd:Scope>
@@ -102,19 +109,19 @@ otLAA/GPqLtaaQ1u9fpDcdN5GjkHR1QyYN/UhhF0iXczvUp4o/D0ELbtdBPA5Rwf
<ContactPerson contactType="administrative">
<Company>University of Gävle</Company>
<SurName>Network Operations</SurName>
- <EmailAddress>nat@hig.se</EmailAddress>
+ <EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Gävle</Company>
<SurName>Operations</SurName>
- <EmailAddress>nat@hig.se</EmailAddress>
+ <EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Gävle</Company>
<SurName>IT Support</SurName>
- <EmailAddress>itsupport@hig.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.his.se-idp-shibboleth.xml b/swamid-2.0/idp.his.se-idp-shibboleth.xml
index f646dac8..ed12731a 100644
--- a/swamid-2.0/idp.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.his.se-idp-shibboleth.xml
@@ -106,19 +106,19 @@ drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
<ContactPerson contactType="administrative">
<Company>University of Skövde</Company>
<SurName>HiS Netadmin</SurName>
- <EmailAddress>netadmin@his.se</EmailAddress>
+ <EmailAddress>mailto:netadmin@his.se</EmailAddress>
<TelephoneNumber>+46 500 448800</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Skövde</Company>
<SurName>HiS Netadmin</SurName>
- <EmailAddress>netadmin@his.se</EmailAddress>
+ <EmailAddress>mailto:netadmin@his.se</EmailAddress>
<TelephoneNumber>+46 500 448800</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Skövde</Company>
<SurName>IT Helpdesk Högskolan i Skövde</SurName>
- <EmailAddress>helpdesk@his.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@his.se</EmailAddress>
<TelephoneNumber>+46 500 448800</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
index c13c899b..5c5111a5 100644
--- a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -1,8 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.hkr.se/idp/shibboleth">
+ <Extensions>
+ <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: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>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">hkr.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Högskolan Kristianstad</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Kristianstad University Sweden</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Inloggning i webbtjänster för anställda och studenter vid Högskolan Kristianstad.</mdui:Description>
+ <mdui:Description xml:lang="en">The Kristianstad University Login Service is used by employees and students at the university.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.hkr.se/sv/om-hkr/organisation/administration-och-stodverksamhet/it-service/kontoinformation/</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.hkr.se/en/study-at-hkr/service-and-support/it-support-for-students/user-name-and-password/</mdui:InformationURL>
+ <mdui:Logo xml:lang="sv" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="84" width="96">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
+ </mdui:UIInfo>
+ <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DomainHint>hkr.se</mdui:DomainHint>
+ <mdui:IPHint>194.47.24.0/21</mdui:IPHint>
+ <mdui:IPHint>194.47.32.0/21</mdui:IPHint>
+ <mdui:IPHint>194.47.40.0/21</mdui:IPHint>
+ <mdui:GeolocationHint>geo:56.04848,14.14416</mdui:GeolocationHint>
+ </mdui:DiscoHints>
</Extensions>
<KeyDescriptor>
<ds:KeyInfo>
@@ -79,7 +107,26 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
<Organization>
<OrganizationName xml:lang="en">HKR</OrganizationName>
<OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Högskolan Kristianstad</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.hkr.se</OrganizationURL>
+ <OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</OrganizationDisplayName>
+ <OrganizationURL xml:lang="sv">http://www.hkr.se</OrganizationURL>
+ <OrganizationURL xml:lang="en">http://www.hkr.se/en/english-start-page/</OrganizationURL>
</Organization>
+ <ContactPerson contactType="administrative">
+ <Company>Högskolan Kristianstad</Company>
+ <SurName>Service desk 3030</SurName>
+ <EmailAddress>mailto:3030@hkr.se</EmailAddress>
+ <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <Company>Högskolan Kristianstad</Company>
+ <SurName>Service desk 3030</SurName>
+ <EmailAddress>mailto:3030@hkr.se</EmailAddress>
+ <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <Company>Högskolan Kristianstad</Company>
+ <SurName>Service desk 3030</SurName>
+ <EmailAddress>mailto:3030@hkr.se</EmailAddress>
+ <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
+ </ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
index 33ef79b1..ae28e676 100644
--- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ XCYbfP8E3cs4MB+K
<ContactPerson contactType="administrative">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
- <EmailAddress>datagruppen@irf.se</EmailAddress>
+ <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
<TelephoneNumber>+4698079000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
- <EmailAddress>matsl@irf.se</EmailAddress>
+ <EmailAddress>mailto:matsl@irf.se</EmailAddress>
<TelephoneNumber>+4698079022</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Swedish Institute of Space Physics</Company>
<SurName>Mats Luspa</SurName>
- <EmailAddress>matsl@irf.se</EmailAddress>
+ <EmailAddress>mailto:matsl@irf.se</EmailAddress>
<TelephoneNumber>+4698079022</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
index f72b6560..92bf6ea7 100644
--- a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.it.gu.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">gu.se</shibmd:Scope>
@@ -13,7 +20,9 @@
</mdui:UIInfo>
<mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
<mdui:DomainHint>gu.se</mdui:DomainHint>
- <mdui:GeolocationHint>geo:57.6986,11.9712</mdui:GeolocationHint>
+ <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
</mdui:DiscoHints>
</Extensions>
<KeyDescriptor>
@@ -95,18 +104,18 @@ MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
<ContactPerson contactType="administrative">
<Company>University of Gothenburg</Company>
<SurName>Lena Ström</SurName>
- <EmailAddress>lena.strom@gu.se</EmailAddress>
+ <EmailAddress>mailto:lena.strom@gu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Gothenburg</Company>
<SurName>Pablo Millet</SurName>
- <EmailAddress>pablo.millet@gu.se</EmailAddress>
+ <EmailAddress>mailto:pablo.millet@gu.se</EmailAddress>
<TelephoneNumber>+46707104070</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Gothenburg</Company>
<SurName>GU-Support</SurName>
- <EmailAddress>support@gu.se</EmailAddress>
+ <EmailAddress>mailto:support@gu.se</EmailAddress>
<TelephoneNumber>+46317862020</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
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 539dabea..920b44f6 100644
--- a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -91,19 +91,19 @@ VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Stockholm University</Company>
<SurName>Helpdesk</SurName>
- <EmailAddress>helpdesk@su.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
<TelephoneNumber>+46 8 16 1999</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Stockholm University</Company>
<SurName>Helpdesk</SurName>
- <EmailAddress>helpdesk@su.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
<TelephoneNumber>+46 8 16 1999</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Stockholm University</Company>
<SurName>Helpdesk</SurName>
- <EmailAddress>helpdesk@su.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
<TelephoneNumber>+46 8 16 1999</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
index 0613535b..ee1ba4d1 100644
--- a/swamid-2.0/idp.kb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
@@ -199,19 +199,19 @@ hJ2GrICmdWsVIb88lmoEw8Hn/ew=
<ContactPerson contactType="administrative">
<Company>National Library of Sweden</Company>
<SurName>Mattias Olsson</SurName>
- <EmailAddress>mattias.olsson@kb.se</EmailAddress>
+ <EmailAddress>mailto:mattias.olsson@kb.se</EmailAddress>
<TelephoneNumber>+46700073534</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>National Library of Sweden</Company>
<SurName>Mattias Olsson</SurName>
- <EmailAddress>swamid@kb.se</EmailAddress>
+ <EmailAddress>mailto:swamid@kb.se</EmailAddress>
<TelephoneNumber>+46700073534</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>National Library of Sweden</Company>
<SurName>swamid@kb.se</SurName>
- <EmailAddress>swamid@kb.se</EmailAddress>
+ <EmailAddress>mailto:swamid@kb.se</EmailAddress>
<TelephoneNumber>+46700073555</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
index 25394713..45b9c139 100644
--- a/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kkh.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.kkh.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">kkh.se</shibmd:Scope>
@@ -99,19 +106,19 @@ qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
<ContactPerson contactType="administrative">
<Company>Kungl. Konsthögskolan</Company>
<SurName>Fredrik Reuterswärd</SurName>
- <EmailAddress>fredrik.reutersward@kkh.se</EmailAddress>
+ <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
<TelephoneNumber>+4686144064</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Kungl. Konsthögskolan</Company>
<SurName>Fredrik Reuterswärd</SurName>
- <EmailAddress>fredrik.reutersward@kkh.se</EmailAddress>
+ <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
<TelephoneNumber>+4686144064</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Kungl. Konsthögskolan</Company>
<SurName>Fredrik Reuterswärd</SurName>
- <EmailAddress>fredrik.reutersward@kkh.se</EmailAddress>
+ <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
<TelephoneNumber>+4686144064</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index 7f3ca0ce..b6dc9d91 100644
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -99,17 +99,17 @@ SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Royal College of Music</Company>
<SurName>KMH IT-avdelningen</SurName>
- <EmailAddress>swamid@kmh.se</EmailAddress>
+ <EmailAddress>mailto:swamid@kmh.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Royal College of Music</Company>
<SurName>KMH IT-avdelningen</SurName>
- <EmailAddress>swamid@kmh.se</EmailAddress>
+ <EmailAddress>mailto:swamid@kmh.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Royal College of Music</Company>
<SurName>KMH IT HelpDesk</SurName>
- <EmailAddress>helpdesk@kmh.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@kmh.se</EmailAddress>
<TelephoneNumber>+46 8 161939</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml b/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
index 0c4283e8..b5c8f962 100644
--- a/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.konstfack.se-idp-shibboleth.xml
@@ -97,19 +97,19 @@ SHHQuQC8v/yTq6ZVFlRvTNkZ+W/vPYOeE6x49Dygeu65WDf/H2NUy6dggcmH+LpS</ds:X509Certifi
<ContactPerson contactType="administrative">
<Company>Konstfack</Company>
<SurName>Håkan Pettersson</SurName>
- <EmailAddress>hakan.pettersson@konstfack.se</EmailAddress>
+ <EmailAddress>mailto:hakan.pettersson@konstfack.se</EmailAddress>
<TelephoneNumber>+46 8 4504396</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Konstfack</Company>
<SurName>Håkan Pettersson</SurName>
- <EmailAddress>hakan.pettersson@konstfack.se</EmailAddress>
+ <EmailAddress>mailto:hakan.pettersson@konstfack.se</EmailAddress>
<TelephoneNumber>+46 8 4504396</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Konstfack</Company>
<SurName>Helpdesk IT Konstfack</SurName>
- <EmailAddress>helpdesk@konstfack.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@konstfack.se</EmailAddress>
<TelephoneNumber>+46 8 450 4399</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
index 8d10830a..1be5aabf 100644
--- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
@@ -98,17 +98,17 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
</Organization>
<ContactPerson contactType="administrative">
<Company>The Royal Swedish Academy of Sciences</Company>
- <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
+ <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
<TelephoneNumber>+46 70 6739792</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>The Royal Swedish Academy of Sciences</Company>
- <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
+ <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
<TelephoneNumber>+46 70 6739792</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>The Royal Swedish Academy of Sciences</Company>
- <EmailAddress>peter.jacobsson@kva.se</EmailAddress>
+ <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
<TelephoneNumber>+46 70 6739792</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
index d619ea04..38b9e0f0 100644
--- a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
@@ -116,6 +116,6 @@ nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
</Organization>
<ContactPerson contactType="technical">
<Company>Linnæus University</Company>
- <EmailAddress>it.idp@lnu.se</EmailAddress>
+ <EmailAddress>mailto:it.idp@lnu.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.lu.se-idp-shibboleth.xml b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
index 7fc971fa..a02015d2 100644
--- a/swamid-2.0/idp.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lu.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.lu.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">lu.se</shibmd:Scope>
diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index 5f1a0abe..958a4841 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -101,19 +101,19 @@ dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
<ContactPerson contactType="administrative">
<Company>Malmö University</Company>
<SurName>IT Drift</SurName>
- <EmailAddress>drift@mah.se</EmailAddress>
+ <EmailAddress>mailto:drift@mah.se</EmailAddress>
<TelephoneNumber>+46 709 655480</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Malmö University</Company>
<SurName>Robert Faling</SurName>
- <EmailAddress>robert.faling@mah.se</EmailAddress>
+ <EmailAddress>mailto:robert.faling@mah.se</EmailAddress>
<TelephoneNumber>+46 768 428753</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Malmö University</Company>
<SurName>Servicedesk Malmö högskola</SurName>
- <EmailAddress>support@mah.se</EmailAddress>
+ <EmailAddress>mailto:support@mah.se</EmailAddress>
<TelephoneNumber>+46 40 6657555</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
index 38f73071..8b857da0 100644
--- a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
@@ -95,15 +95,15 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
<ContactPerson contactType="administrative">
<Company>NORDUnet</Company>
<SurName>noc@nordu.net</SurName>
- <EmailAddress>noc@nordu.net</EmailAddress>
+ <EmailAddress>mailto:noc@nordu.net</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>NORDUnet</Company>
- <EmailAddress>noc@nordu.net</EmailAddress>
+ <EmailAddress>mailto:noc@nordu.net</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<Company>NORDUnet</Company>
<SurName>NUNOC</SurName>
- <EmailAddress>noc@nordu.net</EmailAddress>
+ <EmailAddress>mailto:noc@nordu.net</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
index 2e83de39..6ba93ed9 100644
--- a/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.rkh.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.rkh.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">rkh.se</shibmd:Scope>
@@ -91,18 +98,18 @@ MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Swedish Red Cross University College</Company>
<SurName>IT-support</SurName>
- <EmailAddress>servicedesk@rkh.se</EmailAddress>
+ <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
<TelephoneNumber>+46858751607/+46858751603</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Swedish Red Cross University College</Company>
<SurName>IT-support</SurName>
- <EmailAddress>servicedesk@rkh.se</EmailAddress>
+ <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
<TelephoneNumber>+46858751607</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Swedish Red Cross University College</Company>
<SurName>IT-Support Röda Korsets Högskola</SurName>
- <EmailAddress>servicedesk@rkh.se</EmailAddress>
+ <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
index ddfbf228..6d4f068a 100644
--- a/swamid-2.0/idp.sics.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
@@ -120,6 +120,6 @@ SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
<ContactPerson contactType="technical">
<Company>SICS</Company>
<SurName>CRIT</SurName>
- <EmailAddress>crit@sics.se</EmailAddress>
+ <EmailAddress>mailto:crit@sics.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
index 8ba6db17..d7af3a09 100644
--- a/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.student.bth.se-idp-shibboleth.xml
@@ -92,19 +92,19 @@ nH4GzdNBUhBostxPfU/hk7XiQOMXNvgHzG2y53Vaa+RZPC45VHuFmyixxGFxktsF
<ContactPerson contactType="administrative">
<Company>Blekinge Institute of Technology - Students</Company>
<SurName>IT Help Desk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Blekinge Institute of Technology - Students</Company>
<SurName>IT Help Desk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Blekinge Institute of Technology - Students</Company>
<SurName>IT Help Desk</SurName>
- <EmailAddress>ithelpdesk@bth.se</EmailAddress>
+ <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
<TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.suni.se-adfs-services-trust.xml b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
index 518df523..bbb025b1 100644
--- a/swamid-2.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
@@ -67,7 +67,7 @@
<ContactPerson contactType="support">
<GivenName>Tomas</GivenName>
<SurName>Legat</SurName>
- <EmailAddress>server@sh.se</EmailAddress>
+ <EmailAddress>mailto:server@sh.se</EmailAddress>
<TelephoneNumber>+46(0)86084000</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp.ths.se-idp-shibboleth.xml b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
new file mode 100644
index 00000000..3d9c8fdd
--- /dev/null
+++ b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.ths.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope regexp="false">ths.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Teologiska högskolan Stockholm</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Stockholm School of Theology</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Teologiska högskolan Stockholm</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Theology</mdui:Description>
+ <mdui:Logo height="100" width="100">https://idp.ths.se/idp/images/ths.png</mdui:Logo>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
+MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
+IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
+QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
+VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
+zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
+iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
+HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
+S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
+GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
+wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
+r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
+GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
+MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
+GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
+Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
+HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
+DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
+aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
+HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
+f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
+Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
+WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
+0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
+58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
+MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
+Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
+ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
+/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
+goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
+mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
+HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
+yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
+UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
+2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
+SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
+xAdB19mh1plahNrAaEfu6Ldetyz9iulY
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ths.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ths.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ths.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ths.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ths.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
+MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
+IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
+QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
+VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
+zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
+iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
+HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
+S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
+GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
+wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
+r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
+GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
+MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
+GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
+Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
+HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
+DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
+aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
+HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
+f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
+Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
+WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
+0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
+58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
+CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
+MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
+Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
+ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
+/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
+goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
+mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
+HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
+ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
+CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
+yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
+UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
+2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
+SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
+xAdB19mh1plahNrAaEfu6Ldetyz9iulY
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
index adae6b1a..bb148636 100644
--- a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.umu.se/saml2/idp/metadata.php">
+ <md:Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </md:Extensions>
<md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<shibmd:Scope regexp="false">umu.se</shibmd:Scope>
@@ -51,19 +58,19 @@
<md:ContactPerson contactType="administrative">
<md:Company>Umeå University</md:Company>
<md:SurName>ITS datordrift</md:SurName>
- <md:EmailAddress>datordrift@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Umeå University</md:Company>
<md:SurName>ITS datordrift</md:SurName>
- <md:EmailAddress>datordrift@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Umeå University</md:Company>
<md:SurName>Servicedesk Umeå universitet</md:SurName>
- <md:EmailAddress>support@its.umu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:support@its.umu.se</md:EmailAddress>
<md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
index d0f8e7a7..4bd23c8f 100644
--- a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp2-1.slu.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">slu.se</shibmd:Scope>
diff --git a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
index 0b39b408..634b3596 100644
--- a/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hig.se-idp-shibboleth.xml
@@ -92,19 +92,19 @@ aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
<ContactPerson contactType="administrative">
<Company>University of Gävle (Alumni)</Company>
<SurName>Network Operations</SurName>
- <EmailAddress>nat@hig.se</EmailAddress>
+ <EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University of Gävle (Alumni)</Company>
<SurName>Network Operations</SurName>
- <EmailAddress>nat@hig.se</EmailAddress>
+ <EmailAddress>mailto:nat@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University of Gävle (Alumni)</Company>
<SurName>IT Support</SurName>
- <EmailAddress>itsupport@hig.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@hig.se</EmailAddress>
<TelephoneNumber>+46 26 648500</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
index 6993b0fd..0a923a72 100644
--- a/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.hv.se-idp-shibboleth.xml
@@ -107,19 +107,19 @@ aRQKNbVQdPN5ht6TrINjDQ==
<ContactPerson contactType="administrative">
<Company>University West</Company>
<SurName>Magnus Andersson</SurName>
- <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
+ <EmailAddress>mailto:Magnus.Andersson@hv.se</EmailAddress>
<TelephoneNumber>+46 520 223193</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>University West</Company>
<SurName>Christian Jiresjö</SurName>
- <EmailAddress>Christian.Jiresjo@hv.se</EmailAddress>
+ <EmailAddress>mailto:Christian.Jiresjo@hv.se</EmailAddress>
<TelephoneNumber>+46 520 223189</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>University West</Company>
<SurName>Servicedesk Högkoslan Väst</SurName>
- <EmailAddress>servicedesk@hv.se</EmailAddress>
+ <EmailAddress>mailto:servicedesk@hv.se</EmailAddress>
<TelephoneNumber>+46 520 223300</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
index 01187453..911c7c60 100644
--- a/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.kau.se-idp-shibboleth.xml
@@ -110,19 +110,19 @@ GLzVTSRgddMNMJEIMmpc6L9XAwW1IObqe3HcLewUmWZgtGKnq1Dd1XPtTRjvQPg9
<ContactPerson contactType="administrative">
<Company>Karlstad University</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>webbteknik@kau.se</EmailAddress>
+ <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
<TelephoneNumber>+46 54 700 2200</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Karlstad University</Company>
<SurName>Paul Scott</SurName>
- <EmailAddress>paul.scott@kau.se</EmailAddress>
+ <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
<TelephoneNumber>+46 54 700 2307</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Karlstad University</Company>
<SurName>IT-avdelningen Karlstads universitet</SurName>
- <EmailAddress>datasupport@kau.se</EmailAddress>
+ <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
<TelephoneNumber>+46 54 700 2200</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
index 66ced1a5..901da821 100644
--- a/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
@@ -51,12 +51,6 @@ wXXiBDXS3PNHXQnnpys=
<md:Company>NORDUnet</md:Company>
<md:GivenName>Leif</md:GivenName>
<md:SurName>Johansson</md:SurName>
- <md:EmailAddress>leifj@nordu.net</md:EmailAddress>
- </md:ContactPerson>
- <md:ContactPerson contactType="technical">
- <md:Company>NORDUnet</md:Company>
- <md:GivenName>Johan</md:GivenName>
- <md:SurName>Berggren</md:SurName>
- <md:EmailAddress>jbn@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
index 596c395a..77514bc3 100644
--- a/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
+++ b/swamid-2.0/keystone.cloud.ipnett.se-shibboleth.xml
@@ -5,7 +5,6 @@
<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>
@@ -23,26 +22,26 @@
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
- MIIDmzCCAoOgAwIBAgIJAKmRdFPTnNe1MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
- BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
- ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
- DTE1MDkwODExMTQwOFoXDTE1MTAwODExMTQwOFowZDELMAkGA1UEBhMCU0UxEjAQ
- BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
- MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
- kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
- XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
- Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
- fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
- kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
- A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
- t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBz
- uy9AUKBxRYIRo/hkp9OlVEnDWUzu2aGLYOKVVL2PUaIiyLT/deJtRvhqz2kxcGFY
- Yiq3Z4vgtPHZbpT4Low3WphgdgtJK7rOQBUVMex+Ydz866roKSQ4/OFdQ26FNfpm
- sUK39i+3pNzhK66Vs5ezCVsF4SidyuCU2Nyta2cYF4n4oTKwEi782OmRpV6T0n40
- yRUDPdrAAONV6l/aLzB356PFJVNrDypOVutvDDGPhPpwfK3dZnVpykXn14aY+yop
- Ns4mS6CJAzBB0aVRbNZ99noV/Qqcog4zNZvQr3ymRfr+JIdTaNisSN1lBjgFoh8d
- 58AtMMXk7/2okGexE3sN
+ MIIDmzCCAoOgAwIBAgIJALMD2UXE6X0+MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+ BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
+ ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
+ DTE1MDkwODExMjIyOFoXDTI2MDgyMTExMjIyOFowZDELMAkGA1UEBhMCU0UxEjAQ
+ BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
+ MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
+ kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
+ XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
+ Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
+ fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
+ kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
+ A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
+ t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA6
+ SRQk0fw4o2f5u0vy3YAu1Zmr1bFCOlG1b4wnWXd6J1j1duHDIE7aWgTdT6bMCU7X
+ AAByaVmYOgzps+38kw27j1EE9CpIvQed6RWD5kDUU5rdpYNfKRvA1+sy62h3qMK4
+ e0Yfo1t7WRG1pz7FWz324PR3mAmXDbhrs47zan0m+Ds7VpI+n4SMKNHzqnMrKDe3
+ HVifjPaoea6SwMrPfuVQPxlwJh1XmtYybkqozmo6RB8Mkt/feN+YUXt9G2Rd5xfr
+ N86EdmlYTjlxDf9XzhXt2xyKO5YsNIv6sgPnGTxZC6/rzx8NYUbfXfFh4HUDEtbY
+ TA50ga7htHv63FhyREun
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -51,26 +50,26 @@
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
- MIIDmzCCAoOgAwIBAgIJAKmRdFPTnNe1MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
- BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
- ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
- DTE1MDkwODExMTQwOFoXDTE1MTAwODExMTQwOFowZDELMAkGA1UEBhMCU0UxEjAQ
- BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
- MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
- DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
- kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
- XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
- Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
- fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
- kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
- A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
- t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBz
- uy9AUKBxRYIRo/hkp9OlVEnDWUzu2aGLYOKVVL2PUaIiyLT/deJtRvhqz2kxcGFY
- Yiq3Z4vgtPHZbpT4Low3WphgdgtJK7rOQBUVMex+Ydz866roKSQ4/OFdQ26FNfpm
- sUK39i+3pNzhK66Vs5ezCVsF4SidyuCU2Nyta2cYF4n4oTKwEi782OmRpV6T0n40
- yRUDPdrAAONV6l/aLzB356PFJVNrDypOVutvDDGPhPpwfK3dZnVpykXn14aY+yop
- Ns4mS6CJAzBB0aVRbNZ99noV/Qqcog4zNZvQr3ymRfr+JIdTaNisSN1lBjgFoh8d
- 58AtMMXk7/2okGexE3sN
+ MIIDmzCCAoOgAwIBAgIJALMD2UXE6X0+MA0GCSqGSIb3DQEBCwUAMGQxCzAJBgNV
+ BAYTAlNFMRIwEAYDVQQKDAlJUG5ldHQgQUIxHjAcBgNVBAsMFUlQbmV0dCBDbG91
+ ZCBTZXJ2aWNlczEhMB8GA1UEAwwYa2V5c3RvbmUuY2xvdWQuaXBuZXR0LnNlMB4X
+ DTE1MDkwODExMjIyOFoXDTI2MDgyMTExMjIyOFowZDELMAkGA1UEBhMCU0UxEjAQ
+ BgNVBAoMCUlQbmV0dCBBQjEeMBwGA1UECwwVSVBuZXR0IENsb3VkIFNlcnZpY2Vz
+ MSEwHwYDVQQDDBhrZXlzdG9uZS5jbG91ZC5pcG5ldHQuc2UwggEiMA0GCSqGSIb3
+ DQEBAQUAA4IBDwAwggEKAoIBAQDGnD+EKpJL8J0QoU726uut/Q/BNlsof72ivhqq
+ kdZDAw8j9C3ILzECplWYjxXR/gO5p1J5plcFqv4/M3q3P3zuiWCETvUA7Ha1cTwI
+ XU+33LqnnYp2SzICl1RfdHYuLSx2kYLhdvaPiOpZJvb6v2WEmcAx0gbEpgHjz3fh
+ Qm572sEksRGZ05Cr+STSicbqWgjEljGonlQWgpyYeLf6MWGg54Z4xWlJXbFk8kG/
+ fuoib7GajfM3qPBa/rv81GBZTPl/6n8NTwHXSRF2ma5+204oZJy2CjW0YJnZW8qB
+ kMGD0bwFBcB8Oh2wjwPF0+bIuVBO4vszUYGsEZB113tAooAhAgMBAAGjUDBOMB0G
+ A1UdDgQWBBTHAWptkTT/t84Tjn28cbnZb/7ZyTAfBgNVHSMEGDAWgBTHAWptkTT/
+ t84Tjn28cbnZb/7ZyTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA6
+ SRQk0fw4o2f5u0vy3YAu1Zmr1bFCOlG1b4wnWXd6J1j1duHDIE7aWgTdT6bMCU7X
+ AAByaVmYOgzps+38kw27j1EE9CpIvQed6RWD5kDUU5rdpYNfKRvA1+sy62h3qMK4
+ e0Yfo1t7WRG1pz7FWz324PR3mAmXDbhrs47zan0m+Ds7VpI+n4SMKNHzqnMrKDe3
+ HVifjPaoea6SwMrPfuVQPxlwJh1XmtYybkqozmo6RB8Mkt/feN+YUXt9G2Rd5xfr
+ N86EdmlYTjlxDf9XzhXt2xyKO5YsNIv6sgPnGTxZC6/rzx8NYUbfXfFh4HUDEtbY
+ TA50ga7htHv63FhyREun
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
diff --git a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
index d394505d..cfe173af 100644
--- a/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
+++ b/swamid-2.0/kiidp.ki.se-idp-shibboleth.xml
@@ -110,19 +110,19 @@ uKycjtOvYOwcvABc1u3WpxJ+CdtbbcHrnYCWXg==
<md:ContactPerson contactType="administrative">
<md:Company>Karolinska Institutet</md:Company>
<md:SurName>Malin Westerberg</md:SurName>
- <md:EmailAddress>malin.westerberg@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:malin.westerberg@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 524 86693</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:Company>Karolinska Institutet</md:Company>
<md:SurName>Eric Johansson</md:SurName>
- <md:EmailAddress>eric.johansson@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 524 86382</md:TelephoneNumber>
</md:ContactPerson>
<md:ContactPerson contactType="support">
<md:Company>Karolinska Institutet</md:Company>
<md:SurName>IT-support</md:SurName>
- <md:EmailAddress>it-support@ki.se</md:EmailAddress>
+ <md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
<md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml b/swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml
new file mode 100644
index 00000000..913e8e5f
--- /dev/null
+++ b/swamid-2.0/kitstaccount01.tst.ki.se-shibboleth.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kitstaccount01.tst.ki.se/shibboleth">
+ <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#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/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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: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://account.tst.ki.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Kontoaktivering Karolinska Institutet (test)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Account activation Karolinska Institutet (test)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Kontoaktiveringstjänst för Karolinska Institutet</mdui:Description>
+ <mdui:Description xml:lang="en">Account activation service for Karolinska Institutet</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>kitstaccount01</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=kitstaccount01</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC8TCCAdmgAwIBAgIJAMotUlCm5wEsMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmtpdHN0YWNjb3VudDAxMB4XDTE1MDYxNzE0NDExM1oXDTI1MDYxNDE0NDEx
+M1owGTEXMBUGA1UEAxMOa2l0c3RhY2NvdW50MDEwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDULV+rqqGOAkO4OzuLHAie9mAXpDM3uMceCDsyJuHBBv3M
+LwN/kFR4hFOMuDl5ZlDMgKyoldfJgrzr9wNxX+yQowzG/I3sOfdKHHWuMYsDnfkQ
+w/BM7FMSPydi//iWRJp18Miv8qJGMMDyX4bBlVPvwsvA4hg9w/Lz7IztpZnF4T9l
+oqEpc+9/wCOZw4YWiye078cg1jz7qgTYNiTNcYrq5IrcjXGHaqgBw1eXWeXNthFh
+HD9uTlpJ8oatCZWxo5iwgbyny0hOTTJw3qWcA6XhpDfP4aZQ9xu+AMz7hsaGxHs/
+3aJXLU2eHPzn24PYUXb+B8GUjvwBS65hsFdiylbzAgMBAAGjPDA6MBkGA1UdEQQS
+MBCCDmtpdHN0YWNjb3VudDAxMB0GA1UdDgQWBBQ5Kcc5QnyPLh/4Klhj7sXcuDvw
+OzANBgkqhkiG9w0BAQUFAAOCAQEAf3vDJ+yv6U6zRagOgoFGs0B6uuffoVbiZw0H
++Vey5DJw6/hbVPZAKPf8FP/Ug/6V693IYCHOFGqSbJyroaggEJoih+eFdFwj1Kcg
+qv0u+jn59/5lwXMZAKEX3lVLZFpN4wqj5LoLPG9eEa+zCBZ0a6Uv32II8LaxWLim
+RPykkeSsNbO1KM0NFZc3S4PXyXAgC4peUykyHZiCekyJO1/3f82kZLUcoGQ3R6Gx
+sxAP68C4FVn1JXlyWwwF0JAhLUWkHo4bzMp8vXTI6C8Vn8TmSgcPTVZKcVUyljj7
+8yH9mWWt0u8sBHe2xo+WAhVOa9SUyyLGHeH+BNjPuT8fZO6p/w==
+</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://account.tst.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://account.tst.ki.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://account.tst.ki.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.tst.ki.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.tst.ki.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://account.tst.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.tst.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.tst.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account.tst.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account.tst.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml b/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
index 754d3c51..c266ef1c 100644
--- a/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
+++ b/swamid-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
@@ -84,6 +84,6 @@ E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
</Organization>
<ContactPerson contactType="technical">
<Company>Swedish Reasearch Council</Company>
- <EmailAddress>kontors-it@vr.se</EmailAddress>
+ <EmailAddress>mailto:kontors-it@vr.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/login.du.se-idp-shibboleth.xml b/swamid-2.0/login.du.se-idp-shibboleth.xml
index bb4e4820..2871d85d 100644
--- a/swamid-2.0/login.du.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.du.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://login.du.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">du.se</shibmd:Scope>
@@ -99,19 +106,19 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
<ContactPerson contactType="administrative">
<Company>Dalarna University</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>shib-admin@du.se</EmailAddress>
+ <EmailAddress>mailto:shib-admin@du.se</EmailAddress>
<TelephoneNumber>+46 23 778891</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Dalarna University</Company>
<SurName>IT-avdelningen</SurName>
- <EmailAddress>shib-admin@du.se</EmailAddress>
+ <EmailAddress>mailto:shib-admin@du.se</EmailAddress>
<TelephoneNumber>+46 23 778891</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Dalarna University</Company>
<SurName>Högskolan Dalarna Support</SurName>
- <EmailAddress>support@du.se</EmailAddress>
+ <EmailAddress>mailto:support@du.se</EmailAddress>
<TelephoneNumber>+46 23 778888</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
index 6ee867bf..e840385b 100644
--- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.idp.eduid.se/idp.xml">
+ <ns0:Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </ns0:Extensions>
<ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<ns0:Extensions>
<ns1:Scope regexp="false">eduid.se</ns1:Scope>
@@ -10,8 +17,8 @@
<mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
<mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
<mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
- <mdui:Logo xml:lang="sv" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
- <mdui:Logo xml:lang="en" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="120" width="320">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
<mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
<mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
<mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
@@ -86,17 +93,17 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
<ns0:ContactPerson contactType="administrative">
<ns0:Company>eduID</ns0:Company>
<ns0:SurName>Valter Nordh</ns0:SurName>
- <ns0:EmailAddress>valter@sunet.se</ns0:EmailAddress>
+ <ns0:EmailAddress>mailto:valter@sunet.se</ns0:EmailAddress>
<ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
</ns0:ContactPerson>
<ns0:ContactPerson contactType="technical">
<ns0:Company>eduID</ns0:Company>
<ns0:SurName>SUNET eduID team</ns0:SurName>
- <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+ <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
</ns0:ContactPerson>
<ns0:ContactPerson contactType="support">
<ns0:Company>eduID</ns0:Company>
<ns0:SurName>eduID Support</ns0:SurName>
- <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
+ <ns0:EmailAddress>mailto:support@eduid.se</ns0:EmailAddress>
</ns0:ContactPerson>
</ns0:EntityDescriptor>
diff --git a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
index dd3d8662..b45eba7c 100644
--- a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
@@ -90,6 +90,6 @@ UXquEqvQ92VtMjTxgKgQRmQKkzigbL4FehuxJaF/BrO8KcshRQQkqdQeUvmY1/QC</ds:X509Certifi
</Organization>
<ContactPerson contactType="technical">
<Company>Handelshögskolan i Stockholm</Company>
- <EmailAddress>itsupport@hhs.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/login.ki.se-idp-shibboleth.xml b/swamid-2.0/login.ki.se-idp-shibboleth.xml
new file mode 100644
index 00000000..e1d90264
--- /dev/null
+++ b/swamid-2.0/login.ki.se-idp-shibboleth.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://login.ki.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Karolinska Institutet (endast nya Ladok)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Karolinska Institutet (only new Ladok)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för Karolinska Institutet.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for Karolinska Institutet.</mdui:Description>
+ <mdui:Logo height="146" width="292">https://login.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+ <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>ki.se</mdui:DomainHint>
+ <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
+ <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
+ <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
+ <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
+ <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
+ <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
+ <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
+ <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
+9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
+n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
+OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
+gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
+0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
+VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
+R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
+nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
+wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
+Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
+GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
+0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
+NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
+iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
+HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
+ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
+VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
+TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
+03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
+247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
+Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
+kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
+reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
+RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
+ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
+i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
+HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
+VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
+xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
+T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
+fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
+rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
+BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ki.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ki.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
+9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
+n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
+OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
+gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
+0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
+VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
+R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
+nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
+wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
+Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
+GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
+0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
+NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
+iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
+HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
+ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
+VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
+TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
+03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
+247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
+Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
+kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
+BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
+MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
+reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
+RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
+ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
+i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
+HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
+VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
+LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
+DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
+xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
+T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
+fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
+rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
+BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/login.liu.se-idp-shibboleth.xml b/swamid-2.0/login.liu.se-idp-shibboleth.xml
index a331e59a..b1e913ea 100644
--- a/swamid-2.0/login.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.liu.se-idp-shibboleth.xml
@@ -104,17 +104,17 @@ dE1S/LL5o/3BCZXOh9Fuvm6ND4e+jSkCizMQNgm4iw==
<ContactPerson contactType="administrative">
<Company>Linköping University</Company>
<SurName>LiU-IT SAML admins</SurName>
- <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+ <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Linköping University</Company>
<SurName>LiU-IT SAML admins</SurName>
- <EmailAddress>saml-admins@it.liu.se</EmailAddress>
+ <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Linköping University</Company>
<SurName>LiU-IT Helpdesk</SurName>
- <EmailAddress>helpdesk@liu.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@liu.se</EmailAddress>
<TelephoneNumber>+46 13 282828</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml b/swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml
new file mode 100644
index 00000000..cd86091b
--- /dev/null
+++ b/swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://login.tst.ki.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Karolinska Institutet (test Shibboleth 3)</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Karolinska Institutet (test Shibboleth 3)</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Test Identity Provider för Karolinska Institutet.</mdui:Description>
+ <mdui:Description xml:lang="en">Test Identity Provider for Karolinska Institutet.</mdui:Description>
+ <mdui:Logo height="146" width="292">https://login.tst.ki.se/images/ki_logo_292x146.png</mdui:Logo>
+ <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>ki.se</mdui:DomainHint>
+ <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
+ <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
+ <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
+ <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
+ <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
+ <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
+ <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
+ <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
+ <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
+ <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
+ <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
+ <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
+Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
+V8gzg8MFWL9vwAyTmg9prTkOzHxVSXpvrXz+Sr9OvAcpG7Qcia7+rS+raRMqaiG+
++3tF932XgCZmq532oSYxFLk/ZssmyHQiUYY/tzC832yoiM8vIHYuQeyaD2i9HdhH
+vS4FLLcP5k4H166wW/uUkRDs/pG2e7uiT6RIhavV3sUIPlzRdkkuYhURcGjpTCsb
+5DRb+FmkRHH61OdLJMkqi7c8z3jmRXBZn+FsENElQPySzaiWJI+XKS8Mn36sFrTM
+gOXEYC3u9H6k3ZdXYVq+Brh0dwaQi7waPt3FJpfYPIDwxOYKtLHrgoS0MzECAwEA
+AaNlMGMwHQYDVR0OBBYEFMi5T4diS2VMxS0jWp5BszYiV96bMEIGA1UdEQQ7MDmC
+D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
++JZ/VvmJJXF7t/YADLYQEhU4ybZOc0MRvGV6IKrmEwXHOpIcD7Uf+T1rvyIKQ24l
+a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
+s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
+WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
+n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
+DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
+tE4BnM29l3kUIPO17FPURUkhbrl86SeWHE6xPRATi9XHG44o9ACsLyR85FWkeGnj
+o26QqovXOxFn+YDEXIFu2Ier2YxJiL8MWte5n41Wf1poZQb0Sf4o+LOSrVZxd98n
+xzEuCJ93Luf4RxB9l+dfoVK4EDp6AAIJO/sxBmeEYfvNFukp+duyDFdQV1oSWaWg
+TMIqmaPevF4t39YwGCutFpZJyp++jfkixbNHzC75xiFyWfdumMcOs5FYA70rPUEl
+ZgQs1pUZv4qP7VeNNS6QXQyQl86kxMN7XfymgoqLQdHN2e1+JiEsk95kmwIDAQAB
+o2UwYzAdBgNVHQ4EFgQUTvEk7OlxQx65QaRT+nO7cuOY71wwQgYDVR0RBDswOYIP
+bG9naW4udHN0LmtpLnNlhiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATSLgQWRc05CI6vkw8fCaC4pAYKmu
+uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
+EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
+N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
+fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
+MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
+Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
+DV2qXwakGUN8o2tdxn+zXKcrN0QN1CUsHkQlZ2m3PEEZlpgsp618SBGJVOHsLea8
+v3UxoEtw9BSGWip8xyWKMAhRh7KRmq4K4OqdNlo6M30KuPpPe0ZkI7gA2qR2lVv6
+ybR97uc9DrM8wKJjwYJKaYFeePdU99H4l2bzR6Au3mJ8Dd4Vq4wIPhC0ADvvDzU4
+UfZY/YkqAyroiwPZsaM2o8mspDqnbTOu6lPM4XeKFYKNdDamFVimnYLDKgM81/Ne
+IMv/7Klx5zt1Tf5NZaxgZ/xSXdQQAgQe/emteLIV5bdtIWlmT6O7WUI5QiUCAwEA
+AaNlMGMwHQYDVR0OBBYEFF7LNVAsmm6yfKeW7ViJuMrPTWfHMEIGA1UdEQQ7MDmC
+D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACYeLTIPNFIMCey2yr95YxXdZTzB
+wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
+l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
+xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
+U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
+jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.tst.ki.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.tst.ki.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.tst.ki.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
+Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
+V8gzg8MFWL9vwAyTmg9prTkOzHxVSXpvrXz+Sr9OvAcpG7Qcia7+rS+raRMqaiG+
++3tF932XgCZmq532oSYxFLk/ZssmyHQiUYY/tzC832yoiM8vIHYuQeyaD2i9HdhH
+vS4FLLcP5k4H166wW/uUkRDs/pG2e7uiT6RIhavV3sUIPlzRdkkuYhURcGjpTCsb
+5DRb+FmkRHH61OdLJMkqi7c8z3jmRXBZn+FsENElQPySzaiWJI+XKS8Mn36sFrTM
+gOXEYC3u9H6k3ZdXYVq+Brh0dwaQi7waPt3FJpfYPIDwxOYKtLHrgoS0MzECAwEA
+AaNlMGMwHQYDVR0OBBYEFMi5T4diS2VMxS0jWp5BszYiV96bMEIGA1UdEQQ7MDmC
+D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
++JZ/VvmJJXF7t/YADLYQEhU4ybZOc0MRvGV6IKrmEwXHOpIcD7Uf+T1rvyIKQ24l
+a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
+s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
+WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
+n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
+DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
+tE4BnM29l3kUIPO17FPURUkhbrl86SeWHE6xPRATi9XHG44o9ACsLyR85FWkeGnj
+o26QqovXOxFn+YDEXIFu2Ier2YxJiL8MWte5n41Wf1poZQb0Sf4o+LOSrVZxd98n
+xzEuCJ93Luf4RxB9l+dfoVK4EDp6AAIJO/sxBmeEYfvNFukp+duyDFdQV1oSWaWg
+TMIqmaPevF4t39YwGCutFpZJyp++jfkixbNHzC75xiFyWfdumMcOs5FYA70rPUEl
+ZgQs1pUZv4qP7VeNNS6QXQyQl86kxMN7XfymgoqLQdHN2e1+JiEsk95kmwIDAQAB
+o2UwYzAdBgNVHQ4EFgQUTvEk7OlxQx65QaRT+nO7cuOY71wwQgYDVR0RBDswOYIP
+bG9naW4udHN0LmtpLnNlhiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hp
+YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATSLgQWRc05CI6vkw8fCaC4pAYKmu
+uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
+EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
+N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
+fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
+MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
+CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
+Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
+DV2qXwakGUN8o2tdxn+zXKcrN0QN1CUsHkQlZ2m3PEEZlpgsp618SBGJVOHsLea8
+v3UxoEtw9BSGWip8xyWKMAhRh7KRmq4K4OqdNlo6M30KuPpPe0ZkI7gA2qR2lVv6
+ybR97uc9DrM8wKJjwYJKaYFeePdU99H4l2bzR6Au3mJ8Dd4Vq4wIPhC0ADvvDzU4
+UfZY/YkqAyroiwPZsaM2o8mspDqnbTOu6lPM4XeKFYKNdDamFVimnYLDKgM81/Ne
+IMv/7Klx5zt1Tf5NZaxgZ/xSXdQQAgQe/emteLIV5bdtIWlmT6O7WUI5QiUCAwEA
+AaNlMGMwHQYDVR0OBBYEFF7LNVAsmm6yfKeW7ViJuMrPTWfHMEIGA1UdEQQ7MDmC
+D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACYeLTIPNFIMCey2yr95YxXdZTzB
+wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
+l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
+xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
+U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
+jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+ </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
new file mode 100644
index 00000000..6d13ec2a
--- /dev/null
+++ b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ludicris.lub.lu.se/Shibboleth">
+ <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/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Lucris test</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lucris test</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Uppdaterat forsknings information system</mdui:Description>
+ <mdui:Description xml:lang="en">Current research information system</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEETCCAvmgAwIBAgIJAIw2INOkQuPLMA0GCSqGSIb3DQEBCwUAMIGeMQswCQYDVQQGEwJzZTEO
+MAwGA1UECAwFc2thbmUxDTALBgNVBAcMBGx1bmQxGDAWBgNVBAoMD0x1bmQgVW5pdmVyc2l0eTEb
+MBkGA1UECwwSVW5pdmVyc2l0eSBMaWJyYXJ5MREwDwYDVQQDDAhsdWRpY3JpczEmMCQGCSqGSIb3
+DQEJARYXZGF2aWQuaG9sb3Noa2FAdWIubHUuc2UwHhcNMTUxMTA5MDk0OTQ5WhcNMTcxMDI5MDk0
+OTQ5WjCBnjELMAkGA1UEBhMCc2UxDjAMBgNVBAgMBXNrYW5lMQ0wCwYDVQQHDARsdW5kMRgwFgYD
+VQQKDA9MdW5kIFVuaXZlcnNpdHkxGzAZBgNVBAsMElVuaXZlcnNpdHkgTGlicmFyeTERMA8GA1UE
+AwwIbHVkaWNyaXMxJjAkBgkqhkiG9w0BCQEWF2RhdmlkLmhvbG9zaGthQHViLmx1LnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEdl2vqOVz1qy8S13/9CqYXp2VyrTz+LtIFZf5H/
+45Inzd0I1EMeDPZsW3CNfEmkJMlQzlwH35mQNPFwEL9hsk26I27WRfBc5Md1dviE3zPb54LQfRJP
+ZDaAqP+7fJ2jEUzomJWrO1qUZ08ikMRlZAg/RqkXsf/+yWFhD99n32jwMfWUz4/TW7/hcQnglQTm
+x6iYah6YiQzHAcKDG15eenCzbQEuiYx3jU5mvXR/t2EEYNV3j/QpsS9HRz+2pJNHKBzZJmt6JinG
+TNuknCxqeHLVca5MJXC+TWXBEaQU4ec4BZ1QpnHXvfJ/fPjLm4mFAC/s3kDYBPBLV5N51+c6eQID
+AQABo1AwTjAdBgNVHQ4EFgQU4mr68BYrn/ePlI3AzlErLjyV+w8wHwYDVR0jBBgwFoAU4mr68BYr
+n/ePlI3AzlErLjyV+w8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEASF2PhO6m5GQE
+DaKfV4Urtilp1Ru2hctQX+mhE16JGTHcFWYjO298Y8OmUV1845tUAU+Bgv4DHSWYqUtwutxuNLOL
+gI5cNJs+aCq5/opE4Ele2fcHZ3uvpOU6IrZAG1bu2rheW7KamW88CE5QQ1vWCaGHxdYw1cKyvxoD
+8R4AfsDq0caHuWC8HBozWj2v7F8MlKxQjhPdukYkfQJ8JbHmCQ4HMdgC2f1+s1E1EAVR9zRPHTaB
+qIpjIsKQTnr0tI/EteQ0mJ0T4V5pNp0aJfH+H/RFlDBimI/W3x0fGQg9Xy7ZzkmQvwjCdQFVZRPA
+uuNxKggJPJhRph8bitha6sR6EQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEETCCAvmgAwIBAgIJAIw2INOkQuPLMA0GCSqGSIb3DQEBCwUAMIGeMQswCQYDVQQGEwJzZTEO
+MAwGA1UECAwFc2thbmUxDTALBgNVBAcMBGx1bmQxGDAWBgNVBAoMD0x1bmQgVW5pdmVyc2l0eTEb
+MBkGA1UECwwSVW5pdmVyc2l0eSBMaWJyYXJ5MREwDwYDVQQDDAhsdWRpY3JpczEmMCQGCSqGSIb3
+DQEJARYXZGF2aWQuaG9sb3Noa2FAdWIubHUuc2UwHhcNMTUxMTA5MDk0OTQ5WhcNMTcxMDI5MDk0
+OTQ5WjCBnjELMAkGA1UEBhMCc2UxDjAMBgNVBAgMBXNrYW5lMQ0wCwYDVQQHDARsdW5kMRgwFgYD
+VQQKDA9MdW5kIFVuaXZlcnNpdHkxGzAZBgNVBAsMElVuaXZlcnNpdHkgTGlicmFyeTERMA8GA1UE
+AwwIbHVkaWNyaXMxJjAkBgkqhkiG9w0BCQEWF2RhdmlkLmhvbG9zaGthQHViLmx1LnNlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvEdl2vqOVz1qy8S13/9CqYXp2VyrTz+LtIFZf5H/
+45Inzd0I1EMeDPZsW3CNfEmkJMlQzlwH35mQNPFwEL9hsk26I27WRfBc5Md1dviE3zPb54LQfRJP
+ZDaAqP+7fJ2jEUzomJWrO1qUZ08ikMRlZAg/RqkXsf/+yWFhD99n32jwMfWUz4/TW7/hcQnglQTm
+x6iYah6YiQzHAcKDG15eenCzbQEuiYx3jU5mvXR/t2EEYNV3j/QpsS9HRz+2pJNHKBzZJmt6JinG
+TNuknCxqeHLVca5MJXC+TWXBEaQU4ec4BZ1QpnHXvfJ/fPjLm4mFAC/s3kDYBPBLV5N51+c6eQID
+AQABo1AwTjAdBgNVHQ4EFgQU4mr68BYrn/ePlI3AzlErLjyV+w8wHwYDVR0jBBgwFoAU4mr68BYr
+n/ePlI3AzlErLjyV+w8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEASF2PhO6m5GQE
+DaKfV4Urtilp1Ru2hctQX+mhE16JGTHcFWYjO298Y8OmUV1845tUAU+Bgv4DHSWYqUtwutxuNLOL
+gI5cNJs+aCq5/opE4Ele2fcHZ3uvpOU6IrZAG1bu2rheW7KamW88CE5QQ1vWCaGHxdYw1cKyvxoD
+8R4AfsDq0caHuWC8HBozWj2v7F8MlKxQjhPdukYkfQJ8JbHmCQ4HMdgC2f1+s1E1EAVR9zRPHTaB
+qIpjIsKQTnr0tI/EteQ0mJ0T4V5pNp0aJfH+H/RFlDBimI/W3x0fGQg9Xy7ZzkmQvwjCdQFVZRPA
+uuNxKggJPJhRph8bitha6sR6EQ==</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://ludicris.lub.lu.se/admin/saml/SingleLogout/alias/pure"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://ludicris.lub.lu.se/admin/saml/SingleLogout/alias/pure"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://ludicris.lub.lu.se/admin/saml/SingleLogout/alias/pure"/>
+ <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:transient</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://ludicris.lub.lu.se/admin/saml/SSO/alias/pure" index="0"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://ludicris.lub.lu.se/admin/saml/SSO/alias/pure" index="1" isDefault="true"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>David</md:GivenName>
+ <md:SurName>Holoshka</md:SurName>
+ <md:EmailAddress>david.holoshka@ub.lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ludwig.lub.lu.se-sp.xml b/swamid-2.0/ludwig.lub.lu.se-sp.xml
new file mode 100644
index 00000000..1b81627e
--- /dev/null
+++ b/swamid-2.0/ludwig.lub.lu.se-sp.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- EntityDescriptor requires an "entityID" attribute. -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ludwig.lub.lu.se/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/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</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 ">
+ <md:Extensions>
+ <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://login.ludwig.lub.lu.se/Shibboleth.sso/DS" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Universitetsbiblioteket vid Lunds universitets EZproxy</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Lund University Library Proxy</mdui:DisplayName>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>MIIDfTCCAuagAwIBAgIBCjANBgkqhkiG9w0BAQUFADCBjDEZMBcGA1UEAxMQbHVk
+d2lnLmx1Yi5sdS5zZTELMAkGA1UEBhMCU0UxGDAWBgNVBAoTD0x1bmQgVW5pdmVy
+c2l0eTEgMB4GA1UECxMXTHVuZCBVbml2ZXJzaXR5IExpYnJhcnkxJjAkBgkqhkiG
+9w0BCQEWF0RhdmUuU2hlcm9obWFuQHViLmx1LnNlMB4XDTE1MTIwODEwMjcyMFoX
+DTE2MTIwNzEwMjcyMFowgYwxGTAXBgNVBAMTEGx1ZHdpZy5sdWIubHUuc2UxCzAJ
+BgNVBAYTAlNFMRgwFgYDVQQKEw9MdW5kIFVuaXZlcnNpdHkxIDAeBgNVBAsTF0x1
+bmQgVW5pdmVyc2l0eSBMaWJyYXJ5MSYwJAYJKoZIhvcNAQkBFhdEYXZlLlNoZXJv
+aG1hbkB1Yi5sdS5zZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApb2UyEvo
+xZwI7tjUSLLcisNsVu30dF9cIjuWXWoH7tmTP5CVOfdzyzjJtcfxdccpSIbAjBdk
+0dIKb4q/+MufcWFfczyMzQcDxMCSl9jX1AInLwjdMrPEIggvBcdh5HgJlrsYzWL6
+PffUn4WSy38g0I65MsDK9U7JLtryDyIht78CAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
+UozZB/p7OI56DLF2nv/4f0vYFFgwgbkGA1UdIwSBsTCBroAUUozZB/p7OI56DLF2
+nv/4f0vYFFihgZKkgY8wgYwxGTAXBgNVBAMTEGx1ZHdpZy5sdWIubHUuc2UxCzAJ
+BgNVBAYTAlNFMRgwFgYDVQQKEw9MdW5kIFVuaXZlcnNpdHkxIDAeBgNVBAsTF0x1
+bmQgVW5pdmVyc2l0eSBMaWJyYXJ5MSYwJAYJKoZIhvcNAQkBFhdEYXZlLlNoZXJv
+aG1hbkB1Yi5sdS5zZYIBCjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GB
+ACfIOlklPpPy/CSkVKlUV1FfGFnjRGaMQ/v5JNuB0onPUlS+/BXLkO4c04H2YmtB
+ZjHVX55+FCLvn94f93DtQ5QSlnsL89mUKgIZkJVsIbi6oR9lGn/XTAN5GUc9IVnB
+mmitGb4pfJ2KSrUN4lHz+7RJSlS8SpNH9tCS4CSgNbRR
+</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML/POST" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML/Artifact" index="4"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Dave</md:GivenName>
+ <md:SurName>Sherohman</md:SurName>
+ <md:EmailAddress>Dave.Sherohman@ub.lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/mp.uu.se-shibboleth.sso.xml b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
index 91f9b9f1..9052a7d6 100644
--- a/swamid-2.0/mp.uu.se-shibboleth.sso.xml
+++ b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
@@ -5,6 +5,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/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>
@@ -58,9 +59,9 @@ Ohr8KLKt6tC/JZ059e8ENxrN7g==
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:ContactPerson contactType="support">
- <md:EmailAddress>servicedesk@uu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
- <md:EmailAddress>liferay-datordrift@its.uu.se</md:EmailAddress>
+ <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml b/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
index 50ca0a2e..0ac477fc 100644
--- a/swamid-2.0/wisumstage.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml
@@ -3,7 +3,7 @@
This is example metadata only. Do *NOT* supply it as is without review,
and do *NOT* provide it in real time to your partners.
-->
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wisumstage.its.umu.se/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nya-gerrit.its.umu.se/shibboleth">
<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"/>
@@ -25,58 +25,43 @@ and do *NOT* provide it in real time to your partners.
<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://wisumstage.its.umu.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://wisumstage.its.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/MIUN"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/HH"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/UMU"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/SU"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/KI"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/SU"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/KTH"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/HIG"/>
- <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://wisumstage.its.umu.se/Shibboleth.sso/LTU"/>
+ <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://nya-gerrit.its.umu.se/Shibboleth.sso/DS"/>
+ <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://nya-gerrit.its.umu.se/Shibboleth.sso/DS" index="1"/>
+ <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://nya-gerrit.its.umu.se/Shibboleth.sso/Login"/>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">ITS, Umeå universitet</mdui:DisplayName>
- <mdui:DisplayName xml:lang="en">ITS, Umea University</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Serviceprovider, används primärt för utveckling</mdui:Description>
- <mdui:Description xml:lang="en">Serviceprovider, primarily used for development</mdui:Description>
+ <mdui:DisplayName xml:lang="sv">Gerrit för NyA på ITS, Umeå universitet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Gerrit for NyA at ITS, Umeå university</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Gerrit för NyA på ITS, Umeå universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Gerrit for NyA at ITS, Umeå university</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>its-utv03.ad.umu.se</ds:KeyName>
+ <ds:KeyName>nya-gerrit.its.umu.se</ds:KeyName>
<ds:X509Data>
- <ds:X509SubjectName>emailAddress=ake.andersson@umu.se,CN=its-utv03.ad.umu.se,OU=Organizational Unit Name:ITS,O=ITS,L=Umea,ST=Vasterbotten,C=SE</ds:X509SubjectName>
- <ds:X509Certificate>MIIEKzCCAxOgAwIBAgIJAMZSkH53CntAMA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
-VQQGEwJTRTEVMBMGA1UECAwMVmFzdGVyYm90dGVuMQ0wCwYDVQQHDARVbWVhMQww
-CgYDVQQKDANJVFMxJTAjBgNVBAsMHE9yZ2FuaXphdGlvbmFsIFVuaXQgTmFtZTpJ
-VFMxHDAaBgNVBAMME2l0cy11dHYwMy5hZC51bXUuc2UxIzAhBgkqhkiG9w0BCQEW
-FGFrZS5hbmRlcnNzb25AdW11LnNlMB4XDTE0MDkyMzA4MzQxMloXDTE3MDgwNjA4
-MzQxMlowgasxCzAJBgNVBAYTAlNFMRUwEwYDVQQIDAxWYXN0ZXJib3R0ZW4xDTAL
-BgNVBAcMBFVtZWExDDAKBgNVBAoMA0lUUzElMCMGA1UECwwcT3JnYW5pemF0aW9u
-YWwgVW5pdCBOYW1lOklUUzEcMBoGA1UEAwwTaXRzLXV0djAzLmFkLnVtdS5zZTEj
-MCEGCSqGSIb3DQEJARYUYWtlLmFuZGVyc3NvbkB1bXUuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6WjbxUU6Sy8YeZIeQ11E2eH66YG/CcAy3nd2g
-0ai2Dzu03wCD+GNdWPuZslLlkvK4AE6iR2+ZQgkqzBoI7ifpxSbnPMfPDMjNK5Yx
-Ix7EHE1kgD7D1iCz30H2O9/oNSVjykMXnjLMlLBYaDjxZoj+L3pwKKTW6Yzg6T7o
-z90xke1qpcVOD0+e2vgLoYbIq7QTzF/VkPyRrDwsbw3f4WiJiRAI9dNLPdt6fh6F
-ePKKPv6xUEOO1uDjVmwL7HUYfh6br5G6jR642rnbJhqd5HJiD1Sn+BMv2ilVFHOr
-KclBHavS9aKvj++IVdjTMk0/APsSi8uV2RF1UEeUVh2afi2pAgMBAAGjUDBOMB0G
-A1UdDgQWBBS/yT6QYUoPUWKDcpJe52kqdgRKXzAfBgNVHSMEGDAWgBS/yT6QYUoP
-UWKDcpJe52kqdgRKXzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCa
-53ROhR17tvRIoeBhUZ3WICcNsrN88LcQX6iiD9beWr4bLYn0hX+vgs/EoznuLZPL
-9yBPk5XlVfRJA6XGQ2mrcWeVPapduIOeRX5MpBaOhOULMahTC9VztR+0/h5lUiVF
-MgYw/UX/wMJheDvEqt31DrwfGPH7cFnZZnNiDBNzpe7RTx5r6W9lXROzyl0BJ+l/
-N1edCRg4D+SjXviDNKli19pL82ONv0x607sCLGKEDR3qhQxd7wcGcNGwlg32MFNQ
-vk7XtvHnrAqG1Nn1WrK5npXCw9Tx8omdql4W0fhtdHDffSxO7iNVswPS8/fYIYHc
-xjIf5blaR7shDIsqWMix
+ <ds:X509SubjectName>CN=nya-gerrit.its.umu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAPYUOmUEXEx7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFW55YS1nZXJyaXQuaXRzLnVtdS5zZTAeFw0xNTEyMTYwODU2NDRaFw0yNTEy
+MTMwODU2NDRaMCAxHjAcBgNVBAMTFW55YS1nZXJyaXQuaXRzLnVtdS5zZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMt6Yzi3g3Zi2xU/5x0ko16wX6W9
+0MUT/qfPGXpRxbZ7XFtie7Nta7fkycWKbbPVbwqKN8UfFwHX8nKQXDH1qr+DcUsg
+aZkpuZWQCmBak0suJMe9KoWHtuV4rRLy/bGdP1nr/iCQXgzzMaK5Vl3zjwveMGLm
+8o8IEKseiXhOIi6SylOIr7uXSISJDXMsp8ci3+/x5BxspObSabMYP4N/BmHyLS9B
+qRUaPnZXLkAtACJKoO3tFp8WRD8km0MIHxVwyWlt5VZ/O07SwR/aE5S00N90uTUi
+DZvLTdGf5oqFEpvbwwvtxlh+YGa21NTG5gr3jvhBUTPg9htaHXCjoVDOYk8CAwEA
+AaNDMEEwIAYDVR0RBBkwF4IVbnlhLWdlcnJpdC5pdHMudW11LnNlMB0GA1UdDgQW
+BBQFyI1JDTEsUquK39VeFpxYxsURZTANBgkqhkiG9w0BAQUFAAOCAQEAtPNFyjz3
+kCnoRXulU7Q0jCRLUwpprWXnf2dljDDdQWtsT+tGsVPsvkIOw2l8pCHtyk6H2xqs
+0NW5mg3DwveZfs6D2CSMCfjeR/snrFRkecWow+zAJ49Qhb/dzCgwT2HhcWNr/PlY
+Btpf6GrNXRBK32odHiayHphOlMzIjo8Rg3w5o5S4xFH/4njP3dE5yeS6npXBD61P
++Cd3DAHgCMRdOg9XdZFhV1FP/G1h4iBkwXYDGyMyQeVsx3TEmvgwWs/J1mCWXBCR
+t4sAFjL3EzEpVBBtvV7lMHO8Z+6Xqc7La0Auy6ZfZgovFyz919WkueKCdjGZXsJ3
+0PUBKN9pvQ4JWQ==
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
@@ -90,19 +75,19 @@ xjIf5blaR7shDIsqWMix
<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://wisumstage.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wisumstage.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wisumstage.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nya-gerrit.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
</md:EntityDescriptor>
diff --git a/swamid-2.0/play.mah.se-shibboleth.xml b/swamid-2.0/play.mah.se-shibboleth.xml
deleted file mode 100644
index dcf262f4..00000000
--- a/swamid-2.0/play.mah.se-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.mah.se/shibboleth">
- <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/nren-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://play.mah.se/Shibboleth.sso/DS/ds.sunet.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://play.mah.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
- </md:Extensions>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>play.mah.se</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=play.mah.se</ds:X509SubjectName>
- <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJ52xKQD6ay3MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC3BsYXkubWFoLnNlMB4XDTEyMDgyOTE0MDMzN1oXDTIyMDgyNzE0MDMzN1ow
-FjEUMBIGA1UEAxMLcGxheS5tYWguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDrgam1nuLBzhYJobwHV+vg7uJwRgsO7E0xfWhq/SyAQtODUW0CXZHN
-s7C6O7e/AFiqpMyLOuPzKr7K2PClY1ShRIm3//GFAMpS2S90F6qwkl67q4jVD/pP
-4zUGRwS8OP6gkIMInFiXrEnzz6nYU+/GNdbmqBsj9/8uLdJYdAbkZnlQkbrpCCkp
-nHwy7GETegUGX3mG+/uu+ELRoc4ZcSZKRCheSDy+kk0QGnH+vP0FdBtM/7RCXuIb
-LHH0Hr2SdknlC5yCgRN3btHZ0d2v2srkkR+6VyyVz64b57Gl4+YY4+NRoH6gmmMD
-qSd698RS1Nl8lNAfE0rBQmEVkP0LT82BAgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
-YXkubWFoLnNlhgtwbGF5Lm1haC5zZTAdBgNVHQ4EFgQUr1PVojxYdezL39aUSZKD
-uaLlcvQwDQYJKoZIhvcNAQEFBQADggEBAJckuU+nW3Sz01q4LQNBVyhFaoHmVu1e
-ZmkSK7NaBquwoYe1VvAgGc4c7iPjM11NVCR/TUfhCn/J97VeQ4JldUaA0yIFVpEw
-0787mKe6bY7MimHrdaQLd4NVL9t2cVgI3zh2cDIeAEcxymEw3plzQIgpFE2u+PAc
-a/NnrvrHXSzY2eLmtCmpqe7EIG8IWl0ehpuKEqYSBjtbQr2NF5iwwPigP5BnOrWn
-sCeIp6hryi9ispKWFrfqlxNblBAFlLAeDtDlcxDB3e45AHamq2QMEfy3ddu566sO
-mjNx3LBpLI4AqwE4TzvxzUkL5k5ZSpVzESJHvb9ljx3jnzEZuWZpH4A=
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mah.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mah.se/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mah.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mah.se/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.mah.se/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mah.se/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mah.se/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://play.mah.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.mah.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://play.mah.se/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.mah.se/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.mah.se/Shibboleth.sso/SAML/Artifact" index="6"/>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/play.mah.se.xml b/swamid-2.0/play.mah.se.xml
new file mode 100644
index 00000000..d563dd36
--- /dev/null
+++ b/swamid-2.0/play.mah.se.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://play.mah.se">
+ <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/nren-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">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Malmö University Play service</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Malmö högskolas Play tjänst</mdui:DisplayName>
+ <mdui:Description xml:lang="en">This is the Malmö University streaming service</mdui:Description>
+ <mdui:Description xml:lang="sv">Detta är Malmö högskolas play tjänst</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEEjCCAvqgAwIBAgIJAJDfatluVXscMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAnNlMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ4wDAYDVQQHFAVNYWxt9jEZMBcGA1UEChQQTWFsbfYgVW5pdmVyc2l0eTEUMBIGA1UEAxMLcGxheS5tYWguc2UwHhcNMTUxMDIxMDgzMzI5WhcNMjUxMDIwMDgzMzI5WjBjMQswCQYDVQQGEwJzZTETMBEGA1UECBMKU29tZS1TdGF0ZTEOMAwGA1UEBxQFTWFsbfYxGTAXBgNVBAoUEE1hbG32IFVuaXZlcnNpdHkxFDASBgNVBAMTC3BsYXkubWFoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qq/V00tBbzg5h3kverDzW1wg+2FJVvR1rXkALbCMPAS9vfKq66XmPjZMV0Cxsax8iLh5cmN5VTBY/bG7ITBKcj2UzTPssSSvQ0S+3E/hiVAXeJccC5v5g1qhqwzgrMHaPLpPxosNOllfWrYeRLexpvt4H5jI3Cf+oZ2d22QgHqGv6QbWFIP3RmKpEGVoJYjeZvlzbr+Z5t/5ASw63aZUvvyX4qd7n1TVMnk0lQb2lj14qRyoFzNOyM9am1ocfIHZE04VqbRQ0YT3Ll4Y1HzSu3HU01axKDCof5gtIbYvE442SFJG9F+JspJOAueVqmrPMiVC9kf1dYWRWefVmAp8QIDAQABo4HIMIHFMB0GA1UdDgQWBBQMJeN/USD/eVr7VtT9a+Z8d7oyTTCBlQYDVR0jBIGNMIGKgBQMJeN/USD/eVr7VtT9a+Z8d7oyTaFnpGUwYzELMAkGA1UEBhMCc2UxEzARBgNVBAgTClNvbWUtU3RhdGUxDjAMBgNVBAcUBU1hbG32MRkwFwYDVQQKFBBNYWxt9iBVbml2ZXJzaXR5MRQwEgYDVQQDEwtwbGF5Lm1haC5zZYIJAJDfatluVXscMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFsGTUKxKgAeo+nCP60eBkRLAD98siRERqx7BCkqbcjnRGk9jzeR1QQV9EkO2EAKrVdw8trjyRK6QWkiFyjGz7kTweQf6KSAq4uw5blOpoMqOLkqBdkaBIiwsBpAGJSYSlNKxpjMo4h55NlMbKzYWyaQbiBEHL/FKqAprN097T5KFDdK0JXzAAbiMqyHx260FEp4D3uNYUmKGa5PcAA4RGPNcWQO4ocenWryUABBTzUf8ZFFF843Yh/P3wdaK7fTOW3Xc6e+DGtQAAPAID7BFEQChwUdv9rV04L5ldsnzyQ7vAxjB4wzwCt0EKO82VOq/T4ypUldH/z9IjTcVxPfTuU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>MIIEEjCCAvqgAwIBAgIJAJDfatluVXscMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAnNlMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ4wDAYDVQQHFAVNYWxt9jEZMBcGA1UEChQQTWFsbfYgVW5pdmVyc2l0eTEUMBIGA1UEAxMLcGxheS5tYWguc2UwHhcNMTUxMDIxMDgzMzI5WhcNMjUxMDIwMDgzMzI5WjBjMQswCQYDVQQGEwJzZTETMBEGA1UECBMKU29tZS1TdGF0ZTEOMAwGA1UEBxQFTWFsbfYxGTAXBgNVBAoUEE1hbG32IFVuaXZlcnNpdHkxFDASBgNVBAMTC3BsYXkubWFoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1qq/V00tBbzg5h3kverDzW1wg+2FJVvR1rXkALbCMPAS9vfKq66XmPjZMV0Cxsax8iLh5cmN5VTBY/bG7ITBKcj2UzTPssSSvQ0S+3E/hiVAXeJccC5v5g1qhqwzgrMHaPLpPxosNOllfWrYeRLexpvt4H5jI3Cf+oZ2d22QgHqGv6QbWFIP3RmKpEGVoJYjeZvlzbr+Z5t/5ASw63aZUvvyX4qd7n1TVMnk0lQb2lj14qRyoFzNOyM9am1ocfIHZE04VqbRQ0YT3Ll4Y1HzSu3HU01axKDCof5gtIbYvE442SFJG9F+JspJOAueVqmrPMiVC9kf1dYWRWefVmAp8QIDAQABo4HIMIHFMB0GA1UdDgQWBBQMJeN/USD/eVr7VtT9a+Z8d7oyTTCBlQYDVR0jBIGNMIGKgBQMJeN/USD/eVr7VtT9a+Z8d7oyTaFnpGUwYzELMAkGA1UEBhMCc2UxEzARBgNVBAgTClNvbWUtU3RhdGUxDjAMBgNVBAcUBU1hbG32MRkwFwYDVQQKFBBNYWxt9iBVbml2ZXJzaXR5MRQwEgYDVQQDEwtwbGF5Lm1haC5zZYIJAJDfatluVXscMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFsGTUKxKgAeo+nCP60eBkRLAD98siRERqx7BCkqbcjnRGk9jzeR1QQV9EkO2EAKrVdw8trjyRK6QWkiFyjGz7kTweQf6KSAq4uw5blOpoMqOLkqBdkaBIiwsBpAGJSYSlNKxpjMo4h55NlMbKzYWyaQbiBEHL/FKqAprN097T5KFDdK0JXzAAbiMqyHx260FEp4D3uNYUmKGa5PcAA4RGPNcWQO4ocenWryUABBTzUf8ZFFF843Yh/P3wdaK7fTOW3Xc6e+DGtQAAPAID7BFEQChwUdv9rV04L5ldsnzyQ7vAxjB4wzwCt0EKO82VOq/T4ypUldH/z9IjTcVxPfTuU=</ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mah.se/user/logout"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/user/authenticate" index="0"/>
+ </md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">MAH (PROD)</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">MAH (PROD)</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://play.mah.se</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="technical">
+ <md:SurName>Administrator</md:SurName>
+ <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml
deleted file mode 100644
index 431387f5..00000000
--- a/swamid-2.0/portal.cloud.ipnett.se-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://portal.cloud.ipnett.se/shibboleth">
- <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/nren-service</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:KeyDescriptor use="signing">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAPKb4F2SRWHbMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMMFnBvcnRhbC5jbG91ZC5pcG5ldHQuc2UwHhcNMTUwMjEwMjA1OTU0WhcNMjYw
- MTIzMjA1OTU0WjAhMR8wHQYDVQQDDBZwb3J0YWwuY2xvdWQuaXBuZXR0LnNlMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzx+JkLQWyBizwwRD9RULQ2hk
- fKgukxwLM46rEtblLfIn6VFHSIT2Ff7Ssx4SEcp/FyOYb88fnyvTQphNCov7OhOh
- 9MfarL6GVkQvrkVgUXwoehPL4BEkwRFlY+GxP/u7GY4RZJHxQSG3jFllzFP3HCaG
- e1wuC4THzuJd4iaUopS9ZQF6s3dv8N/KhJxSs9AvjXl1Qa6zhGa/XoqNVXSvg5zX
- gGWNga9GUgM+aPiNQgmFNY4mR7hiUtwRghgizz/Y7xp+eCuSMXvgfevcS7+a9joH
- ZEa0RY4op92UuMwQnG3o6LSv3OYEVq5k3cGBbYpbMokMFOv0cQI13Pp9Ji6ZHwID
- AQABo1AwTjAdBgNVHQ4EFgQUbji6yOG+NcYePMoP0Yb6Un1l/WcwHwYDVR0jBBgw
- FoAUbji6yOG+NcYePMoP0Yb6Un1l/WcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
- AQUFAAOCAQEAjJMEkgrmXf2ZX2X6BuWabf3vVRhHn8NAOgWXdhyLUXHVeNTpwm4c
- Sfdm1dK6hNGXyGqhLPU3WP1nv93GdnM/ilb/9hcvzueBgGl6Lw7Jyy2vI2U8xm9H
- NoP4PzncPtyWY8G7Gc7OOIHoglHB4wEJwdyJQ5+P5psp6gO0ITq/qq5o337s0n+F
- CVIxRUNuvFC7IMaky2vJTezPBey4FDUwsEGcoeJpiqXmopfRdfxq0R0Ge0aajTEJ
- LTTy+ozNxeKkACigXyZrvk5+f1zlCFg+hKR7BNk2s0VSYm175E2PKzM2TcOuXEy+
- VAYvoweICMB1H3PYBRrj0QM/iwGY4CCfSQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor use="encryption">
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
- MIIDFTCCAf2gAwIBAgIJAPKb4F2SRWHbMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
- BAMMFnBvcnRhbC5jbG91ZC5pcG5ldHQuc2UwHhcNMTUwMjEwMjA1OTU0WhcNMjYw
- MTIzMjA1OTU0WjAhMR8wHQYDVQQDDBZwb3J0YWwuY2xvdWQuaXBuZXR0LnNlMIIB
- IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzx+JkLQWyBizwwRD9RULQ2hk
- fKgukxwLM46rEtblLfIn6VFHSIT2Ff7Ssx4SEcp/FyOYb88fnyvTQphNCov7OhOh
- 9MfarL6GVkQvrkVgUXwoehPL4BEkwRFlY+GxP/u7GY4RZJHxQSG3jFllzFP3HCaG
- e1wuC4THzuJd4iaUopS9ZQF6s3dv8N/KhJxSs9AvjXl1Qa6zhGa/XoqNVXSvg5zX
- gGWNga9GUgM+aPiNQgmFNY4mR7hiUtwRghgizz/Y7xp+eCuSMXvgfevcS7+a9joH
- ZEa0RY4op92UuMwQnG3o6LSv3OYEVq5k3cGBbYpbMokMFOv0cQI13Pp9Ji6ZHwID
- AQABo1AwTjAdBgNVHQ4EFgQUbji6yOG+NcYePMoP0Yb6Un1l/WcwHwYDVR0jBBgw
- FoAUbji6yOG+NcYePMoP0Yb6Un1l/WcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
- AQUFAAOCAQEAjJMEkgrmXf2ZX2X6BuWabf3vVRhHn8NAOgWXdhyLUXHVeNTpwm4c
- Sfdm1dK6hNGXyGqhLPU3WP1nv93GdnM/ilb/9hcvzueBgGl6Lw7Jyy2vI2U8xm9H
- NoP4PzncPtyWY8G7Gc7OOIHoglHB4wEJwdyJQ5+P5psp6gO0ITq/qq5o337s0n+F
- CVIxRUNuvFC7IMaky2vJTezPBey4FDUwsEGcoeJpiqXmopfRdfxq0R0Ge0aajTEJ
- LTTy+ozNxeKkACigXyZrvk5+f1zlCFg+hKR7BNk2s0VSYm175E2PKzM2TcOuXEy+
- VAYvoweICMB1H3PYBRrj0QM/iwGY4CCfSQ==
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.cloud.ipnett.se/Shibboleth.sso/Logout"/>
- <md:AssertionConsumerService Location="https://portal.cloud.ipnett.se/Shibboleth.sso/SAML2/POST" index="1" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
- <md:AttributeConsumingService index="1">
- <md:ServiceName xml:lang="en">IPnett Cloud Services Portal</md:ServiceName>
- <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
- </md:AttributeConsumingService>
- </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 8706b1ee..4b963b74 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -120,19 +120,19 @@ x7JUFw==</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>KTH Royal Institute of Technology</Company>
<SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
- <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+ <EmailAddress>mailto:ita-infra-saml-contact@kth.se</EmailAddress>
<TelephoneNumber>+46 8 790 6000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>KTH Royal Institute of Technology</Company>
<SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</SurName>
- <EmailAddress>ita-infra-saml-contact@kth.se</EmailAddress>
+ <EmailAddress>mailto:ita-infra-saml-contact@kth.se</EmailAddress>
<TelephoneNumber>+46 8 790 6000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>KTH Royal Institute of Technology</Company>
<SurName>KTH IT-Support</SurName>
- <EmailAddress>it-support@kth.se</EmailAddress>
+ <EmailAddress>mailto:it-support@kth.se</EmailAddress>
<TelephoneNumber>+46 8 790 6600</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/scalear-saml.herokuapp.com.xml b/swamid-2.0/scalear-saml.herokuapp.com.xml
index 45171085..aad4fddc 100644
--- a/swamid-2.0/scalear-saml.herokuapp.com.xml
+++ b/swamid-2.0/scalear-saml.herokuapp.com.xml
@@ -23,24 +23,9 @@
<md:KeyDescriptor>
<ds:KeyInfo>
<ds:X509Data>
- <ds:X509Certificate>
- MIIC9jCCAd4CCQCbuMwbIA5oKjANBgkqhkiG9w0BAQUFADA9MQswCQYDVQQGEwJT
- RTESMBAGA1UECAwJU1RPQ0tIT0xNMRowGAYDVQQKDBFTQ0FMQUJMRSBMRUFSTklO
- RzAeFw0xMzA4MDUxMzU5MzRaFw0xNDA4MDUxMzU5MzRaMD0xCzAJBgNVBAYTAlNF
- MRIwEAYDVQQIDAlTVE9DS0hPTE0xGjAYBgNVBAoMEVNDQUxBQkxFIExFQVJOSU5H
- MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr4s3tVzE06ScVYO6gJQr
- fE/9/qC0VlBeSqXQ+mjZu5erBdUSioqlksOSyLxK5mNgrPfTtMWpmyWzKqdltE+8
- gAlhHxpsHh/Q38yh5Bx7u2CXAm+HOJVmkRzXRN5jCf80sdZ0VgQbflCCQuKs7qB7
- YNWFZeDF8MQ40NlqJPrFpFz7bJ6oErqVF8Cfy3r4plJ3JDl4jfjh7LEbMHpZFacF
- 01P00Cbtebkivjz02Lxl/bPltTtJy2nCjdkDRmMbcPKUBDmOoGy2C+HDzQ/OjOnT
- guQ5AlZ23sZf/vEhIiP1MU3ZLzKYyv3CK3J3TdA1WaelzkTr2VHJ5yYEW6wPXPYn
- fwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB1TCLA5sftQMqG0khM9/BnNdMAnda4
- hhNaUI9L74/Jh+eu3W3Ie1kbsmUXiWgoMNdxtN93BOank7hzYnRqmfeTmkqMwa7i
- hHd0ZdqlPwYEua5k2VvnqTq+2UeBn9cluUxfQkYsYWmSVmkrd8VuP8Hg9bWGWriS
- UhJC+0CSwgyoyREsYnXbb6APHgOpAKFVlKHkfYtEl8bGmUc5+qKpwjq4wrYh+7Ns
- MxU+p7QniH545jzRpO7uYRPxVuGLH7K/X1Y+iJilXrLf063SW6iSRP8Nzqm4H9Z+
- gK/0Rduej0L14dVoSDGGpPNjXxfW0yG0d9khqKK8p4M9lxfD16ebiS9i
- </ds:X509Certificate>
+ <ds:X509Certificate>
+ MIIDaDCCAlACCQC2IjZvk/9exTANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU1RPQ0tIT0xNMRIwEAYDVQQHEwlTVE9DS0hPTE0xGjAYBgNVBAoTEVNDQUxBQkxFIExFQVJOSU5HMSMwIQYDVQQDExpzY2FsZWFyLXNhbWwuaGVyb2t1YXBwLmNvbTAeFw0xNTExMjQxMzU5NDhaFw0xNjExMjMxMzU5NDhaMHYxCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTVE9DS0hPTE0xEjAQBgNVBAcTCVNUT0NLSE9MTTEaMBgGA1UEChMRU0NBTEFCTEUgTEVBUk5JTkcxIzAhBgNVBAMTGnNjYWxlYXItc2FtbC5oZXJva3VhcHAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9v8WIZwEs/bOIBj/26QY6bKmwMua9NRNGta7wskrx5ClPU8RclyhdLEMIXMDf1B3Rmq92naz+XUFSXZczsVjBSxjUCwjKSkDnC/3VfVvGfThXzLI1MPChneilTxrMu4LyhtOf3Jty4vICX5ef0TV2gI3W1ttuVkzykU1GWBVRITTeMNQm22auF5CCq8XkK+6IgdVqhjo5xvqz05UgAhLbuSEeqqEjpzyRAjrfpMKkzjVygu/Ee2fcEjcZt0tVnj1fpM9pDyMl05yWhGbIdFFE9R0edl5Zn82sUGdFmMqgl+DIBZTmyqidawzMlw921wMDoxzH+o4cGGyHNC0ob+uOwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB5fNFyQTG08NQot3k/vPgeAJRGVS5g+1AaaOASA1v7DyLjkKpHS2EU5XMzOZ65tchzfgbXjx9JhrIMwqOI5pxt1k4d6NnWL+GOgvhA/yRWT4YFahy+HSQERRRZuzdDHsrjSYSBg8QvZ7AUFDc4b9SHJeygZAST/12cyAJiwCfWPIwCadIQ/EabtEtEgHkoD6Wgo2wcsw2ck+rJ3NcBjlUYAtHw4b+kmDgdNjGlm1/zT2y9oO08VOvlWcpCn/4O1wUEq3julnnuz9dpDtyKtSC+znGJxKS3O2jvg4tkm+3ZsLw0m8tJU9nhCq+E5Y3BoiXhHz/v5eGQofoZ7U85CnkT
+ </ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
diff --git a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
index e142e8fd..9895f89a 100644
--- a/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shib-idp-1.oru.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">oru.se</shibmd:Scope>
@@ -94,19 +101,19 @@ Pz8R3A==</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Örebro University</Company>
<SurName>IT Avdelningen</SurName>
- <EmailAddress>itsupport@oru.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
<TelephoneNumber>+46 19 303166</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Örebro University</Company>
<SurName>Jonny Ehrnberg</SurName>
- <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
+ <EmailAddress>mailto:jonny.ehrnberg@oru.se</EmailAddress>
<TelephoneNumber>+46 19 303851</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Örebro University</Company>
<SurName>IT Avdelningen Örebro universitet</SurName>
- <EmailAddress>itsupport@oru.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
<TelephoneNumber>+46 19 303166</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
index 2a12307d..0d381477 100644
--- a/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibb1.hj.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibb1.hj.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">hj.se</shibmd:Scope>
@@ -101,19 +108,19 @@ nh4O/8qRXaXavKrASZvA1gmVGaA90C6rtK+zuVkU3g==
<ContactPerson contactType="administrative">
<Company>Jönköping University</Company>
<SurName>Joakim Danielsson</SurName>
- <EmailAddress>Joakim.Danielsson@hj.se</EmailAddress>
+ <EmailAddress>mailto:Joakim.Danielsson@hj.se</EmailAddress>
<TelephoneNumber>+46 36 101116</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Jönköping University</Company>
<SurName>Stefan Kindh</SurName>
- <EmailAddress>Stefan.Kindh@hj.se</EmailAddress>
+ <EmailAddress>mailto:Stefan.Kindh@hj.se</EmailAddress>
<TelephoneNumber>+46 36 101170</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Jönköping University</Company>
<SurName>IT-Helpdesk</SurName>
- <EmailAddress>helpdesk@hj.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@hj.se</EmailAddress>
<TelephoneNumber>+46 36 101112</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
index 7293f8f5..813f3965 100644
--- a/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibbo.ltu.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibbo.ltu.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
@@ -97,19 +104,19 @@ B2BEejurB8CAdtQkwfCKCSFl7spaJzSGPq/dt4yO4qSslJA=
<ContactPerson contactType="administrative">
<Company>Lulea University of Technology</Company>
<SurName>LTU Servicedesk</SurName>
- <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+ <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
<TelephoneNumber>+46 920 491664</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Lulea University of Technology</Company>
<SurName>LTU Servicedesk</SurName>
- <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+ <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
<TelephoneNumber>+46 920 491664</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Lulea University of Technology</Company>
<SurName>LTU Servicedesk</SurName>
- <EmailAddress>its-idp@list.ltu.se</EmailAddress>
+ <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
<TelephoneNumber>+46 920 491664</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
index 91fdcccb..4a0dae4e 100644
--- a/swamid-2.0/signon.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/signon.hh.se-idp-shibboleth.xml
@@ -103,19 +103,19 @@ CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
<ContactPerson contactType="administrative">
<Company>Halmstad University</Company>
<SurName>Magnus Morén</SurName>
- <EmailAddress>magnus.moren@hh.se</EmailAddress>
+ <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
<TelephoneNumber>+46 35 167383</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Halmstad University</Company>
<SurName>Magnus Morén</SurName>
- <EmailAddress>magnus.moren@hh.se</EmailAddress>
+ <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
<TelephoneNumber>+46 35 167383</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Halmstad University</Company>
<SurName>Helpdesk Högskloan i Halmstad</SurName>
- <EmailAddress>helpdesk@hh.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@hh.se</EmailAddress>
<TelephoneNumber>+35 167800</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
index c64ecf72..b6a64218 100644
--- a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://swamid2.shh.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">shh.se</shibmd:Scope>
@@ -96,19 +103,19 @@ URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
<ContactPerson contactType="administrative">
<Company>Sophiahemmet University</Company>
<SurName>Sophiahemmet IT</SurName>
- <EmailAddress>itsupport@sophiahemmet.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
<TelephoneNumber>+46 8 406 2525</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Sophiahemmet University</Company>
<SurName>Sophiahemmet IT</SurName>
- <EmailAddress>itsupport@sophiahemmet.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
<TelephoneNumber>+46 8 406 2525</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Sophiahemmet University</Company>
<SurName>Sophiahemmet IT</SurName>
- <EmailAddress>itsupport@sophiahemmet.se</EmailAddress>
+ <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
<TelephoneNumber>+46 8 406 2525</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/ubas.lu.se-shibboleth.xml b/swamid-2.0/ubas.lu.se-shibboleth.xml
new file mode 100644
index 00000000..a5d91c79
--- /dev/null
+++ b/swamid-2.0/ubas.lu.se-shibboleth.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ubas.lu.se/shibboleth">
+ <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#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/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+ <md:SPSSODescriptor AuthnRequestsSigned="1" 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://ubas.lu.se/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">uBAS / prod</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">uBAS / prod</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">uBAS och luBAS prod miljö, utbildningsplaner och Kursplaner</mdui:Description>
+ <mdui:Description xml:lang="en">uBAS and luBAS / prod</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>a0221.srv.lu.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=a0221.srv.lu.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJALmk3ZwQVxRiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2EwMjIxLnNydi5sdS5zZTAeFw0xNTEwMjMxMjQxMTJaFw0yNTEwMjAxMjQx
+MTJaMBoxGDAWBgNVBAMTD2EwMjIxLnNydi5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALMEarnwqXe8kt/rxhSLZtkr1GwLfuWjgef5N8i3d7Ad
+F8GLPjZjdJLh75SLQO+GTNbYnryGswU8DVBU/XivZcal/QBdRYO9f3PHay8OeHv6
+MFsA0/qiUxyVxLJOFpRifRTyLpt62C2b7D9YYFmGoncZ6wVIpasVgLDAEkt7VkOU
+ThF0C/McP0cw+Zx4U+g2m7mU+JUWeqpO4ulhCfyBnX7QRQeeMdpeQNynS0OI/OMf
+k55qeN3iNlALYeZ2ELB1Wi/fC1+CDu0jzB9v209imjey/rbDtxlc6sRPzqYOJBtc
+ytebidHGpXK6fDi92nhAAMya3sFOP/xgkWx/Ru+Bix0CAwEAAaM9MDswGgYDVR0R
+BBMwEYIPYTAyMjEuc3J2Lmx1LnNlMB0GA1UdDgQWBBQa/NllIFHzegFCZ7Pbif5T
+8ZaRoDANBgkqhkiG9w0BAQUFAAOCAQEAT7FA3HvLn2vSuUioHibLCTrJa8rQ6/5K
+vYCXokNham2LFKe84YP5Bqfk4+EUb/4H9qZcQstWZvlLmlAh4D/L44C881FRPBZP
+GwvOwHUMNk2EibBS5Jc+8mGvbfVpFnAW0qz49xwVRlT5T1VrWUTIhAK0R3pbwPNe
+i40tmy2XFzCW52SWL/KRWd1jM5sZIpJhJImvUU93aPYWVQtHtHKi3+iVkjXFYf60
+u21VH/EFiu9zEqiF00OIOqKPItb7pgRaWF9pf1OyAmh8t9I2FjTvUG42nLMJr62+
+/TMaULAeSfWUxSIBNwHBe8+L9YUMOs+i/HXubcZ46ffyOwOee1qn9A==
+</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://ubas.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ubas.lu.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ubas.lu.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ubas.lu.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ubas.lu.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ubas.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ubas.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ubas.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ubas.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ubas.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Martin</md:GivenName>
+ <md:SurName>Åhfeldt</md:SurName>
+ <md:EmailAddress>martin.ahfeldt@lu.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/uraccess.net-shibboleth.xml b/swamid-2.0/uraccess.net-shibboleth.xml
new file mode 100644
index 00000000..bc1aff28
--- /dev/null
+++ b/swamid-2.0/uraccess.net-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uraccess.net/shibboleth">
+ <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#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/eu-adequate-protection</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 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://uraccess.net/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://uraccess.net/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">UR access - Mediebiblioteket för högskolor och universitet.</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">UR access innehåller ca 18000 TV- och radioprogram från Utbildningsradion.</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://uraccess.net/shibboleth</ds:KeyName>
+ <ds:KeyName>uraccess.net</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=uraccess.net</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAP6pqK7LD1xfMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDHVyYWNjZXNzLm5ldDAeFw0xNTEyMDgxMzQyMDVaFw0yNTEyMDUxMzQyMDVa
+MBcxFTATBgNVBAMTDHVyYWNjZXNzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAPL5dGUPusdwnwRW2S/M+fVgjAxGl9W41JLeHGrd3FRDiLxo47MX
+OLYI8qdzhts3z+G83htGlJI0Iowj6PKQx3xWPmCmFaA8y1Wpx2Y8FT7eJ277F5KL
+KIDoqgL78yubSwyl3sNgjNq0KJ+PHU1WirSwmiJV0dQfX5hc4Ca1UTkQ9H0T9QQL
+XpLF/tqpxJGGbceShZHi1W34pQqhYQaIxl+QhREAybQSMa0cnfXIoTOdgf/6eKCo
+5JoFWtXJMesgDji5R+2wXmbaKCVH5KDcd3pRqb0dKsdGfzaXdqbtTVwj0LezC+4v
+nV7WOn7+zb9GCIBvg1VBrSlOWHrIoqZM7dUCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
+dXJhY2Nlc3MubmV0hh9odHRwczovL3VyYWNjZXNzLm5ldC9zaGliYm9sZXRoMB0G
+A1UdDgQWBBT3qHcAVqfrG19CM9/c1Jlf6/Tf6DANBgkqhkiG9w0BAQUFAAOCAQEA
+XdxT+SX0jtLPiAptvIDrrmc7eG20M/seqsPiIDmuJFeuw7k7vyG2rL6yEGpKVTyX
+BTM2wp9H6vC35z+R3O3c7GMP37LcJMHSwcCgQPWboIp/nxEGEGFwHPB0dUN5qvLR
+OQyxsrnkpOih7FXNtpHItLDGS8JDac4TRWE4x1b1r/B0t50TsXe3Pa6t/H/sGugT
+WA1u0ZsP4QtQfCFyJlIisLruEDEydRdT1UNUcbo6TsRW33G5rzAH9X6+D19LnFRg
+W/UOQjERpXGqmGI72CVn9Q8PXeKyVvIl7zaSzz9GLjJpQLdjkSWHW+qMH+7kbn4S
+RXmDTYIhHnjv+Sc7dzCbIA==
+</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://uraccess.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uraccess.net/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uraccess.net/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.net/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.net/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uraccess.net/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uraccess.net/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.net/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.net/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uraccess.net/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uraccess.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uraccess.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uraccess.net/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uraccess.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="support">
+ <md:EmailAddress>mailto:onsite@ur.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Michael</md:GivenName>
+ <md:SurName>Nilsson</md:SurName>
+ <md:EmailAddress>mailto:Michael.Nilsson@ur.se</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/urn-urkund-shibboleth-sp.xml b/swamid-2.0/urn-urkund-shibboleth-sp.xml
index 37a361bf..b3ffad65 100644
--- a/swamid-2.0/urn-urkund-shibboleth-sp.xml
+++ b/swamid-2.0/urn-urkund-shibboleth-sp.xml
@@ -83,20 +83,26 @@ gEln3A==
<md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/NIM/POST"/>
<md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.urkund.com/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.urkund.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">URKUND</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:ContactPerson contactType="administrative">
<md:GivenName>Peter</md:GivenName>
<md:SurName>Witasp</md:SurName>
- <md:EmailAddress>peter.witasp@prioinfo.se</md:EmailAddress>
+ <md:EmailAddress>mailto:peter.witasp@prioinfo.se</md:EmailAddress>
</md:ContactPerson>
<md:ContactPerson contactType="technical">
<md:GivenName>Samuel</md:GivenName>
<md:SurName>Otter</md:SurName>
- <md:EmailAddress>samuel@onposition.com</md:EmailAddress>
+ <md:EmailAddress>mailto:samuel@onposition.com</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/vartuppdrag.se.xml b/swamid-2.0/vartuppdrag.se.xml
new file mode 100644
index 00000000..ec8cd7c9
--- /dev/null
+++ b/swamid-2.0/vartuppdrag.se.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vartuppdrag.se">
+ <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Vårt uppdrag - Webbutbildning från Learnways</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Vårt uppdrag - Webbutbildning från Learnways</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Utbildningsportal för studenter på Göteborg, Malmö and Uppsala Universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Online education portal for university students at Göteborg, Malmö and Uppsala University
+ </mdui:Description>
+ <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="sv">https://vartuppdrag.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://vartuppdrag.se</mdui:InformationURL>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor use="signing">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC/DCCAmWgAwIBAgIJAMcQQq6rmwVQMA0GCSqGSIb3DQEBCwUAMIGVMQswCQYD
+ VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
+ EjAQBgNVBAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnZhcnR1
+ cHBkcmFnLnNlMSQwIgYJKoZIhvcNAQkBFhVmcmVkcmlrQGxlYXJud2F5cy5jb20w
+ IBcNMTYwMTEzMDgzMjE4WhgPMjI4OTEwMjgwODMyMThaMIGVMQswCQYDVQQGEwJT
+ RTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNV
+ BAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnZhcnR1cHBkcmFn
+ LnNlMSQwIgYJKoZIhvcNAQkBFhVmcmVkcmlrQGxlYXJud2F5cy5jb20wgZ8wDQYJ
+ KoZIhvcNAQEBBQADgY0AMIGJAoGBAN6CRfi7tSIbXTXKbUrtIclwO48aWh4sNMkH
+ qHbc4tBZG3wLUl+UV+mxgIt7rmkOldTrQzhyIfncek8+9L2Oc1Ekc9xg8OPtAqgj
+ 2Zb71kL0tK4mheGuHIhRAvMhhyWrTXjmAVdYSiSsUeKiKfFKto/MsCP6pFklyIK1
+ VBgVVQJDAgMBAAGjUDBOMB0GA1UdDgQWBBTdXMeQ0FNPyqyLMt/MoLf689s6BDAf
+ BgNVHSMEGDAWgBTdXMeQ0FNPyqyLMt/MoLf689s6BDAMBgNVHRMEBTADAQH/MA0G
+ CSqGSIb3DQEBCwUAA4GBAJXVENigo8BIrlvDLyhaByEQK+RukwSUh2QqXNVEsA+2
+ vNDD4Soa8JW4kdqtX2VCkYttcSolTNqBbt+ZO3yx6iZPEUPVLvP8taaKU9WeBiTk
+ k3K/qjSaDJC/Pwhxf9fuWZd70hCKDeTFiatSqUCmiCVxMVdJ572aAsCAxWESI3/0
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:KeyDescriptor use="encryption">
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:X509Data>
+ <ds:X509Certificate>
+ MIIC/DCCAmWgAwIBAgIJAMcQQq6rmwVQMA0GCSqGSIb3DQEBCwUAMIGVMQswCQYD
+ VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
+ EjAQBgNVBAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnZhcnR1
+ cHBkcmFnLnNlMSQwIgYJKoZIhvcNAQkBFhVmcmVkcmlrQGxlYXJud2F5cy5jb20w
+ IBcNMTYwMTEzMDgzMjE4WhgPMjI4OTEwMjgwODMyMThaMIGVMQswCQYDVQQGEwJT
+ RTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNV
+ BAoMCUxlYXJud2F5czELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnZhcnR1cHBkcmFn
+ LnNlMSQwIgYJKoZIhvcNAQkBFhVmcmVkcmlrQGxlYXJud2F5cy5jb20wgZ8wDQYJ
+ KoZIhvcNAQEBBQADgY0AMIGJAoGBAN6CRfi7tSIbXTXKbUrtIclwO48aWh4sNMkH
+ qHbc4tBZG3wLUl+UV+mxgIt7rmkOldTrQzhyIfncek8+9L2Oc1Ekc9xg8OPtAqgj
+ 2Zb71kL0tK4mheGuHIhRAvMhhyWrTXjmAVdYSiSsUeKiKfFKto/MsCP6pFklyIK1
+ VBgVVQJDAgMBAAGjUDBOMB0GA1UdDgQWBBTdXMeQ0FNPyqyLMt/MoLf689s6BDAf
+ BgNVHSMEGDAWgBTdXMeQ0FNPyqyLMt/MoLf689s6BDAMBgNVHRMEBTADAQH/MA0G
+ CSqGSIb3DQEBCwUAA4GBAJXVENigo8BIrlvDLyhaByEQK+RukwSUh2QqXNVEsA+2
+ vNDD4Soa8JW4kdqtX2VCkYttcSolTNqBbt+ZO3yx6iZPEUPVLvP8taaKU9WeBiTk
+ k3K/qjSaDJC/Pwhxf9fuWZd70hCKDeTFiatSqUCmiCVxMVdJ572aAsCAxWESI3/0
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://vartuppdrag.se/saml2/slo"/>
+ <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://vartuppdrag.se/saml2/acs" index="1"/>
+ </md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Fredrik</md:GivenName>
+ <md:SurName>Croneborg</md:SurName>
+ <md:EmailAddress>mailto:fredrik@learnways.com</md:EmailAddress>
+ </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml b/swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml
new file mode 100644
index 00000000..002d00fc
--- /dev/null
+++ b/swamid-2.0/vfu-portfolio-dev.su.se-Shibboleth.sso.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This is example metadata only. Do *NOT* supply it as is without review,
+and do *NOT* provide it in real time to your partners.
+ -->
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfu-portfolio-dev.su.se/Shibboleth.sso">
+ <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#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/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF" index="1"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/wavelan"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/SWAMID"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/SWAMID" index="3"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/guest-idp.it.su.se"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/skolfederation-trial-ds"/>
+ <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://vfu-portfolio-dev.su.se/Shibboleth.sso/WAYF/skolfederation-trial-ds" index="4"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">VFU-portfolio development environment</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">VFU-portfolio utvecklingsmiljlö</mdui:DisplayName>
+ <mdui:Description xml:lang="en">VFU-portfolio development environment, Stockholm University</mdui:Description>
+ <mdui:Description xml:lang="sv">VFU-portfolio utvecklingsmiljlö, Stockholms univsersitet</mdui:Description>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>vfuportfolio-dev-app01</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=vfuportfolio-dev-app01</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDCTCCAfGgAwIBAgIJAIpnqZkjKutaMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFnZmdXBvcnRmb2xpby1kZXYtYXBwMDEwHhcNMTUxMDI4MTEzNDM1WhcNMjUx
+MDI1MTEzNDM1WjAhMR8wHQYDVQQDExZ2ZnVwb3J0Zm9saW8tZGV2LWFwcDAxMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyqtR4ajOqkqjqVBkiwxeHdbz
+Aw48lzKxVsKeGCMhnJJBbx9GLM2B9ZmmrlQEsbU7e7HUl0vVO8UwCoekLu+Wx9UY
+c/P0zsSLVH3xK8iJyQOObaoyMOrjwzKGytuAskojxr6b63GGS1B0z9e2P5tU1+JM
+tN61YtV5D6EgC8j1rRI93G6KCmUIbJelFALwaqCSSvxBfMOAw4jkW9mdOr7QeE28
+Bl/RH+EF4lGA8aS5oALFFme+VBMXtcwA2iSFRg7/g7KF4pUF5qRvvus37T5E+yCm
+QuM98fKvx5B27RTOy6SpKTYEzjNQV0im9x1NOp5qE1Rhf9UkWr+ywinSIk5FLwID
+AQABo0QwQjAhBgNVHREEGjAYghZ2ZnVwb3J0Zm9saW8tZGV2LWFwcDAxMB0GA1Ud
+DgQWBBQ5cBe7i06BVSpUeAChZXD4RvL9GDANBgkqhkiG9w0BAQUFAAOCAQEAK0s9
+x9TH1kkJ4lTzLo9kPzBwAgBURAB3yeHmVvH1jlAL55/Kd3qDAvoKKoaWoT+XR7oK
+bcc/9Mfd+c0zWbRaAqag2f53mfdTMU5z5Y919QTaRagYlQmbf7J5aXu95d7PUiCs
+VnwaC9gspgB3nvRKGjPwi9fpDD8dm2V/H73XJ/gEgGF0r8raIZ/cuu2Z8fJST+YW
+kfn2egpShxYbM7RcP3zi25R77Wwtr0ejZGPOP7hxoKok+iaIu99w62Krz7v6V2ef
+H6Kc4jFZ/hhFnKHQp8NlxDR99dktJ0dJJaVl127OX5bwImTA6PrkLGjfisOPKtyO
+uyXS7c6QGBaTTZ+M4g==
+</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://vfu-portfolio-dev.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-portfolio-dev.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
index 9aae47fb..1a5ab5b5 100644
--- a/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/vmidgw3.miun.se-idp-shibboleth.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://vmidgw3.miun.se/idp/shibboleth">
+ <Extensions>
+ <attr:EntityAttributes xmlns:attr="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:Attribute>
+ </attr:EntityAttributes>
+ </Extensions>
<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
<shibmd:Scope regexp="false">miun.se</shibmd:Scope>
@@ -102,19 +109,19 @@ I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
<ContactPerson contactType="administrative">
<Company>Mid Sweden University</Company>
<SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</SurName>
- <EmailAddress>SystemDriftIT@miun.se</EmailAddress>
+ <EmailAddress>mailto:SystemDriftIT@miun.se</EmailAddress>
<TelephoneNumber>+46 771 975 000</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Mid Sweden University</Company>
<SurName>Ove Olander</SurName>
- <EmailAddress>Ove.Olander@miun.se</EmailAddress>
+ <EmailAddress>mailto:Ove.Olander@miun.se</EmailAddress>
<TelephoneNumber>+46 63 165787</TelephoneNumber>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Mid Sweden University</Company>
<SurName>IT Helpdesk</SurName>
- <EmailAddress>helpdesk@miun.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@miun.se</EmailAddress>
<TelephoneNumber>+46 771 976130</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/webinar.nordu.net-shibboleth.xml b/swamid-2.0/webinar.nordu.net-shibboleth.xml
index a5e63a07..f74cd1e6 100644
--- a/swamid-2.0/webinar.nordu.net-shibboleth.xml
+++ b/swamid-2.0/webinar.nordu.net-shibboleth.xml
@@ -81,6 +81,6 @@ euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
</md:Organization>
<md:ContactPerson contactType="technical">
<md:Company>NORDUnet NOC</md:Company>
- <md:EmailAddress>noc@nordu.net</md:EmailAddress>
+ <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
new file mode 100644
index 00000000..7d46eda0
--- /dev/null
+++ b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://weblogin-test.kau.se/idp/shibboleth">
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+ <Extensions>
+ <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+ <mdui:UIInfo>
+ <mdui:DisplayName xml:lang="sv">Karlstads universitet Shib 3 Test</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Karlstad University Shib 3 Test</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Shib 3 Test Identity Provider för Karlstads universitet</mdui:Description>
+ <mdui:Description xml:lang="en">Shib 3 Test Identity Provider for Karlstad University</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://www.kau.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.kau.se/en</mdui:InformationURL>
+ <mdui:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+ <mdui:Logo xml:lang="sv" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+ <mdui:Logo xml:lang="en" height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
+ <mdui:PrivacyStatementURL xml:lang="sv">http://www.kau.se/om-webbplatsen/juridisk-information</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">http://www.kau.se/en/about-this-website</mdui:PrivacyStatementURL>
+ <mdui:Keywords xml:lang="sv">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+ <mdui:Keywords xml:lang="en">kau karlstads+universitet karlstad+universitet karlstad+university</mdui:Keywords>
+ </mdui:UIInfo>
+ <mdui:DiscoHints>
+ <mdui:DomainHint>kau.se</mdui:DomainHint>
+ <mdui:IPHint>130.243.16.0/20</mdui:IPHint>
+ <mdui:IPHint>193.10.162.0/24</mdui:IPHint>
+ <mdui:IPHint>193.10.220.0/22</mdui:IPHint>
+ <mdui:IPHint>193.10.224.0/21</mdui:IPHint>
+ <mdui:IPHint>193.10.238.0/24</mdui:IPHint>
+ <mdui:IPHint>193.11.148.0/22</mdui:IPHint>
+ <mdui:IPHint>193.11.152.0/21</mdui:IPHint>
+ <mdui:IPHint>2001:6b0:34::0/48</mdui:IPHint>
+ <mdui:GeolocationHint>geo:59.4059,13.5816</mdui:GeolocationHint>
+ </mdui:DiscoHints>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUSXSkW5Pmi6pOuwXzCEYchUZqWhgwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMTE0MTMx
+MjM1WhcNMzYwMTE0MTMxMjM1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAInK5hGbL7MF0/fE
+oT8C0jAMXJ9olwHKOMX6E9wgOlN64XKdk+63wCdUsiybx1sZ+g4tjEp0k56C5Ayl
+l3B9qPKCXWwUVxJaASTDRlYivaa53REvnDe9475UNWPqjE16T6a12lMVi1J79QKu
+6egbQkPu4WVgc3yYrqwEwk5yzT4h4Mq3zI2rHl+skL1wdidnQIHQ9hu+/qjX39wv
+GGEqqgKuhyjV0rW//O2Dap6iEBptD2y9k9nIp59mKlxqnvNT3ueqxQoc5KEW/rfX
+Pox7k23LD1it28gwnFCZK5E4pLcj46UQpeGEGCNtset0ttSgYWOaM34V2mun0HLu
+gaMrBwsCAwEAAaNvMG0wHQYDVR0OBBYEFLGVhSRl725AJFfC5+TKX8FIuTH3MEwG
+A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
+LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA5
+Klfv9ceNzr0eQndNSlwljYNtRZFCFQvFv7zMTOFmHe2RbNIZbEt1+OWRvU3HEyBE
+rEnchz5+oUvsyw+PX7K78S84WJR9hETFY1bF62Z+XAv2C9adZhj3tVnO3Y2BtmLz
+NnlF0FiNJLpgj7b4IJb3WnZtEhciJtC2f6uXDuE/cLVmgm5N/ywjSfRpAOQXHGwn
+Hfo2ht6aM+SbWsE8K7lbet+6WAYUCRZj0UhrHK9wdmCgwW/8OewzcYE0pLrdO47Z
+2IkRMEEX/4/GQOFWR1I4Hx+Ymc5+XPh8vAjNDhDwdQp64dKmhH6T4DFfDzC7ec8r
+WuEmUtd0NS+CJ1HfNOJk
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUZOboZRw8HRg/KYiXfK01oXfrIyowDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMTE0MTMx
+MjM1WhcNMzYwMTE0MTMxMjM1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnOED+DHev8lyyF
+DCK8h9+Jpxq5H//RAgizBqcBB0DBmloqxmMDwMMzk5Fzl++Lqqj2bk4xlfX4iTLE
+5t/12mhpqJ40e6HdKPwsdEtu3W2J2trORdRCDDWUTQOiv+BM+oYUgJ+XN/9/KzFO
+TwgRmAv49cVOv1GclM4+x9VerGaU7xZHcjiJcabn17NIhti4SvX5fs6L8uA4TNJr
+QEgA3HPndt8Q6LqErFpuqB4U+ocseIBaqEuQ1FLxHVD8gvMPMQ8Ry3t3jFU7h3Gu
+TGH5as2gDHaWlv3RLXRE/1AtH6Es4AaM1+m6Ztro08a2W+hZNPhim8yWHM1LdWDK
+sZ3dA+sCAwEAAaNvMG0wHQYDVR0OBBYEFJJXL1w6f86QJ1ORluo2cm8Baq7FMEwG
+A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
+LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBG
+f6a4wW73lVZ09c+eZiDNbexOZ0tAxuCGnPJHiLyEf0rUhT57yjo+GlYacVLXULx1
+aS6LcvTi6brdjFX/2lVPJImTSJwomyaJ7Kfe/aNVR8m+lR0hAGMX/bS0qhAu8nl+
+RV+fFxF8ZiNloEz2xLRiLHu0+NLkkptK4t2ivTynDJ3F59iJoKbB3l+E4h5S3mmP
+wr7nxygZucPvCIrual+5K5gFsG+fOo0nQGSGbytB9cpVp6NkAUVmnanRmiwGNYBp
+aZ1kL23AYl88Ga4yLILIdrZMjnpdUhfoQeYr8eMhCRoge1AkxLLaw+AqYb3HaAPA
++R2fxhug1hpz9+ReK+SO
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAJoZmyB+FgEHsWvGmmGB2KbFg8YSMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFHdlYmxvZ2luLXRlc3Qua2F1LnNlMB4XDTE2MDExNDEz
+MTIzNVoXDTM2MDExNDEzMTIzNVowHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5r
+YXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKXexZy1wueXvH
+SriX7QdFQpV70US0oPNXASknn13PoWFhLeys+OJ/bQppjpTqJmkobvBfHnJc2j9Y
+drfciY8YP1M/VflemZKRdp+fiPGiIeG1c4VagQ0Tec+M5E/SIpwU+V8t10DKMj14
+JREVwed2j8exSDpKRbWzjz5xaiisn9Q7iXEc0l81wFR+LjbGXuLc/R5j0LTwTDHS
+FWwtJicyT1F0DRKa9UHgwZucB/n969935Frol1iOqLLU+4+K9zFfiGtp6f9mGzfS
+1fGPwhnWa8LP1Hynw/7V5T53K16/R8NuDWXGfe1Gvx5aysr79uVZZqjohw6y9xzh
+SwF7aaTFAgMBAAGjbzBtMB0GA1UdDgQWBBTuVfBxeo4VvLYwqkA1yVVg2w1UATBM
+BgNVHREERTBDghR3ZWJsb2dpbi10ZXN0LmthdS5zZYYraHR0cHM6Ly93ZWJsb2dp
+bi10ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+aRs+oLvADtbLjiyelKShMQcNA4dxsjmBd2xFA0hWLChc8vDxS6ObelzrR84d3JLy
+sdeCIZkKJno81l2mjnfaNw16sObMxJWhlIPdeQdT5p22ovpXc7NS0L1hZybDxt+x
+sLrfaHLRWGKy+tXFA+AZmDTWzW1HF4h885JV5R3wDnfr2wrR8CPlu2bdNll0AcI0
+fuYMpZ7edLcYBs7AplQmM/RL7e/n+uIYi+zXb1ca2xYoARbajGCBz3P1EwyZEfja
+e/evXJMbiIGvPtOZBVVEYBkKGVEFL7EJqVze69yPl0Qs5l/ipKCjPQ9QEmmSl1l8
+ewZLjPlUe6rZSSKXDoC3Pw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+ <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+ <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+ <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin-test.kau.se/idp/profile/Shibboleth/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test.kau.se/idp/profile/SAML2/POST/SSO"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
+ </IDPSSODescriptor>
+ <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">kau.se</shibmd:Scope>
+ </Extensions>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUSXSkW5Pmi6pOuwXzCEYchUZqWhgwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMTE0MTMx
+MjM1WhcNMzYwMTE0MTMxMjM1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAInK5hGbL7MF0/fE
+oT8C0jAMXJ9olwHKOMX6E9wgOlN64XKdk+63wCdUsiybx1sZ+g4tjEp0k56C5Ayl
+l3B9qPKCXWwUVxJaASTDRlYivaa53REvnDe9475UNWPqjE16T6a12lMVi1J79QKu
+6egbQkPu4WVgc3yYrqwEwk5yzT4h4Mq3zI2rHl+skL1wdidnQIHQ9hu+/qjX39wv
+GGEqqgKuhyjV0rW//O2Dap6iEBptD2y9k9nIp59mKlxqnvNT3ueqxQoc5KEW/rfX
+Pox7k23LD1it28gwnFCZK5E4pLcj46UQpeGEGCNtset0ttSgYWOaM34V2mun0HLu
+gaMrBwsCAwEAAaNvMG0wHQYDVR0OBBYEFLGVhSRl725AJFfC5+TKX8FIuTH3MEwG
+A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
+LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA5
+Klfv9ceNzr0eQndNSlwljYNtRZFCFQvFv7zMTOFmHe2RbNIZbEt1+OWRvU3HEyBE
+rEnchz5+oUvsyw+PX7K78S84WJR9hETFY1bF62Z+XAv2C9adZhj3tVnO3Y2BtmLz
+NnlF0FiNJLpgj7b4IJb3WnZtEhciJtC2f6uXDuE/cLVmgm5N/ywjSfRpAOQXHGwn
+Hfo2ht6aM+SbWsE8K7lbet+6WAYUCRZj0UhrHK9wdmCgwW/8OewzcYE0pLrdO47Z
+2IkRMEEX/4/GQOFWR1I4Hx+Ymc5+XPh8vAjNDhDwdQp64dKmhH6T4DFfDzC7ec8r
+WuEmUtd0NS+CJ1HfNOJk
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUZOboZRw8HRg/KYiXfK01oXfrIyowDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5rYXUuc2UwHhcNMTYwMTE0MTMx
+MjM1WhcNMzYwMTE0MTMxMjM1WjAfMR0wGwYDVQQDDBR3ZWJsb2dpbi10ZXN0Lmth
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnOED+DHev8lyyF
+DCK8h9+Jpxq5H//RAgizBqcBB0DBmloqxmMDwMMzk5Fzl++Lqqj2bk4xlfX4iTLE
+5t/12mhpqJ40e6HdKPwsdEtu3W2J2trORdRCDDWUTQOiv+BM+oYUgJ+XN/9/KzFO
+TwgRmAv49cVOv1GclM4+x9VerGaU7xZHcjiJcabn17NIhti4SvX5fs6L8uA4TNJr
+QEgA3HPndt8Q6LqErFpuqB4U+ocseIBaqEuQ1FLxHVD8gvMPMQ8Ry3t3jFU7h3Gu
+TGH5as2gDHaWlv3RLXRE/1AtH6Es4AaM1+m6Ztro08a2W+hZNPhim8yWHM1LdWDK
+sZ3dA+sCAwEAAaNvMG0wHQYDVR0OBBYEFJJXL1w6f86QJ1ORluo2cm8Baq7FMEwG
+A1UdEQRFMEOCFHdlYmxvZ2luLXRlc3Qua2F1LnNlhitodHRwczovL3dlYmxvZ2lu
+LXRlc3Qua2F1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBG
+f6a4wW73lVZ09c+eZiDNbexOZ0tAxuCGnPJHiLyEf0rUhT57yjo+GlYacVLXULx1
+aS6LcvTi6brdjFX/2lVPJImTSJwomyaJ7Kfe/aNVR8m+lR0hAGMX/bS0qhAu8nl+
+RV+fFxF8ZiNloEz2xLRiLHu0+NLkkptK4t2ivTynDJ3F59iJoKbB3l+E4h5S3mmP
+wr7nxygZucPvCIrual+5K5gFsG+fOo0nQGSGbytB9cpVp6NkAUVmnanRmiwGNYBp
+aZ1kL23AYl88Ga4yLILIdrZMjnpdUhfoQeYr8eMhCRoge1AkxLLaw+AqYb3HaAPA
++R2fxhug1hpz9+ReK+SO
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="encryption">
+ <ds:KeyInfo>
+ <ds:X509Data>
+ <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAJoZmyB+FgEHsWvGmmGB2KbFg8YSMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFHdlYmxvZ2luLXRlc3Qua2F1LnNlMB4XDTE2MDExNDEz
+MTIzNVoXDTM2MDExNDEzMTIzNVowHzEdMBsGA1UEAwwUd2VibG9naW4tdGVzdC5r
+YXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKXexZy1wueXvH
+SriX7QdFQpV70US0oPNXASknn13PoWFhLeys+OJ/bQppjpTqJmkobvBfHnJc2j9Y
+drfciY8YP1M/VflemZKRdp+fiPGiIeG1c4VagQ0Tec+M5E/SIpwU+V8t10DKMj14
+JREVwed2j8exSDpKRbWzjz5xaiisn9Q7iXEc0l81wFR+LjbGXuLc/R5j0LTwTDHS
+FWwtJicyT1F0DRKa9UHgwZucB/n969935Frol1iOqLLU+4+K9zFfiGtp6f9mGzfS
+1fGPwhnWa8LP1Hynw/7V5T53K16/R8NuDWXGfe1Gvx5aysr79uVZZqjohw6y9xzh
+SwF7aaTFAgMBAAGjbzBtMB0GA1UdDgQWBBTuVfBxeo4VvLYwqkA1yVVg2w1UATBM
+BgNVHREERTBDghR3ZWJsb2dpbi10ZXN0LmthdS5zZYYraHR0cHM6Ly93ZWJsb2dp
+bi10ZXN0LmthdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+aRs+oLvADtbLjiyelKShMQcNA4dxsjmBd2xFA0hWLChc8vDxS6ObelzrR84d3JLy
+sdeCIZkKJno81l2mjnfaNw16sObMxJWhlIPdeQdT5p22ovpXc7NS0L1hZybDxt+x
+sLrfaHLRWGKy+tXFA+AZmDTWzW1HF4h885JV5R3wDnfr2wrR8CPlu2bdNll0AcI0
+fuYMpZ7edLcYBs7AplQmM/RL7e/n+uIYi+zXb1ca2xYoARbajGCBz3P1EwyZEfja
+e/evXJMbiIGvPtOZBVVEYBkKGVEFL7EJqVze69yPl0Qs5l/ipKCjPQ9QEmmSl1l8
+ewZLjPlUe6rZSSKXDoC3Pw==
+ </ds:X509Certificate>
+ </ds:X509Data>
+ </ds:KeyInfo>
+ </KeyDescriptor>
+ <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+ <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin-test.kau.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
+ <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
+ </AttributeAuthorityDescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en">KAU</OrganizationName>
+ <OrganizationDisplayName xml:lang="sv">Karlstads universitet Shib 3 Test</OrganizationDisplayName>
+ <OrganizationDisplayName xml:lang="en">Karlstad University Shib 3 Test</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="administrative">
+ <Company>Karlstad University</Company>
+ <SurName>IT-avdelningen</SurName>
+ <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
+ <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="technical">
+ <Company>Karlstad University</Company>
+ <SurName>Paul Scott</SurName>
+ <EmailAddress>mailto:paul.scott@kau.se</EmailAddress>
+ <TelephoneNumber>+46 54 700 2307</TelephoneNumber>
+ </ContactPerson>
+ <ContactPerson contactType="support">
+ <Company>Karlstad University</Company>
+ <SurName>IT-avdelningen Karlstads universitet</SurName>
+ <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
+ <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
index 12e9fc74..2a4c4ff8 100644
--- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -2,6 +2,9 @@
<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://weblogin.uu.se/idp/shibboleth">
<Extensions>
<mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" 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: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>
@@ -119,17 +122,17 @@ MNWltbzwybdHu9kJ3aOfsHwsCE2XpV2qJ94ENK5YZ/8R0E5q5BrfnQ==
<ContactPerson contactType="administrative">
<Company>Uppsala University</Company>
<SurName>SAML2 admins</SurName>
- <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+ <EmailAddress>mailto:akka-datordrift@its.uu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="technical">
<Company>Uppsala University</Company>
<SurName>SAML2 admins</SurName>
- <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
+ <EmailAddress>mailto:akka-datordrift@its.uu.se</EmailAddress>
</ContactPerson>
<ContactPerson contactType="support">
<Company>Uppsala universitet</Company>
<SurName>IT Servicedesk</SurName>
- <EmailAddress>helpdesk@uu.se</EmailAddress>
+ <EmailAddress>mailto:helpdesk@uu.se</EmailAddress>
<TelephoneNumber>+46 18 4714400</TelephoneNumber>
</ContactPerson>
</EntityDescriptor>
diff --git a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
new file mode 100644
index 00000000..aa524dbc
--- /dev/null
+++ b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://webproxysrv.uniarts.se/adfs/services/trust">
+ <Extensions>
+ <shibmd:Scope regexp="false">uniarts.se</shibmd:Scope>
+ </Extensions>
+ <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+ <Extensions>
+ <shibmd:Scope regexp="false">uniarts.se</shibmd:Scope>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Stockholms konstnärliga högskola</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Stockholm University of the Arts</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Identity Provider för uniarts.se.</mdui:Description>
+ <mdui:Description xml:lang="en">Identity Provider for uniarts.se.</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">http://uniarts.se/om-skh</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">http://www.uniarts.se/english/about-uniarts</mdui:InformationURL>
+ </mdui:UIInfo>
+ </Extensions>
+ <KeyDescriptor use="encryption">
+ <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+ <X509Data>
+ <X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </KeyDescriptor>
+ <KeyDescriptor use="signing">
+ <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+ <X509Data>
+ <X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</X509Certificate>
+ </X509Data>
+ </KeyInfo>
+ </KeyDescriptor>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.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://webproxysrv.uniarts.se/adfs/ls/"/>
+ <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="E-Mail Address"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Given Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="UPN"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Common Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x E-Mail Address"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only group SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Deny only primary group SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Group SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary group SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Primary SID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Windows account name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Registered User"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device Registration DisplayName"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS type"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Device OS Version"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Is Managed Device"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Forwarded Client IP"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Application"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client User Agent"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client IP"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Endpoint Path"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Proxy"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Application policies"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authority Key Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Basic Constraint"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Enhanced Key Usage"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Issuer Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Key Usage"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not After"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Not Before"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Policies"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Public Key"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Certificate Raw Data"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Alternative Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Serial Number"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Signature Algorithm"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Key Identifier"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Subject Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V2 Template Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="V1 Template Name"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Thumbprint"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="X.509 Version"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Inside Corporate Network"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Time"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Password Expiration Days"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Update Password URL"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
+ <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+ </IDPSSODescriptor>
+ <Organization>
+ <OrganizationName xml:lang="en-US">Stockholms konstnärliga högskola</OrganizationName>
+ <OrganizationDisplayName xml:lang="en-US">Stockholms konstnärliga högskola</OrganizationDisplayName>
+ <OrganizationURL xml:lang="en-US">http://www.uniarts.se/</OrganizationURL>
+ </Organization>
+ <ContactPerson contactType="support">
+ <GivenName>Lars</GivenName>
+ <SurName>Lind</SurName>
+ <EmailAddress>mailto:itsupport@uniarts.se</EmailAddress>
+ <TelephoneNumber>+46(0)849400220</TelephoneNumber>
+ </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..a19a0648
--- /dev/null
+++ b/swamid-2.0/www.cvt.uppfoljning.ladok.se-gui-sp.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cvt.uppfoljning.ladok.se/gui-sp">
+ <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#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/hei-service</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 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://www.cvt.uppfoljning.ladok.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://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.env.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.env.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+ <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <mdui:Logo height="64" width="64">https://www.env.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.cvt.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.cvt.uppfoljning.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.cvt.uppfoljning.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJiQ6Y4LQA2rMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHHd3dy5jdnQudXBwZm9sam5pbmcubGFkb2suc2UwHhcNMTUxMDIyMTMyODM1
+WhcNMjUxMDE5MTMyODM1WjAnMSUwIwYDVQQDExx3d3cuY3Z0LnVwcGZvbGpuaW5n
+LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1HEGTRbi
+gDbH0FVYPs6k4lKZ5MxM3nxAoSXcRDVizojNNzlsiy9VhqpUZyhJS3PWTd4ORII+
+PZxvApKOGMuIV4HElXfeX7YGm/v4KdXro2Sk5U5KVNzfg43Snb7oRS3pq9km2Uzr
+BmxiMwVxbzROnSfePal1wRyXqQwQJOXTLqLm9XBFC1Z3autwVLvn1YQ8t/c21QK8
+HeoxGGQAlf5IlsetiXNoJH714+ovpsbnlpZB9ZEU8gF+E2j/igGA1YxfcKNbusBi
+Ks6olO37lwb0kmULooqEwVIQRXfncOzx/O8QJI9FJWrHQlFmzFre6TAQ/iSVByb6
+rSPw0PXKNzyKYwIDAQABo3cwdTBUBgNVHREETTBLghx3d3cuY3Z0LnVwcGZvbGpu
+aW5nLmxhZG9rLnNlhitodHRwczovL3d3dy5jdnQudXBwZm9sam5pbmcubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBRqHw1wOSeUjkz37X5oJtxCZwq3MDANBgkqhkiG
+9w0BAQUFAAOCAQEAVCyTPqAjAYrbO0t9nj/Vma1hbF2Y2rgBpjQDuSOIPuiFNjgw
+l6QVMhxbroL5FcWnYQ5eJAHGMgs7THDKvEs7lLo8hReyA/gyhtv+wnWw75Zdf7G3
+W5EKt6m0g4T0I6vLykleVx5iGcGGWWUKqBcqOEdEtVSnThPo6+qfGNa0+wAU+wYk
+dcRieDbdpuiP1i98Q6xHyHdufBFWypbxd7ay7/978uHhrMt06zgvBqcN0c6vDAEn
+JN8DBjzaLWDIVRmzVzcl/0rdt5hrTbdsWzWr06BNOXjapzJ+YlQ7efSLJDGlyeek
+Amc24v5TLThVrOsV13FA5SIl4sa5rwDvh3WoSw==
+</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://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cvt.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.egencia.com-auth-v1.xml b/swamid-2.0/www.egencia.com-auth-v1.xml
index e98e3242..57dcc6ed 100644
--- a/swamid-2.0/www.egencia.com-auth-v1.xml
+++ b/swamid-2.0/www.egencia.com-auth-v1.xml
@@ -25,47 +25,65 @@
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIDXTCCAkWgAwIBAgIEEcjjOjANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJJTjELMAkGA1UE
-CBMCSFIxEDAOBgNVBAcTB0d1cmdhb24xEDAOBgNVBAoTB2VnZW5jaWExDTALBgNVBAsTBGF1dGgx
-EDAOBgNVBAMTB2VnZW5jaWEwHhcNMTQxMTI1MTMwOTQ3WhcNMTUxMTIwMTMwOTQ3WjBfMQswCQYD
-VQQGEwJJTjELMAkGA1UECBMCSFIxEDAOBgNVBAcTB0d1cmdhb24xEDAOBgNVBAoTB2VnZW5jaWEx
-DTALBgNVBAsTBGF1dGgxEDAOBgNVBAMTB2VnZW5jaWEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCy0EBPrwy8d/T+rlv2hZNxQmcLdk7ewruvjiw3P/1cSo1bJtFEwZrAXERHQPX/DaEX
-y8KL/diYW+fpaalyHJTQLjY4IqDRMPfhleVXqX862y9k46k7ioL/qv11ZtrO9JrecDXqm/twFLL3
-d3GJXz/Qf5AfNvM+a7wny1ZmYNyuXKHWIqWGzHpqTomjtlGE2VrBqC4DtvcEruZ0+CdqqA2Qmwrm
-BSxB/LlLqHuB19DeUbVt0pa0o5oxwbYLBtRH6PUYxBe0i2A3HC/QkxZil5YdD3MHqB3KRdobUdHp
-3Z9QgWwJJ19bZ4gJWYPfTlMXcGVhKR3Vcfrc7jw294H2X9TbAgMBAAGjITAfMB0GA1UdDgQWBBQj
-cVN/E+c2EzvzoZV8vBzJxzUUUzANBgkqhkiG9w0BAQsFAAOCAQEAaBll99MmA2Q4/dE7Q4f3kc+3
-GFqMwrTJokFb2yjafo4+fs+tRbCQi/P2eY7XkEFTWuZGJfDigKGhLINIpMkMd1RHt1iEyYfuZXXC
-uJBQTfSmha6dXceABAD+amTU5BWlNywpdGi8ajp8+Ytq0C+pO7MldDip+7vMS3LhoDHiQlubl2KL
-ob6x0KGydwxsMBN7ETIChkm/def8Edtlmzs3MR63XeB77EgVeb62Be+48Fn/+gLJVromH3TMpN5j
-I6vDyy0Eq6Q8eTv+UR99ax3vBFPfG9qg8jp5aruWeQS3IMyzSbpDQ30nNJl1QIiIYvhS+dVRjFHC
-agvcqwPGk8MYTg==</ds:X509Certificate>
+ <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIMDVCG8gAAAABQ1dX0MA0GCSqGSIb3DQEBCwUAMIG6MQswCQYDVQQGEwJV
+UzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9s
+ZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g
+TDFLMB4XDTE1MTAyNjIxMDQxMFoXDTE4MTAyNTIxMzQwOFowZzELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCldhc2hpbmd0b24xETAPBgNVBAcTCEJlbGxldnVlMRYwFAYDVQQKEw1FeHBlZGlhLCBJbmMu
+MRgwFgYDVQQDEw9TU08uRUdFTkNJQS5DT00wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDTn33bK5kWsiyxwi9F7zc1160xNJcWYykHIiX1aMLXhZln3oS1Ma3idei6PC9R0aK0h0Y7qe8y
+Ab8AajfnCxB8gqKOCR064hMMYB2fon0tC//477x8wG2XrFDzTem21LNRkrI54EcBvykDWSqlC0lI
+QOBTtn5nTfsSuRBYl+CDGaMb/UUHZ5l18TqbCgVmELiEr37j9Cfqv6NO8b80k1zXP8FwFNQmSGxw
+QMBOAf/V43Yn1mdGxaUZBY2MnK1yKH6IoPBKAyafUPedXz5gy/xIQZTQprIb9kosei6IyOtuqmnV
+o1VA7HKPV8w5cIyx11eZgOV0Fi0IswvwBJxPrf1pAgMBAAGjggGDMIIBfzALBgNVHQ8EBAMCBaAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9j
+cmwuZW50cnVzdC5uZXQvbGV2ZWwxay5jcmwwSwYDVR0gBEQwQjA2BgpghkgBhvpsCgEFMCgwJgYI
+KwYBBQUHAgEWGmh0dHA6Ly93d3cuZW50cnVzdC5uZXQvcnBhMAgGBmeBDAECAjBoBggrBgEFBQcB
+AQRcMFowIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVudHJ1c3QubmV0MDMGCCsGAQUFBzAChido
+dHRwOi8vYWlhLmVudHJ1c3QubmV0L2wxay1jaGFpbjI1Ni5jZXIwGgYDVR0RBBMwEYIPU1NPLkVH
+RU5DSUEuQ09NMB8GA1UdIwQYMBaAFIKicHTdvFM/z3vU981/p2DGCky/MB0GA1UdDgQWBBSgfwEI
+76qdV0qOuSAkkfaYK3AlrzAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQC+3Mp8fw1ZSfEK
+ob3KVMH0pW8geCRDnnyh/Cv5/AnlPwdFfWSzIKmE5ZknfVwcV/XftRQxbkuIt0RANWXZvltj9qEP
+bTwTgBrFW+jAxhSI2VeJlFtHwB3NIc/Dt5jrfkC6x1Sdee6X+Jh/Jv7jcDKvEwOuLwzEq1n6lU4e
+9MTmZmtqHJrD4V79qOn7W1aeGfZMqa72kms6InjTAVwENNqY+MbBg1axxr+uXjlBuuRQRHmd/N1D
+dCS4UR5oi0W8746+1iN6fE8qYdVN4bwwa3QtRn9xFzBtsy1V2Dm5H9SMCxZkewj2W7PXNr65gjRy
+iYns87MN+qR53rv18Bbk6be4</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
<md:KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:X509Data>
- <ds:X509Certificate>MIIDXTCCAkWgAwIBAgIEEcjjOjANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJJTjELMAkGA1UE
-CBMCSFIxEDAOBgNVBAcTB0d1cmdhb24xEDAOBgNVBAoTB2VnZW5jaWExDTALBgNVBAsTBGF1dGgx
-EDAOBgNVBAMTB2VnZW5jaWEwHhcNMTQxMTI1MTMwOTQ3WhcNMTUxMTIwMTMwOTQ3WjBfMQswCQYD
-VQQGEwJJTjELMAkGA1UECBMCSFIxEDAOBgNVBAcTB0d1cmdhb24xEDAOBgNVBAoTB2VnZW5jaWEx
-DTALBgNVBAsTBGF1dGgxEDAOBgNVBAMTB2VnZW5jaWEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCy0EBPrwy8d/T+rlv2hZNxQmcLdk7ewruvjiw3P/1cSo1bJtFEwZrAXERHQPX/DaEX
-y8KL/diYW+fpaalyHJTQLjY4IqDRMPfhleVXqX862y9k46k7ioL/qv11ZtrO9JrecDXqm/twFLL3
-d3GJXz/Qf5AfNvM+a7wny1ZmYNyuXKHWIqWGzHpqTomjtlGE2VrBqC4DtvcEruZ0+CdqqA2Qmwrm
-BSxB/LlLqHuB19DeUbVt0pa0o5oxwbYLBtRH6PUYxBe0i2A3HC/QkxZil5YdD3MHqB3KRdobUdHp
-3Z9QgWwJJ19bZ4gJWYPfTlMXcGVhKR3Vcfrc7jw294H2X9TbAgMBAAGjITAfMB0GA1UdDgQWBBQj
-cVN/E+c2EzvzoZV8vBzJxzUUUzANBgkqhkiG9w0BAQsFAAOCAQEAaBll99MmA2Q4/dE7Q4f3kc+3
-GFqMwrTJokFb2yjafo4+fs+tRbCQi/P2eY7XkEFTWuZGJfDigKGhLINIpMkMd1RHt1iEyYfuZXXC
-uJBQTfSmha6dXceABAD+amTU5BWlNywpdGi8ajp8+Ytq0C+pO7MldDip+7vMS3LhoDHiQlubl2KL
-ob6x0KGydwxsMBN7ETIChkm/def8Edtlmzs3MR63XeB77EgVeb62Be+48Fn/+gLJVromH3TMpN5j
-I6vDyy0Eq6Q8eTv+UR99ax3vBFPfG9qg8jp5aruWeQS3IMyzSbpDQ30nNJl1QIiIYvhS+dVRjFHC
-agvcqwPGk8MYTg==</ds:X509Certificate>
+ <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIMDVCG8gAAAABQ1dX0MA0GCSqGSIb3DQEBCwUAMIG6MQswCQYDVQQGEwJV
+UzEWMBQGA1UEChMNRW50cnVzdCwgSW5jLjEoMCYGA1UECxMfU2VlIHd3dy5lbnRydXN0Lm5ldC9s
+ZWdhbC10ZXJtczE5MDcGA1UECxMwKGMpIDIwMTIgRW50cnVzdCwgSW5jLiAtIGZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MS4wLAYDVQQDEyVFbnRydXN0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g
+TDFLMB4XDTE1MTAyNjIxMDQxMFoXDTE4MTAyNTIxMzQwOFowZzELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCldhc2hpbmd0b24xETAPBgNVBAcTCEJlbGxldnVlMRYwFAYDVQQKEw1FeHBlZGlhLCBJbmMu
+MRgwFgYDVQQDEw9TU08uRUdFTkNJQS5DT00wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDTn33bK5kWsiyxwi9F7zc1160xNJcWYykHIiX1aMLXhZln3oS1Ma3idei6PC9R0aK0h0Y7qe8y
+Ab8AajfnCxB8gqKOCR064hMMYB2fon0tC//477x8wG2XrFDzTem21LNRkrI54EcBvykDWSqlC0lI
+QOBTtn5nTfsSuRBYl+CDGaMb/UUHZ5l18TqbCgVmELiEr37j9Cfqv6NO8b80k1zXP8FwFNQmSGxw
+QMBOAf/V43Yn1mdGxaUZBY2MnK1yKH6IoPBKAyafUPedXz5gy/xIQZTQprIb9kosei6IyOtuqmnV
+o1VA7HKPV8w5cIyx11eZgOV0Fi0IswvwBJxPrf1pAgMBAAGjggGDMIIBfzALBgNVHQ8EBAMCBaAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9j
+cmwuZW50cnVzdC5uZXQvbGV2ZWwxay5jcmwwSwYDVR0gBEQwQjA2BgpghkgBhvpsCgEFMCgwJgYI
+KwYBBQUHAgEWGmh0dHA6Ly93d3cuZW50cnVzdC5uZXQvcnBhMAgGBmeBDAECAjBoBggrBgEFBQcB
+AQRcMFowIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmVudHJ1c3QubmV0MDMGCCsGAQUFBzAChido
+dHRwOi8vYWlhLmVudHJ1c3QubmV0L2wxay1jaGFpbjI1Ni5jZXIwGgYDVR0RBBMwEYIPU1NPLkVH
+RU5DSUEuQ09NMB8GA1UdIwQYMBaAFIKicHTdvFM/z3vU981/p2DGCky/MB0GA1UdDgQWBBSgfwEI
+76qdV0qOuSAkkfaYK3AlrzAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQC+3Mp8fw1ZSfEK
+ob3KVMH0pW8geCRDnnyh/Cv5/AnlPwdFfWSzIKmE5ZknfVwcV/XftRQxbkuIt0RANWXZvltj9qEP
+bTwTgBrFW+jAxhSI2VeJlFtHwB3NIc/Dt5jrfkC6x1Sdee6X+Jh/Jv7jcDKvEwOuLwzEq1n6lU4e
+9MTmZmtqHJrD4V79qOn7W1aeGfZMqa72kms6InjTAVwENNqY+MbBg1axxr+uXjlBuuRQRHmd/N1D
+dCS4UR5oi0W8746+1iN6fE8qYdVN4bwwa3QtRn9xFzBtsy1V2Dm5H9SMCxZkewj2W7PXNr65gjRy
+iYns87MN+qR53rv18Bbk6be4</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.egencia.com/auth/v1/saml/SingleLogout"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.egencia.com/auth/v1/saml/SingleLogout"/>
<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:transient</md:NameIDFormat>
<md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
diff --git a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml b/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
index f969162f..cc27a9d8 100644
--- a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
+++ b/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
@@ -49,6 +49,6 @@
</md:SPSSODescriptor>
<md:ContactPerson contactType="technical">
<md:GivenName>Administrator</md:GivenName>
- <md:EmailAddress>netdrift@deic.dk</md:EmailAddress>
+ <md:EmailAddress>mailto:netdrift@deic.dk</md:EmailAddress>
</md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/www.researchprofessional.com-shibboleth.xml b/swamid-2.0/www.researchprofessional.com-shibboleth.xml
index d6fed039..90d0f8bc 100644
--- a/swamid-2.0/www.researchprofessional.com-shibboleth.xml
+++ b/swamid-2.0/www.researchprofessional.com-shibboleth.xml
@@ -1,8 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.researchprofessional.com/shibboleth">
+ <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: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://www.researchprofessional.com/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="en">Research Professional</mdui:DisplayName>
+ <mdui:Description xml:lang="en">Research Professional is an intuitive platform for online access to news and funding services.</mdui:Description>
+ <mdui:InformationURL xml:lang="en">http://info.researchprofessional.com/</mdui:InformationURL>
+ <mdui:DisplayName xml:lang="sv">Research Professional</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">Research Professional är en intuitiv plattform för tillgång online till nyheter och finansieringstjänster.</mdui:Description>
+ </mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -45,4 +60,9 @@ tgwZBKIPISvO0cHB2chZHzDJI9PQsgD0OmVfHqQtlwuMw32qK2EcD1NC/VZZ/w==
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/POST" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="5"/>
</md:SPSSODescriptor>
+ <md:ContactPerson contactType="technical">
+ <md:GivenName>Steve</md:GivenName>
+ <md:SurName>Potter</md:SurName>
+ <md:EmailAddress>mailto:sso@researchresearch.com</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..ff01c8b0
--- /dev/null
+++ b/swamid-2.0/www.test.uppfoljning.ladok.se-gui-sp.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.test.uppfoljning.ladok.se/gui-sp">
+ <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#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/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://www.test.uppfoljning.ladok.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://www.test.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.test.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.test.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+ <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+ <mdui:Logo height="64" width="64">https://www.test.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.test.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.test.uppfoljning.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.test.uppfoljning.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFTDCCAzSgAwIBAgIJAJwQ1AOzvzh4MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
+BAMTHXd3dy50ZXN0LnVwcGZvbGpuaW5nLmxhZG9rLnNlMB4XDTE2MDExMzA5MzYy
+M1oXDTI2MDExMDA5MzYyM1owKDEmMCQGA1UEAxMdd3d3LnRlc3QudXBwZm9sam5p
+bmcubGFkb2suc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQClXTeW
+/wJJQsTLzSeJ753U+8cwpv7FOwkUpCcHH6bb7nVIdcJDuYQOw8JVBl9S69cEXXcG
++VevlFNf4qU9bKEGQKnd15YiybR5sus4x25dG4aGk7p6ZapsDoSg/CKwrbhmOjYT
+OCCjHUrsUdBEe0spS4qBGo5QVgMBMBWEhL85pxFxO95j80iU7LSQIKZSMWBZzm37
+ouSxsXT/x52Ao6HtlWK17BF0m9kW3uLW38wlaP7JTWTnve1CMaOMVEbDliw3ysX7
+uO6fKvTWTkpzG62offlKKExCbyH340X5TI8dOhyYOlFyrpccdSCQkcSviSJ4oL0j
+XAO+rCV1PngoecLThIidN8sSqIwL5nFDULCNURYIpd7w15wu01I5y8dy9NUOvZ3b
+XZ16mPKQpL2nGJe1wRS1jSpooeG5TAxvOwdKBLgzeqZ4I1FC0Dha70FfmWrJ0Opt
+sYTQ2jbCxtDx6tBHK1dw9OX/flxqmnxsvNJ/ALuzxbRMJL/j/Yi4SAHnAUtdOFqo
+VK/FxqVwqRRB7igCVIuviZbA7GeODnwah+Llv12vvfis+wipQQ5aKA9DpbK+KwP6
+OsgOZSBhvCCKvMGuxgVifzxSJeQxG2WoehEtuhnUCao+L7WE+NLY5hOUowsQLN+a
+/jlCye3nnQ0lb7ZOxHREazCbztPgO4VX/O40EwIDAQABo3kwdzBWBgNVHREETzBN
+gh13d3cudGVzdC51cHBmb2xqbmluZy5sYWRvay5zZYYsaHR0cHM6Ly93d3cudGVz
+dC51cHBmb2xqbmluZy5sYWRvay5zZS9ndWktc3AwHQYDVR0OBBYEFK9iv5wSca5C
++6vltre0Ko+Z9X98MA0GCSqGSIb3DQEBBQUAA4ICAQBlidVziryz78l+6jlhxif+
+AXSJBQDeNoJ2ApxD9mBdJcXb4O/Huy2o5Ijo19vP0RPM6svK9TafHaOuGR1ZmlJe
+lQY+z+Decit9NsugZTaq2n2eMCqFhDy/Ybu8IEurJ9E09t2o5itqhGUgwJpG3BhV
+fdbKJSwoF2JSAn/PDZaNo9IdOGqxqHvVds4A6WzYVsDl0XiTqeMhb5My3K4nz8ER
+9VdsdldJTRqGp06pxkr2XLUSkX36yyV5uf2M1SR1aNl1WTVmB6/LePSOTgsUCV2r
+Xr6/QoflBFXZySNWV7f1klzl3MnmfOyWaBUILGh2Ke4/L2azEXil5jApeVnt+y6e
+Ql0ZjEruBkDpCkltdew1vaDRuJAPd5NC6LPXWjozZYNx8dNcze/yJTjoWwPltvf8
+0pAU9qPKqLrlX3ZWmtWh6ymT2XnK4mINjpcS3uDZDSkgMZAsgs8SpTdrgtE89sLz
+VqAUw5BQrZQYhV+AtqWCOnQcxaC9mLkdB6wpfZu5xrgWgQGcAvJM0lnOP/LAQPny
+jiCPF0Mux4hPUalhs5RJfQhUZBIo5c0PZSohzHn2pNIWMkppphOMEMrc/HBuDbAZ
+OGHgoQN0dxACvHw1YMHvyFWI+NYO1070o6sY9/MwGyrCClplXiMnDmfbyIsfvq6u
+qqt+VY+dgL11MGCZOGpJVg==
+</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://www.test.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..5bff7c50
--- /dev/null
+++ b/swamid-2.0/www.uppfoljning.ladok.se-gui-sp.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.uppfoljning.ladok.se/gui-sp">
+ <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#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/hei-service</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 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://www.uppfoljning.ladok.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://www.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <mdui:Description xml:lang="sv">Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+ <mdui:Description xml:lang="en">Administration system for higher education in Sweden (Ladok)</mdui:Description>
+ <mdui:Logo height="64" width="64">https://www.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.uppfoljning.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.uppfoljning.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIFODCCAyCgAwIBAgIJAOk6eA6bBSUAMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
+BAMTGHd3dy51cHBmb2xqbmluZy5sYWRvay5zZTAeFw0xNTEyMDQwNzMxMDNaFw0y
+NTEyMDEwNzMxMDNaMCMxITAfBgNVBAMTGHd3dy51cHBmb2xqbmluZy5sYWRvay5z
+ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMgvIKG0Iddz3FLny2fV
+YENWzgyr/dv0r+c0JDRp3P0bKoQnYiOC+XVAGi6e6u5XazWzkQJapQSO1W3z2eXG
+IWFaAYgZFsqINmIIKKcxN/n9Zevh88DgKa3Oz8S/5cTxhQflikDXvyaCeWy2hZKP
+uLt+mtCxmtBFZQqyWkSPIeb6naAAuMHba2xAfstM9mUJsobKJWjfg40jrhAHo2Kc
+LFES9ckL2IKbduC1RO9S98h8LoTGHI1KCegpmptyMveJL6r5bPJYRTuTCRyIDQ53
+WuzAuOMfTrvTX/2NO2zF7UWASRyZCSNjew/cfE7qL3YRJfeEMPDy/BTmtsdoBdHS
+J3zK1sNLfv8yaYOo2Ows9hFZeNKaFBMunXvIUBnXcfAZQMRutOXJYtC7Cfc0+djl
+3J/l9SLQfQfqxww8cf/RBWNMvjapL2IU5g2D7buEsgkxM56b0Yw3YZ1XMQHOy9pG
+BOEt6NaIdtTyz2dA1JxRurOCkPq3kNfHnJlYAuB9rNc8t5b34M/oZKA7cdVPBa+N
+Ty40YhjZw9Z05b4G+Y0nXMxORB7kJFqAjmBd59ZbhphqgCIkrRuzIMK+iouAlq2f
+lgsJ38oMW1f6DLVGH2GC2Sx81Ngq6BoJFUlJq/sE0fnUbdEpC/aQky5ph9rVCx7r
+yWewkliKVJemhyYYLXR3oas7AgMBAAGjbzBtMEwGA1UdEQRFMEOCGHd3dy51cHBm
+b2xqbmluZy5sYWRvay5zZYYnaHR0cHM6Ly93d3cudXBwZm9sam5pbmcubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBQsive1Oq4SvjwbaHCpcUagbKLD7jANBgkqhkiG
+9w0BAQUFAAOCAgEAMxAsYYpc23IeKioe+YkUMp5w5LSAzFw84Hbnvn7kpWZnCjkJ
+lWQIg43rfoP245VV5iete0s9yvMl5PrnFlGs/5SgTCBdrTXXSjMc9AbXW3WAMnpy
+Uj4mloSfwCURUtm6JlzlQE+cI2/2gqcjyX3NO5bm5ztNxJkMPH/eS8OmaG8PSUdd
+nHCgPGaXMRphFKa6PIOXjauWhSVZMXyQyFUo9NY6arc341qt3DmrrmrQhm6IvavH
+Z9h5c9sjOBqPT0BXMxDWgWkRih3R9nFsITd0rmZTJ1sOt4rDDq5UrTTUMCk6SdsJ
+VFbtw1UaIKfxxD/hI8kvt53dHPQFf07PJM5gHmi6rW0y9qGtgJlbo1gnavRDyIxQ
+7RY0JUZHZbwbErb76VVrq/IYfCRYn9ITSBNaRFmxCYmfk2glZE11MPNijg3/SdN2
+uUIuMpT3jxebMVF/jprgY3SXYVtylGd6jOWZmKqGxMQ0gII0StsMgAlk22MWr4HO
+vK6J9hwUI057LYBOpwF777iKoGTpAdDnk8wEpc/gD6OVAjdmPmoxq1F6aXQ/0Rb0
+9AHiq9QuIZvfZxuLZua08zjkw/PiD51rHgQ6xGabj5dag5rI+WzYvdqQf43Q+NRf
+In/ikXXTMoplS8tRzCrjMQsTrhAg8qemRbZ6iGMqy8/lXraUDplt75yZFcY=
+</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://www.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml b/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml
new file mode 100644
index 00000000..35b39fb5
--- /dev/null
+++ b/swamid-2.0/www.utb.uppfoljning.ladok.se-gui-sp.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.utb.uppfoljning.ladok.se/gui-sp">
+ <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#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/hei-service</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 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://www.utb.uppfoljning.ladok.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://www.utb.uppfoljning.ladok.se/Shibboleth.sso/Login" index="1"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">Ladok www.utb.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">Ladok www.utb.uppfoljning.ladok.se</mdui:DisplayName>
+ <mdui:Description xml:lang="sv"> Studieadministrativt systemstöd för universitet och högskolor i Sverige (Ladok)</mdui:Description>
+ <mdui:Description xml:lang="en"> Administration system for higher education in Sweden (Ladok)</mdui:Description>
+ <mdui:InformationURL xml:lang="sv">https://www.ladok.se/</mdui:InformationURL>
+ <mdui:Logo height="64" width="64"> https://www.utb.uppfoljning.ladok.se/_system/00/images/logo-00.jpg</mdui:Logo>
+ </mdui:UIInfo>
+ </md:Extensions>
+ <md:KeyDescriptor>
+ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyName>https://www.utb.uppfoljning.ladok.se/gui-sp</ds:KeyName>
+ <ds:KeyName>www.utb.uppfoljning.ladok.se</ds:KeyName>
+ <ds:X509Data>
+ <ds:X509SubjectName>CN=www.utb.uppfoljning.ladok.se</ds:X509SubjectName>
+ <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAJRuttYMy/CdMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHHd3dy51dGIudXBwZm9sam5pbmcubGFkb2suc2UwHhcNMTUxMDIzMDgyNzE0
+WhcNMjUxMDIwMDgyNzE0WjAnMSUwIwYDVQQDExx3d3cudXRiLnVwcGZvbGpuaW5n
+LmxhZG9rLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlHyyl8lw
+wkevAYlRJiSqa3yaCbU8D5cUNH9mIPojH1kfb1QXByscQPc9MwGR0tDl67o4+qr8
+f51okBl4+C/AfkGgsc2C+jvPhO/p16Uzw9AXCSN8Nzl+RHBUhONYOKgQA4OaRxOI
+As/rvAYZQEmqVoENANdNNJRi0Tqwqo9FxlX4q9XHwx+53oOfeXVMetMAi/uU75OT
+YCPW5F0Y72XQ2QPZkRNsqYK1IVqMCsgXS1VPiuqCyWHdUhesYC+S2279QrP2sXcJ
+xiQhohE7dY2vdgHLmQq+T2YERVIoGqCNxvKQ4JPeVr9MPVAN1uiJ3wiPpLxh4VVs
+Oa7beN4vr+KboQIDAQABo3cwdTBUBgNVHREETTBLghx3d3cudXRiLnVwcGZvbGpu
+aW5nLmxhZG9rLnNlhitodHRwczovL3d3dy51dGIudXBwZm9sam5pbmcubGFkb2su
+c2UvZ3VpLXNwMB0GA1UdDgQWBBTUNZ+hmTCzgsSS3vs4dxj8Mm5kuzANBgkqhkiG
+9w0BAQUFAAOCAQEAkEPx2U0iQ4NfF+ixzf0LOBUT8njxb8lHfX4PjqinJS15N4si
+xGispD9fabYPNVGK500/Md/4Gl6MrPhsxbAMcRn9FL962JiuTccfsecGAv5+4BKY
+IjBj97jbFJ2fhsQBBaevgfNP2wLHsyQheQgAXY72cCG3OaZeTMMNECb1FG1MhvRt
+Zvdcx+ES1HMOgLCAU2BF/oYnuuGhwOI4H6jabKK44GbWeE0Mv8L/A5knUoujfR0n
+gUbDaBy4oNdSbv4VXVLXLD6XwwzJNfn8TGE8LQh3pvSAOdiTz4ie2ybYfXI2VKVG
+IgTd2o/JWpObjIU/AurReC6h+UPQ4M3O3lBYFA==
+</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://www.utb.uppfoljning.ladok.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb.uppfoljning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+ </md:SPSSODescriptor>
+</md:EntityDescriptor>