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

4 files changed, 207 insertions, 116 deletions

diff --git a/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml b/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml
index d59e8477..ac0b2820 100644
--- a/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml
+++ b/swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml
@@ -12,6 +12,13 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc: SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://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>
diff --git a/swamid-2.0/lubas-test.srv.lu.se-shibboleth.xml b/swamid-2.0/lubas-test.srv.lu.se-shibboleth.xml
deleted file mode 100644
index 0ce73938..00000000
--- a/swamid-2.0/lubas-test.srv.lu.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" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://lubas-test.srv.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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">luBAS test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">luBAS test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">uBAS och luBAS testmiljö / utbildningsplaner och kusrplaner</mdui:Description>
-        <mdui:Description xml:lang="en">uBAS and luBAS testing</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDwzCCAqugAwIBAgIJAOZyU0HkuQhgMA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
-BAYTAlNFMQ8wDQYDVQQIEwZTd2VkZW4xDTALBgNVBAcTBEx1bmQxEjAQBgNVBAoT
-CUxEQyBkcmlmdDERMA8GA1UECxMIVEVTVC1zc2wxHTAbBgNVBAMTFGx1YmFzLXRl
-c3Quc3J2Lmx1LnNlMB4XDTE1MTAxNDEzMzQxOFoXDTIwMTAxMzEzMzQxOFowczEL
-MAkGA1UEBhMCU0UxDzANBgNVBAgTBlN3ZWRlbjENMAsGA1UEBxMETHVuZDESMBAG
-A1UEChMJTERDIGRyaWZ0MREwDwYDVQQLEwhURVNULXNzbDEdMBsGA1UEAxMUbHVi
-YXMtdGVzdC5zcnYubHUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDRSRpSaqjsMSzRna4CqZlAohcY4j8FZ4hMMOSCKa30Jbh8GSlZCcTcu1lN1lbi
-gpECR+Fx6CyV4tPW8mc+QJ8MaprLC8MnS4w2XtYR+QtCtDYLQo0dm4w6RlOjdQaX
-T76Kj5hjgT6v5ZRvxiM9Q3i3i4EQqmHxyIYy6+0L4XjkjEsSRBpn/0x+ra5Q8NOv
-7+N5dBQ1zKUbk1UXmno0/BBvm8xkDvUYRMk9wINFdNehFlcIZvTFdLQYoWm60vZT
-ZVM7CD4CEEY0ZxffATdjHpdcL4rsh5o/glb2b8wszpy4z9L9fkPbDLlr3gFu+Mki
-CaOZa5ImY4/BVdRJlqjxAN7tAgMBAAGjWjBYMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMD4GA1UdEQQ3MDWCFGx1YmFzLXRlc3Quc3J2Lmx1LnNlgh10MDIyMS1nbHVi
-YXMtbHUtdHN0LnNydi5sdS5zZTANBgkqhkiG9w0BAQsFAAOCAQEAW/alO9TuQsky
-PX8QFP+x+l8O8Vmt30Gdya8uzVCPgibdmlPFu23SKyjEf+Le9p1nsfo7tNnFC9rv
-xB32GgjO/zgSGCjsct/CJscZTALocEGk3w0VaUfYFzQutCB975uicnJ/Iq7PE/tf
-cIlfY6XWfDa0wU2T5MTA1RbsB/0BJNPN5SdqK4v/2h2eJjP6pnBP6kRXQ1sRCWH6
-LVxrRza5HanRojg8YRWJxlnSkexJ68Ev8yiPPOwPYDbyv/+e6hW/ODIf7yY07A+p
-wXmNCK4Zh4KW6j219O4VEldp2fWfWNTzbgfI/Eo5VJq54SRRTkDAL2Rat7eWXm3t
-iU9HcxkhcA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lubas-test.srv.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lubas-test.srv.lu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lubas-test.srv.lu.se/Shibboleth.sso/SAML/POST" index="4"/>
-  </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/shib-idp-2.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
new file mode 100644
index 00000000..cec88716
--- /dev/null
+++ b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
@@ -0,0 +1,200 @@
+<?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://shib-idp-2.oru.se/idp/shibboleth">
+  <Extensions>
+    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
+      </saml:Attribute>
+    </attr:EntityAttributes>
+  </Extensions>
+  <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">oru.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">shib-idp-2.oru.se</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IdP för Örebro universitet - Shibboleth IdP v3</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.oru.se</mdui:PrivacyStatementURL>
+        <mdui:Logo height="80" width="80">https://shib-idp-2.oru.se/Logo_txt_runt_farg.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUNiSfKA1z7kqPZnZ6BvFj5alpNDgwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
+OTU3WhcNMzYwOTAxMTI0OTU3WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4xgsKQJZUjQQ/2
+w6IMXPyTzSsMlzAyLlb8U5NvskAV9Cy5MlfCn9az4XqR2rm/4FHblwETi2PuMpW1
+qy1DSDA3dL8zWunDuz8J+FhGvSd7xmTnQaOYp5Klqpm2hKUTNUPGPNyCBIOB8iB2
+iKVnTRmThzvr3yOTA0zFrwZZ177DQhkhbP2g/iqBscxYMes7CSNXeFTaI1dksIpi
+3uy2GcNCxDI6khYGC9YT0rcU9eLFQ+gP6hdVZcrPcjPC4J/u6D1YcwC2G7RCNCBp
+up9V0pcCRrcBoo/LJIghfGBat0hKTFUtxK/6GBX1gcrVqTvjBeQXJPqWpzL4qtkT
+/QuYhoMCAwEAAaNvMG0wHQYDVR0OBBYEFBEX0552+o8uctBk5u7x49By+jU8MEwG
+A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
+LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBT
+5WCk9TSGTsQNVvuz7zgqBsTasmc7cI6EjqWyhilonfT2orbnZG5+4zOyJnfYF8W3
+OO84YZSY+XozxZfz1sEaGQheiExJVpMfF7fNKr53jNTw8jcOcgSo4ThOfXSf37q9
+jmfLTiubpqiBpKxWhVvyhZEeDyROCli+3JKfomBO6jVBFs5xeYmuj/LCgavAvdBN
+iZ0aXelhNSJeuPksLkSy2zAWHB9Y+lUYCVZ+0ACFGbtruHUW3L5WSchE5d+KXDZ8
+25H2L/qtUpsi4735GVsBKieHohtT61Un0XKeSwEhWSX+ej5DbgzXH6F7XbMS6+RD
+WVSpbBf+Iky5/3hSJbjO
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAM531TMg36on8Ql5UK2TziTQr9qRMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFHNoaWItaWRwLXRlc3Qub3J1LnNlMB4XDTE2MDkwMTEy
+NDk1NloXDTM2MDkwMTEyNDk1NlowHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5v
+cnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmyj1MWgE8NgPY
+tb3XsakHcEOrk6o79EDWTx6DtdTJfz9L2Nl7Z6K/oUZ0R3v1kT8zncS3uz5AlcM0
+vepZ9d4dLWXwKrmOcMTZlRoyQd8RlaC1X3kMinkpivkXduignD/pQter2pCLdoFT
+j0oKbmSHR130zm/uaigcPYjyqwPD/yuwE5mZ+sX1j0NrRU9pvMDZmrgU1XeNwLLD
+wBoCi8qedjGupkJCpvU4X/3+CvVYtzuEImBQmhDnvNpPk1UX6h8wFwNzWr9mkmIl
+qJ9HhakzkbDblsOOgSu+GkGEVaDTFLkoOKxVD8ohqfpYMmNWpCnHvICfbx+qyubx
+Y9qMQUTlAgMBAAGjbzBtMB0GA1UdDgQWBBS6hqhPe57NQMnrUyoK29RDzi4kQDBM
+BgNVHREERTBDghRzaGliLWlkcC10ZXN0Lm9ydS5zZYYraHR0cHM6Ly9zaGliLWlk
+cC10ZXN0Lm9ydS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+Px98VAMrQj/axaEDyVWI+KmXV5JvM5CzJZV2Tt1QZAKG2D1qK/B8Kpri6tFLCK8S
+7cWdzU63gGaP5wONW1rD7uG2bCYlKkiEnJDafapKlS0/qJF2FNA1/6rEDOibwdT6
+yib8RrjklowyQ0pwAMm+YJ89n/MqB5SOL8jPjJEib83FZruRgTg2npKPkc7eWy6l
+XRk4jFV8NbemfAY/9o/JbecRM70stqFI0ihYPg8N7MPyB5Tr5w5OLaqRsEB+qyIy
+AqkS4O7+sMfqyRZz4qH/8s3MKspUmr7LncvBKSWOINun9P2gTJuqqOrJKg7wDHgL
+BAZNocu/Hh/kGS7R/8vneg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUOIOR9/vOXSKitXIAEB1uhk5hRFcwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
+OTU2WhcNMzYwOTAxMTI0OTU2WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVY4Vj+DCdA1Igb
+yz2UPXyniLHv61Q05LvG/1ECyuu79/Qr0B/f8IyKM+S+PiXXm7QlQAmfXWdLRd5e
+LuVUGNjXvBuDava+2yruoHY3Ay5DtmZQ0wpmK8NPRCO647G4dC+viY4lcWZtqIDR
+2mME4w+XBVZYVi3blrG99DqAIxEhN5JPJ1zqas/6JsaoMYvrS4cq5iwe5vubG6oP
+8wR2J8bfRSuLNHlBkhlctzzDsq6TG8gPajsP29nkIp7m6HKTKlsDyf+w/GdnxF+2
+pbOz3/jh/ET0+OB+eL+FO/f3EUF5WH/8pP3SkQRhWqrDeBxEXyFIB0kN6E4RKKBG
+Rhf/5KkCAwEAAaNvMG0wHQYDVR0OBBYEFImydoN/TfZT6En7jgsKNZTGro57MEwG
+A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
+LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAY
+874Wa9Z1g3WnpAOWinjjddVhnJ7B0GLMCasK7ctE74ax4kUcJKWxFjkIcF+6Pqwd
+KwVjBpDVsKGTEG5kb2cVZ1UKcoLo9PWMPuu0vHD4J4nWxciYWaZAgZgmEChRSllg
+afhj274z9wVMQMalKZr6aMw+nqxOxuDMVZFI3eJsDbpnZX7zl8RWwDhd6p+cSG+L
+nqC6xm+7gvxNFRxFh+Rb9I5h4JTSw65XLPfW+Tr3tVwJfWGrwDCLTx5QAC3yPDsZ
+LMTMMpgfHF1hgt28TdVQwk+pE0VqHUjouPIEUhFjaPpMWPiEpTjdyQFv4PDsE6lR
+d3hB7quCN72lcAz/8iZU
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <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://shib-idp-2.oru.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-2.oru.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">oru.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUNiSfKA1z7kqPZnZ6BvFj5alpNDgwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
+OTU3WhcNMzYwOTAxMTI0OTU3WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4xgsKQJZUjQQ/2
+w6IMXPyTzSsMlzAyLlb8U5NvskAV9Cy5MlfCn9az4XqR2rm/4FHblwETi2PuMpW1
+qy1DSDA3dL8zWunDuz8J+FhGvSd7xmTnQaOYp5Klqpm2hKUTNUPGPNyCBIOB8iB2
+iKVnTRmThzvr3yOTA0zFrwZZ177DQhkhbP2g/iqBscxYMes7CSNXeFTaI1dksIpi
+3uy2GcNCxDI6khYGC9YT0rcU9eLFQ+gP6hdVZcrPcjPC4J/u6D1YcwC2G7RCNCBp
+up9V0pcCRrcBoo/LJIghfGBat0hKTFUtxK/6GBX1gcrVqTvjBeQXJPqWpzL4qtkT
+/QuYhoMCAwEAAaNvMG0wHQYDVR0OBBYEFBEX0552+o8uctBk5u7x49By+jU8MEwG
+A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
+LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBT
+5WCk9TSGTsQNVvuz7zgqBsTasmc7cI6EjqWyhilonfT2orbnZG5+4zOyJnfYF8W3
+OO84YZSY+XozxZfz1sEaGQheiExJVpMfF7fNKr53jNTw8jcOcgSo4ThOfXSf37q9
+jmfLTiubpqiBpKxWhVvyhZEeDyROCli+3JKfomBO6jVBFs5xeYmuj/LCgavAvdBN
+iZ0aXelhNSJeuPksLkSy2zAWHB9Y+lUYCVZ+0ACFGbtruHUW3L5WSchE5d+KXDZ8
+25H2L/qtUpsi4735GVsBKieHohtT61Un0XKeSwEhWSX+ej5DbgzXH6F7XbMS6+RD
+WVSpbBf+Iky5/3hSJbjO
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPDCCAiSgAwIBAgIVAM531TMg36on8Ql5UK2TziTQr9qRMA0GCSqGSIb3DQEB
+CwUAMB8xHTAbBgNVBAMMFHNoaWItaWRwLXRlc3Qub3J1LnNlMB4XDTE2MDkwMTEy
+NDk1NloXDTM2MDkwMTEyNDk1NlowHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5v
+cnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmyj1MWgE8NgPY
+tb3XsakHcEOrk6o79EDWTx6DtdTJfz9L2Nl7Z6K/oUZ0R3v1kT8zncS3uz5AlcM0
+vepZ9d4dLWXwKrmOcMTZlRoyQd8RlaC1X3kMinkpivkXduignD/pQter2pCLdoFT
+j0oKbmSHR130zm/uaigcPYjyqwPD/yuwE5mZ+sX1j0NrRU9pvMDZmrgU1XeNwLLD
+wBoCi8qedjGupkJCpvU4X/3+CvVYtzuEImBQmhDnvNpPk1UX6h8wFwNzWr9mkmIl
+qJ9HhakzkbDblsOOgSu+GkGEVaDTFLkoOKxVD8ohqfpYMmNWpCnHvICfbx+qyubx
+Y9qMQUTlAgMBAAGjbzBtMB0GA1UdDgQWBBS6hqhPe57NQMnrUyoK29RDzi4kQDBM
+BgNVHREERTBDghRzaGliLWlkcC10ZXN0Lm9ydS5zZYYraHR0cHM6Ly9zaGliLWlk
+cC10ZXN0Lm9ydS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
+Px98VAMrQj/axaEDyVWI+KmXV5JvM5CzJZV2Tt1QZAKG2D1qK/B8Kpri6tFLCK8S
+7cWdzU63gGaP5wONW1rD7uG2bCYlKkiEnJDafapKlS0/qJF2FNA1/6rEDOibwdT6
+yib8RrjklowyQ0pwAMm+YJ89n/MqB5SOL8jPjJEib83FZruRgTg2npKPkc7eWy6l
+XRk4jFV8NbemfAY/9o/JbecRM70stqFI0ihYPg8N7MPyB5Tr5w5OLaqRsEB+qyIy
+AqkS4O7+sMfqyRZz4qH/8s3MKspUmr7LncvBKSWOINun9P2gTJuqqOrJKg7wDHgL
+BAZNocu/Hh/kGS7R/8vneg==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUOIOR9/vOXSKitXIAEB1uhk5hRFcwDQYJKoZIhvcNAQEL
+BQAwHzEdMBsGA1UEAwwUc2hpYi1pZHAtdGVzdC5vcnUuc2UwHhcNMTYwOTAxMTI0
+OTU2WhcNMzYwOTAxMTI0OTU2WjAfMR0wGwYDVQQDDBRzaGliLWlkcC10ZXN0Lm9y
+dS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVY4Vj+DCdA1Igb
+yz2UPXyniLHv61Q05LvG/1ECyuu79/Qr0B/f8IyKM+S+PiXXm7QlQAmfXWdLRd5e
+LuVUGNjXvBuDava+2yruoHY3Ay5DtmZQ0wpmK8NPRCO647G4dC+viY4lcWZtqIDR
+2mME4w+XBVZYVi3blrG99DqAIxEhN5JPJ1zqas/6JsaoMYvrS4cq5iwe5vubG6oP
+8wR2J8bfRSuLNHlBkhlctzzDsq6TG8gPajsP29nkIp7m6HKTKlsDyf+w/GdnxF+2
+pbOz3/jh/ET0+OB+eL+FO/f3EUF5WH/8pP3SkQRhWqrDeBxEXyFIB0kN6E4RKKBG
+Rhf/5KkCAwEAAaNvMG0wHQYDVR0OBBYEFImydoN/TfZT6En7jgsKNZTGro57MEwG
+A1UdEQRFMEOCFHNoaWItaWRwLXRlc3Qub3J1LnNlhitodHRwczovL3NoaWItaWRw
+LXRlc3Qub3J1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAY
+874Wa9Z1g3WnpAOWinjjddVhnJ7B0GLMCasK7ctE74ax4kUcJKWxFjkIcF+6Pqwd
+KwVjBpDVsKGTEG5kb2cVZ1UKcoLo9PWMPuu0vHD4J4nWxciYWaZAgZgmEChRSllg
+afhj274z9wVMQMalKZr6aMw+nqxOxuDMVZFI3eJsDbpnZX7zl8RWwDhd6p+cSG+L
+nqC6xm+7gvxNFRxFh+Rb9I5h4JTSw65XLPfW+Tr3tVwJfWGrwDCLTx5QAC3yPDsZ
+LMTMMpgfHF1hgt28TdVQwk+pE0VqHUjouPIEUhFjaPpMWPiEpTjdyQFv4PDsE6lR
+d3hB7quCN72lcAz/8iZU
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+  </AttributeAuthorityDescriptor>
+  <ContactPerson contactType="technical">
+    <Company>Örebro universitet</Company>
+    <SurName>IT-support</SurName>
+    <EmailAddress>itsupport@oru.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-2.0/ubas-test.srv.lu.se-shibboleth.xml b/swamid-2.0/ubas-test.srv.lu.se-shibboleth.xml
deleted file mode 100644
index 9f359853..00000000
--- a/swamid-2.0/ubas-test.srv.lu.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" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ubas-test.srv.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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">uBAS test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">uBAS test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">uBAS och luBAS testmiljö / utbildningsplaner och kusrplaner</mdui:Description>
-        <mdui:Description xml:lang="en">uBAS and luBAS testing</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDvjCCAqagAwIBAgIJAOfZjMApPqeXMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNV
-BAYTAlNFMQ8wDQYDVQQIEwZTd2VkZW4xDTALBgNVBAcTBEx1bmQxEjAQBgNVBAoT
-CUxEQyBkcmlmdDERMA8GA1UECxMIVEVTVC1zc2wxHDAaBgNVBAMTE3ViYXMtdGVz
-dC5zcnYubHUuc2UwHhcNMTUxMDE0MDkwMDAxWhcNMjAxMDEzMDkwMDAxWjByMQsw
-CQYDVQQGEwJTRTEPMA0GA1UECBMGU3dlZGVuMQ0wCwYDVQQHEwRMdW5kMRIwEAYD
-VQQKEwlMREMgZHJpZnQxETAPBgNVBAsTCFRFU1Qtc3NsMRwwGgYDVQQDExN1YmFz
-LXRlc3Quc3J2Lmx1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-ma6sd5S7fy4QMP1oV3BB8QO92cd/JAIbvgduiOf6JIbwXoamIlpKX8VK0HhXm1Cr
-TrbUBk1cStapjj+bb6DMEmN/YoPcwXDiS7O4Rngm9O2gD4FwFjSxZwOjSfme0FPz
-b9e9XdUd0wcAYn5jOvESB+OdtSDpzGmoOiaobm+5dvnje31bod1GDyxgoWDx201u
-QyVM+10tnRiex5Hrk7WWYnhMEv02PLIx+6cO2ms9a/qqzNfUYt699q5IkfU2yQKI
-XU554jrS3Md0HDGich8TBphtLMzQ8Ot3SVkJza48u9L3Fpk6ANk8lkKM5E7ywaD2
-IS6RKHxEdOaYi+WvyMWMsQIDAQABo1cwVTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DA7BgNVHREENDAyghN1YmFzLXRlc3Quc3J2Lmx1LnNlght0MDIyMS11YmFzLWx1
-LXRzdC5zcnYubHUuc2UwDQYJKoZIhvcNAQELBQADggEBAHM/29XBSwCIyROueQ1y
-Fmit577cWeazp1+NBL3NRHtesFJdMftMCGncQxGmLrLtM7BTXOo3VIESzKYMl1Xm
-95IX1G1n38VkoVqJvTeVaSC6ICdphoRzoS3RIdZVFZ5h7VYz7zhqwmS5b8sXGvhH
-iJQJq7XXtua5AkQnhyg4S2Tvl+OGXXM02d3DYLAfnn9Hqwh2OYK++J1FJUsnRFy9
-Mq8mcNGZ3w2+BrFczNJ+C23CGJ2dxQS77hAPIB8fOTPKt8zFbsFRk4TeDwFUlQ1m
-ES+MzAaLWpKSnGkIsyHbz5P8oek6Suc5ewoxo/7lMBXDpwS1YSEets0i0s6OHM5C
-5iU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ubas-test.srv.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ubas-test.srv.lu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ubas-test.srv.lu.se/Shibboleth.sso/SAML/POST" index="4"/>
-  </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>