diff options
-rw-r--r-- | swamid-2.0/comanage-dev.sunet.se-shibboleth.xml | 39 | ||||
-rw-r--r-- | swamid-2.0/idpaas-dev.swamid.se-idp.xml | 7 | ||||
-rw-r--r-- | swamid-2.0/idpaas-dev.swamid.se-sp.xml | 15 |
3 files changed, 32 insertions, 29 deletions
diff --git a/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml b/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml index e6b92b4a..165371c3 100644 --- a/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml +++ b/swamid-2.0/comanage-dev.sunet.se-shibboleth.xml @@ -1,24 +1,25 @@ +<?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://comanage-dev.sunet.se/shibboleth"> <md:Extensions> <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> - <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> - <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> - <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> - <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/> - <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/> - <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> + <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.swamid.se/category/nren-service</samla:AttributeValue> @@ -29,7 +30,7 @@ <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://comanage-dev.sunet.se/Shibboleth.sso/Login"/> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:UIInfo> <mdui:DisplayName xml:lang="sv">Sunets COmanage-dev</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Sunet's COmanage-dev</mdui:DisplayName> <mdui:Description xml:lang="sv">COmanage-dev hos Sunet</mdui:Description> @@ -83,9 +84,9 @@ T10PWaKrl44Xu5NN4+QWzR4HDFyjoJXR/7oW7l4hzQ== <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://comanage-dev.sunet.se/Shibboleth.sso/SAML2/Artifact" index="2"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://comanage-dev.sunet.se/Shibboleth.sso/SAML2/ECP" index="3"/> </md:SPSSODescriptor> -<md:Organization> + <md:Organization> <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName> <md:OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="en">http://www.sunet.se</md:OrganizationURL> -</md:Organization> + </md:Organization> </md:EntityDescriptor> diff --git a/swamid-2.0/idpaas-dev.swamid.se-idp.xml b/swamid-2.0/idpaas-dev.swamid.se-idp.xml index d33262f7..27f82294 100644 --- a/swamid-2.0/idpaas-dev.swamid.se-idp.xml +++ b/swamid-2.0/idpaas-dev.swamid.se-idp.xml @@ -1,3 +1,4 @@ +<?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://idpaas-dev.swamid.se/Saml2IDP/SWAMIDStaff"> <md:Extensions> <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/"> @@ -7,7 +8,7 @@ <md:IDPSSODescriptor xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> <saml:Extensions> <shibmd:Scope regexp="false">dev.sunet.se</shibmd:Scope> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:UIInfo> <mdui:DisplayName xml:lang="sv">SUNET DEV IdP</mdui:DisplayName> <mdui:DisplayName xml:lang="en">SUNET DEV IdP</mdui:DisplayName> <mdui:Description xml:lang="sv">Dev system för SUNET-anställdas inloggning</mdui:Description> @@ -16,7 +17,7 @@ <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo> <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo> </mdui:UIInfo> - <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:DiscoHints> <mdui:DomainHint>dev.sunet.se</mdui:DomainHint> </mdui:DiscoHints> </saml:Extensions> @@ -67,5 +68,5 @@ Y8EsBJJ/SVy+u6mTCtSPzXlNL8q16fbPq1e2gr3zle0WzMSC3Yc/oqqFCKN01OUd <md:ContactPerson contactType="support"> <md:GivenName>Support</md:GivenName> <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress> - </md:ContactPerson> + </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-2.0/idpaas-dev.swamid.se-sp.xml b/swamid-2.0/idpaas-dev.swamid.se-sp.xml index 168ed8da..ec5e67ea 100644 --- a/swamid-2.0/idpaas-dev.swamid.se-sp.xml +++ b/swamid-2.0/idpaas-dev.swamid.se-sp.xml @@ -1,3 +1,4 @@ +<?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" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata sstc-saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd" entityID="https://idpaas-dev.swamid.se/Saml2SP/sp"> <md:Extensions> <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/"> @@ -12,7 +13,7 @@ </md:Extensions> <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> <Extensions> - <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"> + <mdui:UIInfo> <mdui:DisplayName xml:lang="sv">Sunets DEV COmanage IDP</mdui:DisplayName> <mdui:DisplayName xml:lang="en">Sunet's DEV COmanage IDP</mdui:DisplayName> <mdui:Description xml:lang="sv">COmanage DEV IDP hos Sunet</mdui:Description> @@ -52,17 +53,17 @@ aCOYfUywe8jw2aSSyU94ED8BNT4vPXtbUnxKreEZ3NHacyAirtjydzI+6cK+BVzd </KeyDescriptor> <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpaas-dev.swamid.se/Saml2SP/acs/post" index="1"/> </SPSSODescriptor> -<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata"> + <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata"> <OrganizationName xml:lang="en">SUNET</OrganizationName> <OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName> <OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL> -</Organization> -<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical"> + </Organization> + <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical"> <GivenName>Technical</GivenName> <EmailAddress>mailto:noc@sunet.se</EmailAddress> -</ContactPerson> -<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support"> + </ContactPerson> + <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support"> <GivenName>Support</GivenName> <EmailAddress>mailto:noc@sunet.se</EmailAddress> -</ContactPerson> + </ContactPerson> </md:EntityDescriptor> |