summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-08-16 10:08:14 +0200
committerLeif Johansson <leifj@sunet.se>2011-08-16 10:08:14 +0200
commita5f8a1f69783ab8fccdddf9c084d68a2efa5de6c (patch)
tree5d68ba625cbc0d530360b17dc2f2a98ac62631b0
parent856f04f340d5616639d33361d8527ee8afd0e717 (diff)
renamed canit to mailfilter-test
-rw-r--r--swamid-1.0.mxml2
-rw-r--r--swamid-1.0/mailfilter-test.nordu.net.xml (renamed from swamid-1.0/canit.nordu.net.xml)41
2 files changed, 22 insertions, 21 deletions
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index ca54f7da..095fcf30 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -117,7 +117,7 @@
<xi:include href="swamid-1.0/minastudier.su.se.xml"/>
<xi:include href="swamid-1.0/ladok.su.se.xml"/>
<xi:include href="swamid-1.0/bardo.kib.ki.se.xml"/>
- <xi:include href="swamid-1.0/canit.nordu.net.xml"/>
+ <xi:include href="swamid-1.0/mailfilter-test.nordu.net.xml"/>
<xi:include href="swamid-1.0/unitcf.se.xml"/>
<xi:include href="swamid-1.0/crowd.nordu.net.xml"/>
<xi:include href="swamid-1.0/rt-test-app1.it.su.se.xml"/>
diff --git a/swamid-1.0/canit.nordu.net.xml b/swamid-1.0/mailfilter-test.nordu.net.xml
index 725a4819..c47bf172 100644
--- a/swamid-1.0/canit.nordu.net.xml
+++ b/swamid-1.0/mailfilter-test.nordu.net.xml
@@ -1,13 +1,15 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://canit.nordu.net/shibboleth">
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_a142e60b47c0fef5f9586be3386f4763" entityID="https://mailfilter-test.nordu.net/shibboleth">
<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>
- <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://canit.nordu.net/Shibboleth.sso/DS/kalmar3" index="1"/>
+ <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
+ <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+ <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/DS/kalmar3" index="3"/>
</md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>canit.nordu.net</ds:KeyName>
- <ds:KeyName>https://canit.nordu.net/shibboleth</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=canit.nordu.net</ds:X509SubjectName>
<ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAO/nNPqDBCrnMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
@@ -33,7 +35,6 @@ VXfcZO7EtnsxYb035Zcei+quLWwJFAIKXwMSWZQEVo4WXa83B8oKnw==
<md:KeyDescriptor use="encryption">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
<ds:KeyName>canit.nordu.net</ds:KeyName>
- <ds:KeyName>https://canit.nordu.net/shibboleth</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=canit.nordu.net</ds:X509SubjectName>
<ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAO/nNPqDBCrnMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
@@ -56,21 +57,21 @@ VXfcZO7EtnsxYb035Zcei+quLWwJFAIKXwMSWZQEVo4WXa83B8oKnw==
</ds:X509Data>
</ds:KeyInfo>
</md:KeyDescriptor>
- <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://canit.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://canit.nordu.net/Shibboleth.sso/SLO/SOAP"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://canit.nordu.net/Shibboleth.sso/SLO/Redirect"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://canit.nordu.net/Shibboleth.sso/SLO/POST"/>
- <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://canit.nordu.net/Shibboleth.sso/SLO/Artifact"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://canit.nordu.net/Shibboleth.sso/NIM/SOAP"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://canit.nordu.net/Shibboleth.sso/NIM/Redirect"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://canit.nordu.net/Shibboleth.sso/NIM/POST"/>
- <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://canit.nordu.net/Shibboleth.sso/NIM/Artifact"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://canit.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://canit.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://canit.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://canit.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://canit.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
- <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://canit.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SLO/SOAP"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SLO/Redirect"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SLO/POST"/>
+ <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SLO/Artifact"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/NIM/SOAP"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/NIM/Redirect"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/NIM/POST"/>
+ <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/NIM/Artifact"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
+ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mailfilter-test.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor>
+</md:EntityDescriptor> \ No newline at end of file