Resolves SWAMID-2723

2 files changed, 125 insertions, 0 deletions

diff --git a/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml b/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml
new file mode 100644
index 00000000..798da199
--- /dev/null
+++ b/swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://admin.akademiskahogtider.se/Shibboleth.sso">
+  <md:Extensions>
+    <disco:DiscoveryResponse xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/DS/Login" index="1"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://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>
+        <mdui:DisplayName xml:lang="sv">Hedersdoktorsdatabasen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Database of Honorary Doctors</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Hedersdoktorsdatabasen är en förteckning av hedersdoktorer vid svenska lärosäten. Förteckningen är sökbar och öppen för alla, men framförallt är det ett hjälpmedel för alla fakulteter som är i färd med att utse nya hedersdoktorer.</mdui:Description>
+        <mdui:Description xml:lang="en">The Database of Honorary Doctors is a register of honorary doctorates that has been issued by Swedish universities and university colleges. The register is open to the general public but is foremost a resource for faculties in the pursuit of appointing new honorary doctors.</mdui:Description>
+        <mdui:Logo height="190" width="190">https://admin.akademiskahogtider.se/favicon.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://admin.akademiskahogtider.se/info.html</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIECjCCAnKgAwIBAgIUWeiPI7JCkMYbpXYbrkqOelmK+UMwDQYJKoZIhvcNAQEL
+BQAwHTEbMBkGA1UEAxMSc2hpYmJvb3QuaXRzLnV1LnNlMCAXDTIwMDIyNTE0NTIz
+N1oYDzIxMjAwMjAxMTQ1MjM3WjAdMRswGQYDVQQDExJzaGliYm9vdC5pdHMudXUu
+c2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/sSbRHi78Fpcr7Uzs
+mIZuJN3ZjOAHDvYLIHaGkEbauiqTmZztE6d+ImPZiikcby31T1kfrrjEM+U8dUHZ
+hw6xE/djHpl8hRToVr3eEixmRhYtnaKTpqmdFDxJWxKCsb3KNF1tp1GjGfS03ULi
+OjcRDMYKXuQe4J457Sg+y/YkODZWj1X6WYzE6lZ5uthv1iTb1ZBUB1NIrEMgakfM
+IrjX5yUuIzN8u2puBsiOtrQDISkdH5+9I+ZlW8QtkuaqzaBMqwGhrtzD80+WBUOg
+h+kIemqcMjC7IjzjDEoNEhhDqA1T5y7Iy0apzsLIStIuyRH1UWpd6MouPvRuQU6+
+28EN80OI3h6wBTNmTNlqroUVcvAmKOuWiGTUS6xXCI72Pti2inLH+bSsE0G8iuGU
+5PcoMNll67lo2+EYPxAX6Wu19xKjM92YJvG6LfantY1KZoIElO2wNgUTljJ1Y6KF
+NyK4uMm/RS2yfW52qOJX3J1pEo/wLuRMiZA0QyUYfh2V2NcCAwEAAaNAMD4wHQYD
+VR0RBBYwFIISc2hpYmJvb3QuaXRzLnV1LnNlMB0GA1UdDgQWBBTHl0VfBcwCulzf
+sKX7c5vMWywjlzANBgkqhkiG9w0BAQsFAAOCAYEAHYyW6dh4ni9d+K1w29m+4wSL
+yO8ww7VeihlusX7TTFy52TdaDkr3NCUD0zIOwTCD7k5KHmIaj+xRGi+ltWOCd0Gj
+Bnzlu5BPPW7k1ClRTa7GaB4WcT3MxpFztEsDrjEbS1KNVTdxxbQStHbsxeaIB6KV
+S1EtU4WkI7ebbCx0vl8pforO3RQVvTF8peO1NOnzowZ4EaCwzQQ7wI1AE2TK0B44
+P29QOq9CeyWxUQvmsV9BlWl1aqHrbd3zW4xBLRRKI150rbT6ZAv6pWFct1CIWS/X
+NfqFQG2zpXjcaMLeGi9EOPpQqemNh1oNYRUO8eQMAoK0g8xRKVVGmw/8Bfn5SIvV
+WrlX700fNkBuAgq1nl+uNiHW6fEnRiM/o9TKiojMWCYeF0Ps8wenhT/SvCkhTzTW
+3AIhjLuc4tgSRztw334z3xnd7W3GJ5rtCgmH43NXrJlEA+0HYO0BnWnnLdcUtCQ0
+Z8zbzafI+yiyVUcrtN5wJ6FV4uekQ1VObAjavwUL
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIECjCCAnKgAwIBAgIUKLTJ04E0j7dUS7zlZr/3J0/LnLEwDQYJKoZIhvcNAQEL
+BQAwHTEbMBkGA1UEAxMSc2hpYmJvb3QuaXRzLnV1LnNlMCAXDTIwMDIyNTE0NTIz
+OFoYDzIxMjAwMjAxMTQ1MjM4WjAdMRswGQYDVQQDExJzaGliYm9vdC5pdHMudXUu
+c2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCwJMp5rFwY+v46doOs
+BHfMflYqjeFcZhsv2/ax+WLNfIAL+NGUkpFeWdgvB5iX2Ivzgw+/E9waBXtLW+Ft
+O4yKPuu3hic9peEqAuKneoY/4N/FOCQ6o1JGCI+5o4qBt09s5vEvcqJtvVnN/8tp
+wjryQm/BKfEF6V5CZJ0gFtSaleHm/IJynw5vmCJCIH+RZ+ERbML++Q5VmZWEtlR3
+XMXt1V5GMUemYtXUSn4P4ZeK+ffzCXxGVqT9DBnMb89tc2cHO15zzlcc1QklPuXU
+IJ/0reYO52blK+ycO6MamfkqQIuVdj14pjGT6K2pLT7GpUct4LiIgvJOj4PYyt1C
+wPOzUgWqLQnDSX6gc5lnh/Bm/F5YcVhQNDWpmL0NpSoOXHiyw2HcIbabuzQrR4Tb
+B+7DCgSKJjgL8zy/qAbU4Pv6b2pSYtOiPPe61Xom6J3oaDSbRvyJgz/1i35BtPYs
+9imD9h44c8oEbw2TfzgqjndyNKbewWgqjOOlNcP8UmeDK2MCAwEAAaNAMD4wHQYD
+VR0RBBYwFIISc2hpYmJvb3QuaXRzLnV1LnNlMB0GA1UdDgQWBBRXaYjnA+XSvoNn
+iiMG3MO7eBhO0zANBgkqhkiG9w0BAQsFAAOCAYEArIi8aRtQsOwjpOnEAZrSbTOL
+GWGnx/HvhXrfZLyCEnBhe4hjU4t4UbDRjLzw6nmbAod55TkkDC5JkWJBkOJYjy31
+kLnG01J939aZKtWlxVc1ew83IvnKRdynuHTEPrjOfCod7DT+m5KqH//OQIlPG2fK
+nYx4uOzB6U6hWhw86CRqP7vxO2ZTv8ub1VYo3KxmT5bADHb4mWHDuJxYyR8gI/0g
+yrIRrbiz6h1iNS4P0PL1CFVd9cTABgbY32+moAW6WLz9VMOIlgKAEVVIIbbALnS/
+GEHEtByC3nSdHHQXR8NiGSdymSYIPZVXgnSTstaRKnMnIr7xhTppO7yNonLpZDmM
+bH4FvT6CCRpEpcDNlbizYquiVIAYwXFGvFsKdsY2ntF6IX3sV5MeSFzOdsqef2Hv
+dmnjsWwQMCk0fiL6Hw9dUd0jCjA3pTYm0YG2Upzg/zV4AasjkFXIUNoXSHkIsnMZ
+28VFljf/57A1/AY9Ot2RrkZ+CkFKxUM5mSphv7hj
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://admin.akademiskahogtider.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="sv">Hedersdoktorsdatabasen</md:ServiceName>
+      <md:ServiceName xml:lang="en">Database of Honorary Doctors</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" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 77a0cb53..1f633444 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -618,4 +618,5 @@
   <xi:include href="swamid-2.0/test5.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nyas.demo.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/bdh.demo.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/admin.akademiskahogtider.se-shibboleth.sso.xml"/>
 </md:EntitiesDescriptor>