SWAMID-272, bya ut humio.sunet.se mot laas.sunet.se

2 files changed, 64 insertions, 48 deletions

diff --git a/swamid-2.0/humio.sunet.se-shibboleth.xml b/swamid-2.0/laas.sunet.se-shibboleth.xml
index 285e9548..eb3ce409 100644
--- a/swamid-2.0/humio.sunet.se-shibboleth.xml
+++ b/swamid-2.0/laas.sunet.se-shibboleth.xml
@@ -1,13 +1,7 @@
 <?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://humio.sunet.se/shibboleth">
+<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://laas.sunet.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/nren-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-09-27T13:30:09Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-06-07T16:31:04Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -26,11 +20,16 @@
     <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://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://humio.sunet.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://humio.sunet.se/Shibboleth.sso/Login" 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://laas.sunet.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://laas.sunet.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Loggpanelen</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Logpanel</mdui:DisplayName>
@@ -40,31 +39,31 @@
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>humio.sunet.se</ds:KeyName>
+        <ds:KeyName>laas.sunet.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=humio.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/DCCAmSgAwIBAgIUN8ELQOrbmcCtobECWDpJBsWmYjUwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAxMOaHVtaW8uc3VuZXQuc2UwHhcNMTkwOTI2MDc1MTIwWhcN
-MjkwOTIzMDc1MTIwWjAZMRcwFQYDVQQDEw5odW1pby5zdW5ldC5zZTCCAaIwDQYJ
-KoZIhvcNAQEBBQADggGPADCCAYoCggGBAMk5nAPzJHKBk0zcRuuHDNIb8YVV49Ax
-eBJnOks8BOosbbmYJP6NbOkW0GSjNlQC+0rZTQwKGoKcP1qkz+MP3pYBsW8oB3CE
-hpcpYX82KL9nTlrnSCFLWqAAcnvPFP1bbZsXeH5j+wABG1xT0FUgaJoHT+BWEkEQ
-oZAoq0cNOgwEXeklEV8yi5gN560uGgh1oh0TvE61nOXsdQi36IyF929oEqTpulD/
-JcuxkpA5V0slOnzxeBLLaLr4+xGR9FgPTXZGnVCurdeB3JntfDbdqPCnc1Rt2chZ
-bF7jfFJDTYznyQy6uyeD0avLSc976dcnTEShVMAsh/EK4SADTjC+JiCSfwev561G
-3bnbpDGv2gKX9kkIvPJIIUI99vn4R6WDEQlc7PQ/3yyYQB3hv2X1MECtqhfyor7y
-N9U9Ua5DzHW8sbrF/1GTAymYl2TiMiE6NBVgTcqpu4tRGI4mFa7LwJ7loZHueA55
-5Xbl9oTBn7TNOG1Rb1Qy0ukedajaBr2qXwIDAQABozwwOjAZBgNVHREEEjAQgg5o
-dW1pby5zdW5ldC5zZTAdBgNVHQ4EFgQUClQfzrt6MFNpR+F6Yk6Zd+32B3gwDQYJ
-KoZIhvcNAQELBQADggGBAGqzcszOPC6LxRVHhPzMkirSXow+la2YWB95OlhaHi73
-G6klhgOdSf6TL2uVr2vru/T153dOJ6I980TTArAxE5+J+aMXkPjrSYrjxw9kPKwB
-hYMphm14o2CPctXx2Vl1xRBbeTuwRJ735lQNO2pwM1vn2pl0D5Wlwd2i5bYn3fUe
-m5DxTxP3UrxYCMs9nKC+xNESmlW2zxQzHRPPxGTKQYyzh6Fw4Ux+GcWJq+EqbK7m
-l8aaWfYQMUSJ4rboMsv0K2sTGFha5yflQmOFUkZCsaA4SALbbcTQ85ZRvQ7B/2g2
-5aWu7DHjh77Oys5tTFsVr6K0uHHedQAMi89/GqZMbOXR7QnfOGfEQF7b44C6ekA8
-wsMSm1AHlIj4S1Apd9rGU2ytqzKsEl7+HelnLjYFp6ZzvQxNp2jKWtnAB3O4Ou/V
-P9dcZIRik3USrl25UOuQc+wHFnlkojw241+rwsOwlA7zUhP6sF/gmvXU0BctPgJl
-MJcrninQKsm/XcSCCWQWEg==
+          <ds:X509SubjectName>CN=laas.sunet.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIID+TCCAmGgAwIBAgIUKTwjRJB/6criLUel3P73jv/f3SwwDQYJKoZIhvcNAQEL
+BQAwGDEWMBQGA1UEAxMNbGFhcy5zdW5ldC5zZTAeFw0yMTA2MDcxMjI0NThaFw0z
+MTA2MDUxMjI0NThaMBgxFjAUBgNVBAMTDWxhYXMuc3VuZXQuc2UwggGiMA0GCSqG
+SIb3DQEBAQUAA4IBjwAwggGKAoIBgQC2s+5VE+IXiwG5DQKtbB33jCsQMokKY7EL
+5ZXxg7b6vdgHU9KqidRQYQMKQIAod/I+Q+vvFzH2VzPXMutTPxAYHxNz9pjuX0J7
+9X6vFYN8hq1rz+ee7V0czmXMBWOx+o0seI40Y+XlvDA91871HMI8rJH3RSto4BSf
+clJlDu14SacEsgGoBf3zwDn9+3AIiNGOgDZKpfknYvHPMea5+aTrSXKf0xUW0A8u
+fyaYofY0uDOfN4EVpCZ5xN+lbDpByqU9O+y0sDbFMm/TW+tUwCQPydimWZxMJh+7
+X425wGhIugX19R5jpnGC/SMqmBgQ35M9RczetanOHUuBSzWmdNvGJhg05hVqjD47
+dZsdx9/AYPmCrIu+UJxEpCrOvABlk0x0pgWsipv9j1EZkzy0a2H24x2w3tZXHf8N
+D1sWRtsMq40/F4GV1ANv6VeqGMrbcKZcU3y5vWzfsLEEzMj60HEA6GhATuZOUzJX
+B1c8KhYctJpd6kXNajSbIHSXxZb7NHUCAwEAAaM7MDkwGAYDVR0RBBEwD4INbGFh
+cy5zdW5ldC5zZTAdBgNVHQ4EFgQUYwXJ0uq8f7k6Wmg5kn4r59ZRTt8wDQYJKoZI
+hvcNAQELBQADggGBAFCCUqFHVv9KQJ6HQh+ZpmhtCMzshKuzxEFf/mbTWLk+4bdL
+uKLe3D+9GujeF6FP7Ui6s3XKpv2hEkGX+QJ2aQjbICdMQ/YC7gMgg6oM50T9S2Xu
+2+ewSpJhof1WBsO29sR4DhaPTJQA7Hu+uNtTBw2z+aGLfi639fVyRi2jggIsY1AB
+VhjrQdZon1jF+kA6NBKGhlFBAtQaw6cZXhyEiifaPhIFjvSkVa+4eP18aenfl020
+RIokHI+e+6YXBhcocl4DZfwx9+Zgpc3CVDE0Dxn7A8ij2AVOs551FRQznSOyviRx
+uh+CNnv2P6nfJPgy8IQeTN1R7HSKY+pgeWAHuXpImCJsyeRbpCkcj/A0nL93sCX3
+uZYIPPF08iBxyYptb/9C77ZFcyQgYoAZ63e9vreQDmP8G1lZhZr9H2XNjEc2/YdU
+gPeecWQpVht+75AVPqMjQp6O8+dQZToYfsGNa8DnY4MnF/nzMNcvPrkh93Sf5dVu
+VMAySq63XRXjV17tXg==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -78,16 +77,16 @@ MJcrninQKsm/XcSCCWQWEg==
       <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://humio.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://humio.sunet.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://humio.sunet.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humio.sunet.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://humio.sunet.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humio.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://humio.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://humio.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://humio.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://humio.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laas.sunet.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laas.sunet.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laas.sunet.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laas.sunet.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laas.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://laas.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://laas.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://laas.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
@@ -95,8 +94,25 @@ MJcrninQKsm/XcSCCWQWEg==
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fredrik</md:GivenName>
-    <md:SurName>Pettai</md:SurName>
-    <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
+    <md:Company>SUNET</md:Company>
+    <md:GivenName>Network</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>SUNET</md:Company>
+    <md:GivenName>Network</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>SUNET</md:Company>
+    <md:GivenName>Network</md:GivenName>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:noc@sunet.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>Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 6d822052..fd56be59 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -531,7 +531,6 @@
   <xi:include href="swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml"/>
   <xi:include href="swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/sig.idsec.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/humio.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/halon-eu.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/test.fidus.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-gui-sp.xml"/>
@@ -692,4 +691,5 @@
   <xi:include href="swamid-2.0/www.ladoktest00.utv.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.ladoktest00.utv.ladok.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/rehab.test.uu.se-ticketserver-.xml"/>
+  <xi:include href="swamid-2.0/laas.sunet.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>