diff options
| -rw-r--r-- | swamid-2.0/mdh-nav.cnaas.sunet.se.xml | 108 | ||||
| -rw-r--r-- | swamid-2.0/mdu-graylog.cnaas.sunet.se.xml (renamed from swamid-2.0/mdh-graylog.cnaas.sunet.se.xml) | 111 | ||||
| -rw-r--r-- | swamid-2.0/mdu-nav.cnaas.sunet.se.xml | 10 | ||||
| -rw-r--r-- | swamid-2.0/mdu-ni.cnaas.sunet.se.xml (renamed from swamid-2.0/mdh-ni.cnaas.sunet.se.xml) | 111 | ||||
| -rw-r--r-- | swamid-sp-2.0.mxml | 5 |
5 files changed, 135 insertions, 210 deletions
diff --git a/swamid-2.0/mdh-nav.cnaas.sunet.se.xml b/swamid-2.0/mdh-nav.cnaas.sunet.se.xml deleted file mode 100644 index dd668943..00000000 --- a/swamid-2.0/mdh-nav.cnaas.sunet.se.xml +++ /dev/null @@ -1,108 +0,0 @@ -<?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://mdh-nav.cnaas.sunet.se"> - <md:Extensions> - <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-26T17:17:26Z"> - <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"/> - <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> - <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> - <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/> - <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> - <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/> - <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/> - <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/> - <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/> - <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/> - <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/> - <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/> - <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/> - <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.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> - </samla:Attribute> - </mdattr:EntityAttributes> - </md:Extensions> - <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://mdh-nav.cnaas.sunet.se/Shibboleth.sso/DS/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://mdh-nav.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/> - <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">CnaaS MDH NAV</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">CnaaS MDH NAV</mdui:DisplayName> - <mdui:Description xml:lang="sv">Nätverksövervakningssystem för CnaaS på MDH.</mdui:Description> - <mdui:Description xml:lang="en">Network monitoring system for CnaaS at MDH.</mdui:Description> - <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NAV+when+using+federated+login</mdui:PrivacyStatementURL> - </mdui:UIInfo> - </md:Extensions> - <md:KeyDescriptor> - <ds:KeyInfo> - <ds:KeyName>https://mdh-nav.cnaas.sunet.se</ds:KeyName> - <ds:X509Data> - <ds:X509SubjectName>CN=https://mdh-nav.cnaas.sunet.se</ds:X509SubjectName> - <ds:X509Certificate>MIIELDCCApSgAwIBAgIUQQU/T34CH/36mXGHqOW7CXr26DAwDQYJKoZIhvcNAQEL -BQAwKTEnMCUGA1UEAxMeaHR0cHM6Ly9tZGgtbmF2LmNuYWFzLnN1bmV0LnNlMB4X -DTIxMTAyNjExMzAyNloXDTMxMTAyNDExMzAyNlowKTEnMCUGA1UEAxMeaHR0cHM6 -Ly9tZGgtbmF2LmNuYWFzLnN1bmV0LnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A -MIIBigKCAYEAk7J8wSYg5tTkf3nsqeKZUe6LBIhptwWGfeBNYvv6zNCIGNnUiRNW -Qr3viFSLaZ61XQu4nfjCqNhjwO7htbfwTGi4vBr8aXAKoG20ZQZN7Q3nY+lzC7wE -fQmYtsLxi96qZ4NQksQ9uP1ecfOctFg1igFJScvp5oS5bvYwWZnvzkBc/u8NtXfz -h1GNSe/JdKP7KqV9tJqsk5IRLNUeMTM07D9AyJAhLVV6sOdXwLGzcVZakPnnLPsH -XdLqpKlyLLdGwF/V9lE4YJmSWISfO9cMhe111yxk6q2rlFDiyf2UQgSI2ogfy1Tv -XDZ5wRJdI/ynHQ9X+G+idTPcScqo0uPTxSv6GYqsd/bvl2XYawCZHtr3rdbRdrQL -FU9CbeBjev73EPvKda9mZDwMc8Euw4P9Orcfq+YyY8S0Gj4hNEd7KgelkSNF+B6Q -bhPVJcOLWZU4nJJJTS2QvLQv7mf67hcDS2Sp9mKH2Fqnyinkjng15VeYExFiyBa6 -4Nm0zxKwkfIVAgMBAAGjTDBKMCkGA1UdEQQiMCCCHmh0dHBzOi8vbWRoLW5hdi5j -bmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUZ3B7+CSpHz4rhbB6LfDScch955AwDQYJ -KoZIhvcNAQELBQADggGBAGSengycAd/hqPfRqgl723BfjEyFuT/xDeeJUlIrY9dt -8nLIToHaG+vrS+gYXPxrLYCswuHMoD/dIYgWCrLDYU4tu5WWx3X6ocirm69IChs5 -Mhk7ZQsU2zKypYtXAu5+9hzdgXN02VHQrnbar7cbqGJFmRJDknvjjqgly2x4kUHg -ndvEze71iPYgRva7DUi4ir4858arLg+W10iFWqTK0PVjDwdJO7ulBAwOvIyPPtBn -V6vazYAEr5vZg2Av0k6em9tCZtUnxZfRYM8kf/Jz+JhqyziLVGbVLTaAN+IAGuyA -gTaVVNAKTMr22kJY1aH3JY8ZNdzRsEpH0AHRgJB/4WnML55IA8P93AR8mV4xpIGs -RNUGLThjjZyAm17KIfhlgZqnYALJNs9VO8vQgHL1c64dJXo6OJSO9vI5G9ftSf8+ -/amVTJRv78GSUHh1I1K7LWmPCl3WaCpdP5KcX+c/2o0KJwB0URgBGm/5YaM/ZBz7 -CaDiZFn/kx5eL2RkbUNCEg== -</ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/> - <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/> - <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/> - <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/> - <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/> - <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/> - <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/> - <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://mdh-nav.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-nav.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/> - <md:AttributeConsumingService index="1"> - <md:ServiceName xml:lang="sv">CnaaS MDH NAV</md:ServiceName> - <md:ServiceName xml:lang="en">CnaaS MDH NAV</md:ServiceName> - <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> - <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">Sunet</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL> - </md:Organization> - <md:ContactPerson contactType="technical"> - <md:SurName>Sunet NOC</md:SurName> - <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> - </md:ContactPerson> - <md:ContactPerson contactType="administrative"> - <md:SurName>Ernst Widerberg</md:SurName> - <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress> - </md:ContactPerson> -</md:EntityDescriptor> diff --git a/swamid-2.0/mdh-graylog.cnaas.sunet.se.xml b/swamid-2.0/mdu-graylog.cnaas.sunet.se.xml index 26365560..cbb8ab70 100644 --- a/swamid-2.0/mdh-graylog.cnaas.sunet.se.xml +++ b/swamid-2.0/mdu-graylog.cnaas.sunet.se.xml @@ -1,7 +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://mdh-graylog.cnaas.sunet.se"> +<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://mdu-graylog.cnaas.sunet.se"> <md:Extensions> - <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-10-15T08:12:42Z"> + <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-06-09T11:54:00Z"> <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"/> @@ -21,51 +21,59 @@ <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:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/DS/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://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/DS/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://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/DS/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://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">CnaaS MDH Graylog</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">CnaaS MDH Graylog</mdui:DisplayName> - <mdui:Description xml:lang="sv">Loggsystem för CnaaS på MDH.</mdui:Description> - <mdui:Description xml:lang="en">Logging system for CnaaS at MDH.</mdui:Description> + <mdui:DisplayName xml:lang="sv">CnaaS MDU Graylog</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">CnaaS MDU Graylog</mdui:DisplayName> + <mdui:Description xml:lang="sv">Loggsystem för CnaaS på MDU.</mdui:Description> + <mdui:Description xml:lang="en">Logging system for CnaaS at MDU.</mdui:Description> + <mdui:InformationURL xml:lang="sv">https://www.graylog.org</mdui:InformationURL> + <mdui:InformationURL xml:lang="en">https://www.graylog.org</mdui:InformationURL> + <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL> <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+Graylog+when+using+federated+login</mdui:PrivacyStatementURL> </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo> - <ds:KeyName>https://mdh-graylog.cnaas.sunet.se</ds:KeyName> + <ds:KeyName>https://mdu-graylog.cnaas.sunet.se</ds:KeyName> <ds:X509Data> - <ds:X509SubjectName>CN=https://mdh-graylog.cnaas.sunet.se</ds:X509SubjectName> - <ds:X509Certificate>MIIEODCCAqCgAwIBAgIUU7dSYEJ7oC4JL4aOFiRbq2ZoGhowDQYJKoZIhvcNAQEL -BQAwLTErMCkGA1UEAxMiaHR0cHM6Ly9tZGgtZ3JheWxvZy5jbmFhcy5zdW5ldC5z -ZTAeFw0yMTEwMTIxMTM2MDdaFw0zMTEwMTAxMTM2MDdaMC0xKzApBgNVBAMTImh0 -dHBzOi8vbWRoLWdyYXlsb2cuY25hYXMuc3VuZXQuc2UwggGiMA0GCSqGSIb3DQEB -AQUAA4IBjwAwggGKAoIBgQDFgLJanmtOtfibM3CtoSVmbkOXoEAi3+htzqeFwT6C -NWARYWyEcfKGA/xexnIwGSjY1hw0z6pixS12qglRgkJYwBEiYijwJemQCzRxaG0e -j5KDbXMhmPphZmI5r8EowTM2oxN/NV464geXzwF59Z8uy7IPsSvGIb6tOboifIIm -52KjZ/rnznVVGxdpZkzfYxAIknEUiMC4YbIT8VU+RIKoxLhsV0VLb30pv++gwdH1 -avQRYgWRwwC1FCU9d961GP2yYCQlfcKmrNoAaB53JF5eDvV6BajGc9qRlylGWUWK -wGA4mKMJkzo527k93OuyqwqleBfZvPGxJoGP6nr3ShERzUEvhq26hhPlu7woMdjB -q3cAjJjs0kYyU/0QJ5spGvW1xK0V1s9SZJWaYcltnvs7AwoNP0fCjBmuRbeCqmOu -xJv8pWDDFji8Cq8WF+j6sFsjootaS9uK5BDmv3Fgwbc6OMXVevwrochN5zdBnDhS -JBFgHUeO7sEw+0xV6REIdU0CAwEAAaNQME4wLQYDVR0RBCYwJIIiaHR0cHM6Ly9t -ZGgtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUzwp2FmE8DuPCkPnS -LvYKhnNgmr4wDQYJKoZIhvcNAQELBQADggGBADs9krwtFB9fvNAXYOI/X/kOgEpc -D/yq8EIkTAvkAFyuSPlIpZ2sPhr0tpxFL25Ey/K45J6vn8ZaRXbPp60J9ZhGZuRG -ugRIfqmbIi+jpPveaWUzZFYBx9/Wuxkxb2diVLcf7PFhaO7iv/CWI5WOzbSqWkjL -7sbhrSb2pqC8k2L1hxJlGActjMiJRcsUNdqORryqBqtLIDWoG9Tmrz3ZIM+Ho61U -4Iati7hO6CyuGziDiRmikawhjUOhBOUrOkhG7NODc9bUOkUs8tUda3+bkgEmYaQ7 -yqYeCGNY55Z4d+Agv6rGjdPCGebvihuRMdqSBH+7RKk1pbuUQ6PZ2LMAxeCaXIbk -Qv28rUmscVhpYIITf69ZzMK4UZcjebVNSYw/WBe09fzYNwgSkTRLD3vc42JoWzKi -vI0mlpstbP4YAuNQ3vOCP10srjNqoembJE3aWUBMErgDiF4njO1PxECtSFKwl7K4 -mMaPWLQZP56noe1+y1epQf4U39rBvkvOCLGXBg== + <ds:X509SubjectName>CN=https://mdu-graylog.cnaas.sunet.se</ds:X509SubjectName> + <ds:X509Certificate>MIIFLTCCAxWgAwIBAgIJAJYkSFXOWMEbMA0GCSqGSIb3DQEBCwUAMC0xKzApBgNV +BAMTImh0dHBzOi8vbWR1LWdyYXlsb2cuY25hYXMuc3VuZXQuc2UwHhcNMjIwNjA5 +MDY1NzQ5WhcNMzIwNjA2MDY1NzQ5WjAtMSswKQYDVQQDEyJodHRwczovL21kdS1n +cmF5bG9nLmNuYWFzLnN1bmV0LnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC +CgKCAgEAs/ZvAEI11ELxZG2QUBb7XVT5xg0d/Mgl+cpMHyUKiLdvHRNDljjeXqjG +ct/mskGOCb6AUv1YAi/hImSh8MFv1ufSDMr8QZ7CjUZbMYwp0QszGa0ni7xlKsjf +DROqoPvkI93rN+nHcF4sAeFkrAYOUtkeNKjt0n7kwh8ABjmogky8UfLKVUdAC3IU +mwHEKeIOjPiElQneQKPhBDXGAJulP+yp1qXFgmyw4ayTHUXMeYQg0TI3oPoN6zZT +oU4M2dU361AdWWXfqaic4pIMP6OEVPvl78LasXxFJEeUemcd5SduCwk1pAw87kdK +iOocj1doeerIvNpDGPLowE7CWIps8RYasWY8F7StevEf2QRWHMGeclRI9JgPfUXF +XJT6bYVStVAaZlXbJa9aAPh8u/6IJQi/O3XuhGohthVQKj2fva+BxgIeZuqfQ6Rl +dmFRytMAI7MN003PxbP+ItZJHxRcahRB4Dy/xRQ03uP5i3MkB0XmPieOHaWMeGqo +ssIDjjvwgp9uU3p9fNjjv9a/yOuK8AIpxFBOfI+dBZmOg1I7rgqbZoNSrZoI/eD/ +RipVdKBSmJUIItzfXKS2g0o93WPekxT7ReOxaXbyp3m/iUmJyELaRl5wmTF+2tS+ +gnqquHIK6d0yhHRQcppKtXUXC3Ays8nM6YhDMydCX9KaE6ZwgfkCAwEAAaNQME4w +LQYDVR0RBCYwJIIiaHR0cHM6Ly9tZHUtZ3JheWxvZy5jbmFhcy5zdW5ldC5zZTAd +BgNVHQ4EFgQUzmkf9U9zAwKOCWgZh7jZBFiL2pAwDQYJKoZIhvcNAQELBQADggIB +AD4wEedshcZoZOI4rzAZnjVrCUA0u4J7FzLeoX4qy00ZKhpSs0gALDIz2h+Wtgqq +XCrVRhVf8makiEOH2XA+5afWTnUIVOy/qX7j7DOzWuXIbDoVPS15ISuUiLBM+uSs +IEj7ulae/UxL3XAqwYAlheolGCqjk3iI5xB2ranYQQXHTse0SKNuS/KmeaKwPoue +REepN5vF642S6XOiHrBMlkW6yPOfczz6A5AKga9nlkSx1NbWnUe6qP838YazamyV +b8UORMRe70xps4unkz8ldrW8n0r/JvOdTExjpZyooXe86HVaXCU2dzDNlCcjeakm +KSeedCmdB8S/ui5gg6uvBsIHoSxXwkYOAHWmgikQ9aG+b1jWDQt0yfMeNh46DlTA +nUsUxh7vkx6V/R47GFXP7DBLaDehdAsTEHS8JaqPK5L4UtLU0Iuorv2u6uPQNIN0 +332Z8CL7fgrY/Bx18mUvl2SE4hguNmFlx3CUmey+hAeEZwqtpMjcjbpnz2uyaB2T +fkHao73eapUCgdl1I4I1dzPUM6sJeq6rY41oWXNoXWUhGK4LlAWcGvQC03REFpiz +N5kzg+5KTEtPP3JpaYr/g9xtVvhy2IZ9N/Y2Npm/4rfaNAUqqvsTre3e6ROt/f8B +b98mxFGVhpYnOxF/zslZ/4F0Vl+DE3BM04ppi8CZX58M </ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> @@ -79,30 +87,41 @@ mMaPWLQZP56noe1+y1epQf4U39rBvkvOCLGXBg== <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://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/> + <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-graylog.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/> <md:AttributeConsumingService index="1"> - <md:ServiceName xml:lang="sv">CnaaS MDH Graylog</md:ServiceName> - <md:ServiceName xml:lang="en">CnaaS MDH Graylog</md:ServiceName> + <md:ServiceName xml:lang="sv">CnaaS MDU Graylog</md:ServiceName> + <md:ServiceName xml:lang="en">CnaaS MDU Graylog</md:ServiceName> <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> <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">Sunet</md:OrganizationName> <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName> <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL> + <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL> + <md:OrganizationURL xml:lang="en">https://www.sunet.se/en</md:OrganizationURL> </md:Organization> <md:ContactPerson contactType="technical"> - <md:SurName>Sunet NOC</md:SurName> + <md:GivenName>Sunet NOC</md:GivenName> + <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson contactType="support"> + <md:GivenName>Sunet NOC</md:GivenName> + <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>Sunet NOC</md:GivenName> <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> </md:ContactPerson> <md:ContactPerson contactType="administrative"> - <md:SurName>Ernst Widerberg</md:SurName> - <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress> + <md:GivenName>Sunet NOC</md:GivenName> + <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-2.0/mdu-nav.cnaas.sunet.se.xml b/swamid-2.0/mdu-nav.cnaas.sunet.se.xml index 849c9d8f..541cb634 100644 --- a/swamid-2.0/mdu-nav.cnaas.sunet.se.xml +++ b/swamid-2.0/mdu-nav.cnaas.sunet.se.xml @@ -1,9 +1,6 @@ <?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://mdu-nav.cnaas.sunet.se"> <md:Extensions> - <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-03-03T08:15:35Z"> - <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"/> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> @@ -25,6 +22,9 @@ <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> + <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-03-03T08:15:35Z"> + <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"> <md:Extensions> @@ -116,7 +116,7 @@ V/ml76bFEofGNdbAHcbMsA== <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> </md:ContactPerson> <md:ContactPerson contactType="administrative"> - <md:GivenName>Ernst Widerberg</md:GivenName> - <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress> + <md:GivenName>Sunet NOC</md:GivenName> + <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-2.0/mdh-ni.cnaas.sunet.se.xml b/swamid-2.0/mdu-ni.cnaas.sunet.se.xml index 87d885fb..f7d15f91 100644 --- a/swamid-2.0/mdh-ni.cnaas.sunet.se.xml +++ b/swamid-2.0/mdu-ni.cnaas.sunet.se.xml @@ -1,7 +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://mdh-ni.cnaas.sunet.se"> +<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://mdu-ni.cnaas.sunet.se"> <md:Extensions> - <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-12-15T11:27:53Z"> + <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-06-09T11:54:00Z"> <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"/> @@ -28,45 +28,52 @@ </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.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://mdh-ni.cnaas.sunet.se/Shibboleth.sso/DS/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://mdh-ni.cnaas.sunet.se/Shibboleth.sso/DS/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://mdu-ni.cnaas.sunet.se/Shibboleth.sso/DS/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://mdu-ni.cnaas.sunet.se/Shibboleth.sso/DS/Login" index="1"/> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">CnaaS MDH NI</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">CnaaS MDH NI</mdui:DisplayName> - <mdui:Description xml:lang="sv">Inventariesystem för CnaaS på MDH.</mdui:Description> - <mdui:Description xml:lang="en">Inventory system for CnaaS at MDH.</mdui:Description> - <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/x/jYmvBg</mdui:PrivacyStatementURL> - <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/x/jYmvBg</mdui:PrivacyStatementURL> + <mdui:DisplayName xml:lang="sv">CnaaS MDU NI</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">CnaaS MDU NI</mdui:DisplayName> + <mdui:Description xml:lang="sv">Inventariesystem för CnaaS på MDU.</mdui:Description> + <mdui:Description xml:lang="en">Inventory system for CnaaS at MDU.</mdui:Description> + <mdui:InformationURL xml:lang="sv">https://portal.nordu.net/display/NI/NORDUnet+Network+Inventory</mdui:InformationURL> + <mdui:InformationURL xml:lang="en">https://portal.nordu.net/display/NI/NORDUnet+Network+Inventory</mdui:InformationURL> + <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NI+when+using+federated+login</mdui:PrivacyStatementURL> + <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/CNaaS/Transfer+of+personal+data+to+CnaaS+NI+when+using+federated+login</mdui:PrivacyStatementURL> </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor> <ds:KeyInfo> - <ds:KeyName>https://mdh-ni.cnaas.sunet.se</ds:KeyName> + <ds:KeyName>https://mdu-ni.cnaas.sunet.se</ds:KeyName> <ds:X509Data> - <ds:X509SubjectName>CN=https://mdh-ni.cnaas.sunet.se</ds:X509SubjectName> - <ds:X509Certificate>MIIEKTCCApGgAwIBAgIUR9eg+yPjcjfPMBsPAf86AcCOSIQwDQYJKoZIhvcNAQEL -BQAwKDEmMCQGA1UEAxMdaHR0cHM6Ly9tZGgtbmkuY25hYXMuc3VuZXQuc2UwHhcN -MjExMjE1MDg1OTU3WhcNMzExMjEzMDg1OTU3WjAoMSYwJAYDVQQDEx1odHRwczov -L21kaC1uaS5jbmFhcy5zdW5ldC5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCC -AYoCggGBAN6M3RSGAemhATawNGEGvy9Da7iC0BDuTdU3EwJvORD8Pg4hsL5Xjgdv -Kx2HUFI3w+Zp/TEu3ZmUnLP3D+4p7P/TBFtDl0cwm8rjbM0V8IkaUKORt01GHzHq -JVemtl4c0x1UyNLR6MWnmuyIPnrySdr1fDERqQ9eS/Wf3FLMf1FX4OqSLcn+7Cuh -dMjD9pxedxQCAsj7wd0Hfo9Ir2ZssCPGFWQ2GpkXxxm3kR1fgQczAVbO0C6f8x85 -Xhvdy8RNyNglj4+WMtNr7EE9n6KkMNZtKZ8yonsCWamPgkPW/9AYqBX8GkmZ2APA -Zw1cDbDG/UUgBAryVGhg4kQIXln11kRhGhjfVNqnEw4QkerEYKcjUtteExNP8Y7N -Is+GPG6FfNjD8KrJapRh203WV+bhFIlnmQnkr4hqfkK4K0fFIVREum0gpnm0hhuP -P+rGhfQvcbrocit4hKLBlptPSqJQNRF2VORuZ3dop+PAjzu7ax5kTwbyHjQPX8jD -C/qGJIoAeQIDAQABo0swSTAoBgNVHREEITAfgh1odHRwczovL21kaC1uaS5jbmFh -cy5zdW5ldC5zZTAdBgNVHQ4EFgQUrOfRBlRHz9K3Cvvd/oOFUuO3mogwDQYJKoZI -hvcNAQELBQADggGBAMXuWUUBlYKEZrN+aZWlMJn6zh3dIvM+BZnjHZnWJoI1DoK/ -qXaOpTN5F4GJB6kJI6rbUpiwwhUWrdjLLUI4WpRxvWrJhEbUyiZ7LvabufdWGJkl -tE95NJxZYg1gWp13UhS8RnWiWSUIGH03PhXE3/oNANinNjO2qO5HSjA/CcJKF/4g -kg63aWgFhyJxvPbiehWRuiq0X0EibSoQfSRQ68xCC9CLPjdGIv7RgVMvYQOjsYzj -F12mJG+KjZTkpT9/IMqOViYePAWs7vi0kUNb3I8eju9Ly3fH/WEalqKnpzKNBnfN -ZuQHxG8s6CZC8jAvTWe6nEMzZrzpGRCpiAcd/IylhK//ZviVHvRaOLscZeaRDfwM -+om99Jz2kAWA1ucXrkAzh3gNyrWno2cBAOpudyfEKBSHv1I0vD+oyNgxE7wzHTyg -xzRwO7/3p5y/WBL4SoNEEXl1lRfBePgHfTY37go3JOs4zclgtHBd6Y7KFhOeYXyH -9q5LfkAfbJRwMWqqmg== + <ds:X509SubjectName>CN=https://mdu-ni.cnaas.sunet.se</ds:X509SubjectName> + <ds:X509Certificate>MIIFHjCCAwagAwIBAgIJAMC+OMb4HCVHMA0GCSqGSIb3DQEBCwUAMCgxJjAkBgNV +BAMTHWh0dHBzOi8vbWR1LW5pLmNuYWFzLnN1bmV0LnNlMB4XDTIyMDYwOTA3MzMw +NFoXDTMyMDYwNjA3MzMwNFowKDEmMCQGA1UEAxMdaHR0cHM6Ly9tZHUtbmkuY25h +YXMuc3VuZXQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDaHskC +Xv0Ekifko1hQWP7hKlMLdOmm3i3NzxkL6ibgeHdgL2JwwJkrHCQ24qx1/YVtX6TI +aM2rtoapRr6M/rUU/VET5DfFdgw1d4KDpkrWus1QHgeAYQeLXwuTBCsQj7NKDvC/ +dd34LHYsJW+NV0Y5442t464p9Fa9DnuVkS8HeYoZWNLnFrdeGqkD1wuhbpEXTgOL +GWFJEqV4cnWRlU3wX98xdkZ8WTNGNesikZl5mamBPstgFZzFXmKRTVpKcDnoDcS9 +0jcS7J5PFnsr7HrHcgl6RiE3zwDWfvQJJ5ZVH81YnBvXpDVKv6xaaGm8n6uVcy6G +67HbQmHqeOg33tZe3JYNuDzGtRuew/wBIAUVwDr8ffP2GH91Gxf+2EQQppDTN6M6 +afTZ4FRvKbRir5HrJ3hNYQgTYCj5GO4G0KxcZuRUt0iQaXQtnaG2rUiv8qy+gcEA +YH1+J4LrqHuM58lr9gnkAJHxM5hjzrwAhkrXRj44WzjU32nu2xJM5bYZL2SSpJ27 +ol/g3+1mKcMpSsiRUXJ+UZxaLptYeE+Jz6MTY3OaZPB7HgtxH8N/ATaTqjzFQPEI +Qpktq3t37gLh6yMOW2sXcvL+PqmQlT2T3GlGwucxL1COQfePFsGS2EqR6Iw7KeWj +9vGq92ZgynqYKPwrZ2jYq8Sb1GC7CzvVlNTRTwIDAQABo0swSTAoBgNVHREEITAf +gh1odHRwczovL21kdS1uaS5jbmFhcy5zdW5ldC5zZTAdBgNVHQ4EFgQUYxV0t9Mu +4P51+qI1OCXVYTCT8RAwDQYJKoZIhvcNAQELBQADggIBAG3Qym8ea75y+JJNGJDe +rVRgbH/KCDH1zCZMs7gpOrb+BKeqcB8JA0PpbvWH8KawCsx1xUUDPcBcsFzFwbVn +gyfL3bsGsWRPVinMesHPj3tI9bV/DvXhenwou2khm4lpkK+ADpjNf7MlwGhDTgQV +5TSt6xVozhqC3ggmyO8q5kPj6C5ADwyj9y83rR7kufYEpvRoAXyUWePDK/tZbagF +RjxVu3jUT0XCt2w/YdQmo0szWRgSy9V2+c+nhoqh6FbNE6PCrI54kBrENed/rQl2 +QlSdtdf8g2HprW2ywGSnET4vptHC+JI2lGK2yC+wTFpx+jX9vN7eKTubqUvtHKKq +uL1HPkQJBl4SXdp9IiR6QqksPp/2j6buE1gY+Az6cKtqOJ17JqmNRDeIDkgX1cqz +ZYPWwWt9ZPZ7rg4s02h3YDz3RrD59JLNv1ropiYNOBXoJ5jPiQUFaqdzbw8fM0ec +R0PHo0RLntklxQK/PCJHPpGZGgsG9IzONFjmxRi3l2p0HyF8lr588x1CHm1IKyqx +Fh77o+XkfnkHaMYoJEaHVWrjj/86U66QfLrl0JN7IgCUt94eJCeMtVHoLPpG6Y7O +DM/Jeo63gmJun4EESV1lR9QXk/PQMVcGbLqa8k8rRKM22CO9Yz9HP4dNlnHcsBtn +qMhou5N3q7Sn6XIZhk8AlS2I </ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> @@ -80,15 +87,15 @@ xzRwO7/3p5y/WBL4SoNEEXl1lRfBePgHfTY37go3JOs4zclgtHBd6Y7KFhOeYXyH <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://mdh-ni.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdh-ni.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdh-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-ni.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdh-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdh-ni.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/> + <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SLO/SOAP"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Redirect"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SLO/POST"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SLO/Artifact"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdu-ni.cnaas.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/> <md:AttributeConsumingService index="1"> - <md:ServiceName xml:lang="sv">CnaaS MDH NI</md:ServiceName> - <md:ServiceName xml:lang="en">CnaaS MDH NI</md:ServiceName> + <md:ServiceName xml:lang="sv">CnaaS MDU NI</md:ServiceName> + <md:ServiceName xml:lang="en">CnaaS MDU NI</md:ServiceName> <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> <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> @@ -96,17 +103,25 @@ xzRwO7/3p5y/WBL4SoNEEXl1lRfBePgHfTY37go3JOs4zclgtHBd6Y7KFhOeYXyH <md:Organization> <md:OrganizationName xml:lang="sv">Sunet</md:OrganizationName> <md:OrganizationName xml:lang="en">Sunet</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName> <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL> - <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL> + <md:OrganizationURL xml:lang="en">https://www.sunet.se/en</md:OrganizationURL> </md:Organization> <md:ContactPerson contactType="technical"> - <md:SurName>Sunet NOC</md:SurName> + <md:GivenName>Sunet NOC</md:GivenName> + <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson contactType="support"> + <md:GivenName>Sunet NOC</md:GivenName> + <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>Sunet NOC</md:GivenName> <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> </md:ContactPerson> <md:ContactPerson contactType="administrative"> - <md:SurName>Ernst Widerberg</md:SurName> - <md:EmailAddress>mailto:ernst@sunet.se</md:EmailAddress> + <md:GivenName>Sunet NOC</md:GivenName> + <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 35179396..71bc7d7d 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -631,7 +631,6 @@ <xi:include href="swamid-2.0/ladok3-demo-00.its.umu.se-student-sp.xml"/> <xi:include href="swamid-2.0/drive.sunet.se-index.php-apps-user_saml-saml-metadata.xml"/> <xi:include href="swamid-2.0/su-graylog.cnaas.sunet.se.xml"/> - <xi:include href="swamid-2.0/mdh-graylog.cnaas.sunet.se.xml"/> <xi:include href="swamid-2.0/noec.release-check.swamid.se-shibboleth.xml"/> <xi:include href="swamid-2.0/rands.release-check.swamid.se-shibboleth.xml"/> <xi:include href="swamid-2.0/cocov1-1.release-check.swamid.se-shibboleth.xml"/> @@ -646,7 +645,6 @@ <xi:include href="swamid-2.0/test-isp.sae.kau.se-isptest.xml"/> <xi:include href="swamid-2.0/metadata.lab.swamid.se-shibboleth.xml"/> <xi:include href="swamid-2.0/su-nav.cnaas.sunet.se.xml"/> - <xi:include href="swamid-2.0/mdh-nav.cnaas.sunet.se.xml"/> <xi:include href="swamid-2.0/kth-nav.cnaas.sunet.se.xml"/> <xi:include href="swamid-2.0/demo.nyaanvandarstod.uhr.se-shibboleth.xml"/> <xi:include href="swamid-2.0/demo.bedomningshandboken.uhr.se-shibboleth.xml"/> @@ -658,7 +656,6 @@ <xi:include href="swamid-2.0/play.his.se.xml"/> <xi:include href="swamid-2.0/se-kau-shibboleth.moveon4.de-shibboleth.xml"/> <xi:include href="swamid-2.0/kth-ni.cnaas.sunet.se.xml"/> - <xi:include href="swamid-2.0/mdh-ni.cnaas.sunet.se.xml"/> <xi:include href="swamid-2.0/su-ni.cnaas.sunet.se.xml"/> <xi:include href="swamid-2.0/keystone.cloud.sunet.se-shibboleth.xml"/> <xi:include href="swamid-2.0/nya-tools.its.umu.se-444-proxy-sp-metadata.xml.xml"/> @@ -692,4 +689,6 @@ <xi:include href="swamid-2.0/account.mdu.se-shibboleth.xml"/> <xi:include href="swamid-2.0/edusign-test.test.hb.se-shibboleth.xml"/> <xi:include href="swamid-2.0/www7.kau.se-.xml"/> + <xi:include href="swamid-2.0/mdu-graylog.cnaas.sunet.se.xml"/> + <xi:include href="swamid-2.0/mdu-ni.cnaas.sunet.se.xml"/> </md:EntitiesDescriptor> |