diff options
| -rw-r--r-- | swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml (renamed from swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml) | 37 | ||||
| -rw-r--r-- | swamid-sp-2.0.mxml | 2 |
2 files changed, 17 insertions, 22 deletions
diff --git a/swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml b/swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml index 58b05aa8..24d75d0c 100644 --- a/swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml +++ b/swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml @@ -1,9 +1,5 @@ <?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" 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://dnsrpz-lookup.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://ioc-lookup.sunet.se/shibboleth"> <md:Extensions> <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/"> <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy> @@ -26,18 +22,17 @@ and do *NOT* provide it in real time to your partners. <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/nren-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> + <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://dnsrpz-lookup.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://dnsrpz-lookup.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://ioc-lookup.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://ioc-lookup.sunet.se/Shibboleth.sso/Login" index="1"/> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">DNSRPZ Lookup</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">DNSRPZ Lookup</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">IOC Lookup</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">IOC Lookup</mdui:DisplayName> <mdui:Description xml:lang="sv">Kontrollera eller rapportera dåliga domäner till SUNET SOC</mdui:Description> <mdui:Description xml:lang="en">Check or report bad domains to SUNET SOC</mdui:Description> </mdui:UIInfo> @@ -82,16 +77,16 @@ EeUbmUOSeuWKXMTZJOVS1XLYfDqdjupWCgOOa4cGJzWCGIZECBaxPXQEiZbOEEtA <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://dnsrpz-lookup.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SLO/SOAP"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SLO/Redirect"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SLO/POST"/> - <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SLO/Artifact"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML/POST" index="5"/> - <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/> + <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/Artifact/SOAP" index="1"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SLO/SOAP"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SLO/Redirect"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SLO/POST"/> + <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SLO/Artifact"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML2/Artifact" index="3"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML2/ECP" index="4"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML/POST" index="5"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ioc-lookup.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/> </md:SPSSODescriptor> <md:Organization> <md:OrganizationName xml:lang="sv">Swedish University Network</md:OrganizationName> diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index a1dad97a..798c6e61 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -546,7 +546,7 @@ <xi:include href="swamid-2.0/ladok3-01.ladok.umu.se-student-sp.xml"/> <xi:include href="swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml"/> <xi:include href="swamid-2.0/kb-se.zoom.us.xml"/> - <xi:include href="swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml"/> + <xi:include href="swamid-2.0/ioc-lookup.sunet.se-shibboleth.xml"/> <xi:include href="swamid-2.0/release-check.swamid.se-shibboleth.xml"/> <xi:include href="swamid-2.0/test0.release-check.swamid.se-shibboleth.xml"/> <xi:include href="swamid-2.0/test1.release-check.swamid.se-shibboleth.xml"/> |