From 76d73dbd07826893dfe64779da8227450f55ea25 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Wed, 2 Aug 2023 08:58:13 +0200
Subject: SWAMID-3081 Added herkules.slu.se and updated idpproxy.dev.eduid.se

---
 metadata/swamid-2.0/herkules.slu.se-shibboleth.xml | 93 ++++++++++++++++++++++
 metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml   | 15 +++-
 metadata/swamid-sp-2.0.mxml                        |  1 +
 3 files changed, 106 insertions(+), 3 deletions(-)
 create mode 100644 metadata/swamid-2.0/herkules.slu.se-shibboleth.xml

diff --git a/metadata/swamid-2.0/herkules.slu.se-shibboleth.xml b/metadata/swamid-2.0/herkules.slu.se-shibboleth.xml
new file mode 100644
index 00000000..1a5aaf64
--- /dev/null
+++ b/metadata/swamid-2.0/herkules.slu.se-shibboleth.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://herkules.slu.se/shibboleth">
+  <md:Extensions>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-08-01T17:18:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </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>
+        <mdui:Description xml:lang="en">SLU service for distribution of geographical data</mdui:Description>
+        <mdui:Description xml:lang="sv">SLU:s tjänst för distribution av geografiska data</mdui:Description>
+        <mdui:DisplayName xml:lang="en">SLU GET service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">SLU GET service</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">https://hades.slu.se/info_get.pdf</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://hades.slu.se/info_get.pdf</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://hades.slu.se/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://hades.slu.se/privacy-policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE/zCCAuegAwIBAgIUbPsJBsFpt4E8qQrJzU2MSNRV9XwwDQYJKoZIhvcNAQEL
+BQAwGjEYMBYGA1UEAxMPaGVya3VsZXMuc2x1LnNlMB4XDTIzMDgwMTE2MDAzN1oX
+DTMzMDcyOTE2MDAzN1owGjEYMBYGA1UEAxMPaGVya3VsZXMuc2x1LnNlMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA24+4hpVxq2smd/NS4DnDi72okKWr
+Mud8y8g+BPDmi5v4InH2VaQw+y+WXtwPxs4v96YVj+auxB1VlZrsU0TFRo6aSDpn
+FhA/rG/8BCRMM0agORxEutv6cBMU+mDrkbh2nqb72OCphpdv5ZolKEU2+8YTQcQE
+z+4ggqVoIjUFG+E8Vcy+hICPoCV7qjVut8FCShC8qHppug6ysPOqYxMtJkCuztis
+bgldv0uormk5Xiv0nmtRhTK4Rh30J8Mq9Mck+rcBhkjAVKq5KGRhmGr5hwVZkNWD
+7KhgMShx0i2OdQ/LTpIfU1ahMkjtbJPHRnR2y135n4bCTUD7JsLIgKC4UgmHjZWu
+WM0QT3z6YOBReeVekTr4/2FrOLcINw/Bzp/LONq0r54ZLCSu8sqsZzKZPjbfmiGn
+y0jP5Tm9uxpov6ocESUVWMiVJchOTHGTUBcUd07ewRSHNbZPLDn2KRDW6ID0LDnY
+mMi0ArNzYfl1KkQI53RTu9sZBpThGaSyyj6zT3kxDfpbdAzosCz2i+8egtO0JBFp
+x9yNYiU0fBLov9SCTz8T4d7+tO0uJ8iyV2gJzs8JNt/6uYz4NSFUMmI3qAlzV38m
+YSbAfVeWuMjquI24E5fU/e3o3yV2icPEHGbbUupOAe1wVZJrsq1YtJy+OHYNWuuj
+1aCYKEbaF8+DcE8CAwEAAaM9MDswGgYDVR0RBBMwEYIPaGVya3VsZXMuc2x1LnNl
+MB0GA1UdDgQWBBSev3DL2S4467pVpDK/WR5Lamqn3zANBgkqhkiG9w0BAQsFAAOC
+AgEA1xIPdy4JDlfunhlc4XYIq8MSnQ7pdzXO4uLM/VrxKvEePflzPCoFF6UC7U3j
+ir2lDFMuHuBcpF5xcF40TcEWHj58eNHKgR2gBbUDV5BH4KfZ40AOc7/6/UXak+mO
+9+4OtEdr/VclDRY+j9gmOxz4wyn+YtSH1SUu1KmC7UlYsHqdqbPuu+pjAQ65KTBb
+CICr/EFlZjtQEXMOqWa5v1MP9N6ypQoDjyEcdkQd70jXj/Vizo7BA/9fvJOPtKg0
+vcnHQqzvpm4irH3PAVGyViUxZsk+VYElzKeXmMmzYVs5c3mAa4p1abnc2V6Tf0hi
+ahkZCdQX8MaN9hZlicr0ofK0e1os488+ZQ+LydvsJXyn02dVeGY6L789QbKvPxg0
+gNxekzJSaz18AfagtrnDG4eUG10dJe5c74Fh3lGPobw1XaDD5g/5LOK44K6fz4c4
+XLv9SiCbqnji6Bu5ux4Dxj4j94tdvnEbld0y/Q04lo8ozo8u9xRChLhjA0Qqk3Zg
+GBewwbpeeMdb5WLrtZLpuUwJVV1qV3QjNX4gDRNWCFCDpqKpMFcQRLEFZLq+pjKA
+EFn5PhQc4ta//8OzkF9OZOy7JL1yboDjtSn56XTpvt6XkGU9ylKlfZItN8rK4axq
+Nv7cgv+Efz6tNDa8/EmklTvotWjdO2lEXrw8B3HDRbVErMk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://herkules.slu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://herkules.slu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://herkules.slu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://herkules.slu.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SLU GET service</md:ServiceName>
+      <md:ServiceName xml:lang="sv">SLU GET service</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: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:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.slu.se/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:jakob.lagerstedt@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:EmailAddress>mailto:jakob.lagerstedt@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:gis-support@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Jakob</md:GivenName>
+    <md:EmailAddress>mailto:jakob.lagerstedt@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml b/metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
index 0f488ea3..a3fe3cb7 100644
--- a/metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
+++ b/metadata/swamid-2.0/idpproxy.dev.eduid.se-sp.xml
@@ -6,7 +6,8 @@
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <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:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -14,14 +15,18 @@
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idpproxy.dev.eduid.se/Saml2SP/disco" index="1"/>
       <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Digitala nationella prov</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Digitala nationella prov</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Digitala nationella prov</mdui:Description>
