summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--swamid-2.0/pingpong.ki.se-shibboleth.xml16
-rw-r--r--swamid-2.0/test-ki.pingpong.net-shibboleth.xml32
2 files changed, 31 insertions, 17 deletions
diff --git a/swamid-2.0/pingpong.ki.se-shibboleth.xml b/swamid-2.0/pingpong.ki.se-shibboleth.xml
index 2c8e572e..ff530069 100644
--- a/swamid-2.0/pingpong.ki.se-shibboleth.xml
+++ b/swamid-2.0/pingpong.ki.se-shibboleth.xml
@@ -5,15 +5,16 @@
<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/hei-service</samla:AttributeValue>
<samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<md:Extensions>
<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
- <mdui:DisplayName xml:lang="sv">Ping Pong för Karaolinska Institutet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="sv">Ping Pong för Karolinska Institutet</mdui:DisplayName>
<mdui:DisplayName xml:lang="en">Ping Pong at Karolinska Institutet</mdui:DisplayName>
- <mdui:Description xml:lang="sv">Ping Pong för Karaolinska Institutet</mdui:Description>
+ <mdui:Description xml:lang="sv">Ping Pong för Karolinska Institutet</mdui:Description>
<mdui:Description xml:lang="en">Ping Pong at Karolinska Institutet</mdui:Description>
</mdui:UIInfo>
</md:Extensions>
@@ -41,11 +42,12 @@ ZqAEwFI6mSdqDAH/wGtQLWPtrVSKg/XmB9+G8JohgWpphQElSQ==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingpong.ki.se/Shibboleth.sso/SLO/SOAP"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpong.ki.se/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.ki.se/Shibboleth.sso/SLO/POST"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pingpong.ki.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pingpong.ki.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
+ </md:Organization>
</md:EntityDescriptor>
diff --git a/swamid-2.0/test-ki.pingpong.net-shibboleth.xml b/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
index 90145007..f4eb3955 100644
--- a/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
+++ b/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
@@ -1,11 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-ki.pingpong.net/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://test-ki.pingpong.net/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/hei-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</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://test-ki.pingpong.net/Shibboleth.sso/Login"/>
+ <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+ <mdui:DisplayName xml:lang="sv">TEST-Ping Pong för Karolinska Institutet</mdui:DisplayName>
+ <mdui:DisplayName xml:lang="en">TEST-Ping Pong at Karolinska Institutet</mdui:DisplayName>
+ <mdui:Description xml:lang="sv">TEST-Ping Pong för Karolinska Institutet</mdui:Description>
+ <mdui:Description xml:lang="en">TEST-Ping Pong at Karolinska Institutet</mdui:Description>
+ </mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+ <ds:KeyInfo>
<ds:KeyName>test-ki.pingpong.net</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=test-ki.pingpong.net</ds:X509SubjectName>
@@ -30,14 +44,12 @@ kRz90uqHpg==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-ki.pingpong.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-ki.pingpong.net/Shibboleth.sso/SLO/SOAP"/>
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-ki.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-ki.pingpong.net/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-ki.pingpong.net/Shibboleth.sso/SLO/Artifact"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-ki.pingpong.net/Shibboleth.sso/SAML2/POST" index="0"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-ki.pingpong.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-ki.pingpong.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-ki.pingpong.net/Shibboleth.sso/SAML2/ECP" index="3"/>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
+ </md:Organization>
</md:EntityDescriptor>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 01:24:52 +0000