1 files changed, 35 insertions, 23 deletions
diff --git a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
index f9a68027..42364d03 100644
--- a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?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://tentaadmin.uhr.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -21,33 +17,45 @@ and do *NOT* provide it in real time to your partners.
     <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://refeds.org/category/research-and-scholarship</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://tentaadmin.uhr.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://tentaadmin.uhr.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">TentaAdmin</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TentaAdmin</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Administration av tentamen och tentamensvakter.</mdui:Description>
+        <mdui:Description xml:lang="en">Administration av tentamen och tentamensvakter.</mdui:Description>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>uhrweb01.i.uhr.se</ds:KeyName>
+        <ds:KeyName>uhrweb00.i.uhr.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=uhrweb01.i.uhr.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAMcFfnC5ByAeMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXVocndlYjAxLmkudWhyLnNlMB4XDTE0MTExMTA2NTUzM1oXDTI0MTEwODA2
-NTUzM1owHDEaMBgGA1UEAxMRdWhyd2ViMDEuaS51aHIuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDxY/TjMz8pT7hfnMwoA1Lr+vHkyi+XeZDCwyxN
-bTguN/Fh4IomoiNShua8JSHo5za/Vn2Bftid+pC0x7CGMxW1LI21F0R/whRm76lS
-An8yvI/AYIcKN5yzP9EKaWsiRuaNpboW9pUu9s/P7OFazNFEvLpH2xEHCCFuxTWi
-pm6cHbl2KUgdG6WA9zHA7dkisEVUxFMdPxPc5LUadgObsuHYJJMirc1QGsRWrX5u
-83eDKjEnr/CkJLrELJGeuAdqPK9Pz3oqy+V908RHZlxlNjdhdi4KD5fP41GvJw+I
-jees/K0Y12VF0hp0Apjz5eDfFV5gHKLENUa1SKEGMe4mO6s3AgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXVocndlYjAxLmkudWhyLnNlMB0GA1UdDgQWBBQO0iVrm5vzZO2s
-5ztEcCYlJpz/aTANBgkqhkiG9w0BAQUFAAOCAQEASGy6PvD8BqzTBcAxMiewR4qQ
-yjjpNt8UNzcIldZV+DCdoP+wAJVlAWCw9fP8KHpnuH/qLp9SA2GYgaLxGxpF3uK8
-iZuxL4xwX68Ioo0rat78tGmnwEinK1e+UpRqHUKW9GjiFdyiQfi+yGlGKdwJNP92
-JliEDw+3FtXWWq7BzKyo6rZKPjbLHSjS+1/6C8yDFd9k7e+mQqpgUy587yddRK2H
-E0nPNhmRfzH1Ynsjd36kgeDb7ZRmAvGiD5Ja3JsoTJxiV5RQXNzMZG7dUw8+7rSi
-10PwJF/Gs0ANdfP/236EBo+mDTHasFoMD2TqAdZ3ugxhmJIElenC6gGNN+rofA==
+          <ds:X509SubjectName>CN=uhrweb00.i.uhr.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC+jCCAeKgAwIBAgIJAIttKuiDsU10MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXVocndlYjAwLmkudWhyLnNlMB4XDTE1MDExNTE0Mzk0NVoXDTI1MDExMjE0
+Mzk0NVowHDEaMBgGA1UEAxMRdWhyd2ViMDAuaS51aHIuc2UwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDF+vTxTJNexWcmMvX9p/xKo8k1yLnDiETWeKLv
+THs24Kw4eZVxm5fgwp/cFLWZ4JdYUSMJRgboHf+aocV9fkk8NVxR6bZi0BDQLsPw
+WUsCjSJ8qps49pIjbyojGYApOinsKjZ6R4cXypl5wJjDdUocQ44hRXfHwGp8YO3G
+N7oX50XZ7oVIwsrjg5MJ/D/S9l4LvNXmzUYmCoJblA0ys5TLza5Nbvk/lkYwzFeM
+jIbnjzhgQcEK7a6VNZuA77ox+/Spr4e09p51DYq84/UYgOoPBqilcH8yuFWoAlCj
+QPUxVXHUUUq0aRkGJzZrZVfJb8FN2KQrGj+aQDxsc6UR0irzAgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXVocndlYjAwLmkudWhyLnNlMB0GA1UdDgQWBBR49xYx+FYEohIO
+UJ1wGDgen6owfzANBgkqhkiG9w0BAQUFAAOCAQEAw6jVA4MNMufsdS02fTsBuwv1
+XDPaH7zLR0UkOzDAxWpbMoB4r+bXvxawL02mcLciKa1qMczJI35UxxCZi4XW/78d
+Qyqz6IqAF5pbHDzIGij/jDysIwsPNzULawhr4nb46FZ0jRtlGU+nqlKpC0eNLvru
+0ntNd0B9Dx3/75Uj9Fc6BLjoHbrXFBZDQxCBTFebq9k2h2aEpR0GCiS7b1+NZpng
+lCQay1yDOXbbbFWmU8Ggn8BWJ3/4AdfiYs0U4sjkpel77MhH8qtdnH03dXPOOorE
+gA74GRgPQ3FGnqF2PkasBH+5Vkxk2rTdAroEO3WXRBOsk6JgO3lB/QY8x/lOfg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -66,6 +74,10 @@ E0nPNhmRfzH1Ynsjd36kgeDb7ZRmAvGiD5Ja3JsoTJxiV5RQXNzMZG7dUw8+7rSi
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SLO/POST"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tentaadmin.uhr.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tentaadmin.uhr.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmin.uhr.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tentaadmin.uhr.se/Shibboleth.sso/NIM/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>