+        <mdui:Description xml:lang="en">Digitala nationella prov</mdui:Description>
         <mdui:DisplayName xml:lang="sv">Testtjänst för Digitala Nationella Prov</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Testtjänst för Digitala Nationella Prov</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Testtjänst för Digitala Nationella Prov</mdui:Description>
         <mdui:Description xml:lang="en">Testtjänst för Digitala Nationella Prov</mdui:Description>
         <mdui:InformationURL xml:lang="sv">https://www.skolverket.se/om-oss/var-verksamhet/skolverkets-prioriterade-omraden/digitalisering/digitala-nationella-prov/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.skolverket.se/om-oss/var-verksamhet/skolverkets-prioriterade-omraden/digitalisering/digitala-nationella-prov/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="120" width="350">https://eduid.se/static/img/ds-eduID-logo-black350x120px.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="29" width="159">https://fidustest.skolverket.se/assets/skolverket-logotype.svg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="29" width="159">https://fidustest.skolverket.se/assets/skolverket-logotype.svg</mdui:Logo>
         <mdui:PrivacyStatementURL xml:lang="sv">https://eduid.se/faq.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://eduid.se/faq.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
@@ -95,6 +100,10 @@ rZkPdbEo7RWd1WEorEEtb9EOKsnhiuj5ZwQmFMt3NX76nWdFDwhNAi3X0r7M/CnE
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpproxy.dev.eduid.se/Saml2SP/acs/post" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Digitala nationella prov</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="en">Statens Skolverk</md:OrganizationName>
diff --git a/metadata/swamid-sp-2.0.mxml b/metadata/swamid-sp-2.0.mxml
index 4d4e77c6..2304bcd7 100644
--- a/metadata/swamid-sp-2.0.mxml
+++ b/metadata/swamid-sp-2.0.mxml
@@ -134,6 +134,7 @@
   <xi:include href="swamid-2.0/graylog.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/halon-eu.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hb.hr.evry.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/herkules.slu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hhs-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/his-se.zoom.us.xml"/>
   <xi:include href="swamid-2.0/his.hr.evry.se-shibboleth.xml"/>
-- 
cgit v1.2.3