summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--swamid-1.0.mxml1
-rw-r--r--swamid-1.0/connect-beta.sunet.se.xml12
-rw-r--r--swamid-1.0/connect-stable.sunet.se.xml13
-rw-r--r--swamid-1.0/connect-test.sunet.se.xml15
-rw-r--r--swamid-1.0/connect.sunet.se.xml13
-rw-r--r--swamid-1.0/vmidgw.miun.se.xml118
6 files changed, 45 insertions, 127 deletions
diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 425abeb2..50c5c599 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -62,7 +62,6 @@
<xi:include href="swamid-1.0/shibb1.hj.se.xml"/>
<xi:include href="swamid-1.0/shibbo.ltu.se.xml"/>
<xi:include href="swamid-1.0/akino.hh.se.xml"/>
- <xi:include href="swamid-1.0/vmidgw.miun.se.xml"/>
<xi:include href="swamid-1.0/bibliometrics.ki.se.xml"/>
<xi:include href="swamid-1.0/uu.test.diva-portal.org.xml"/>
<xi:include href="swamid-1.0/idp.bth.se.xml"/>
diff --git a/swamid-1.0/connect-beta.sunet.se.xml b/swamid-1.0/connect-beta.sunet.se.xml
index 46b0b2c7..ccd375ac 100644
--- a/swamid-1.0/connect-beta.sunet.se.xml
+++ b/swamid-1.0/connect-beta.sunet.se.xml
@@ -1,5 +1,15 @@
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-beta.sunet.se/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/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
<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://connect-beta.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
diff --git a/swamid-1.0/connect-stable.sunet.se.xml b/swamid-1.0/connect-stable.sunet.se.xml
index ae362cda..e46aa3b5 100644
--- a/swamid-1.0/connect-stable.sunet.se.xml
+++ b/swamid-1.0/connect-stable.sunet.se.xml
@@ -1,6 +1,15 @@
-
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_b1dea4b383f174f509b2659a25c968af" entityID="https://connect-stable.sunet.se/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/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
<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://connect-stable.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
diff --git a/swamid-1.0/connect-test.sunet.se.xml b/swamid-1.0/connect-test.sunet.se.xml
index ca39efd8..c1f8fe5b 100644
--- a/swamid-1.0/connect-test.sunet.se.xml
+++ b/swamid-1.0/connect-test.sunet.se.xml
@@ -1,6 +1,15 @@
-
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect-test.sunet.se/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/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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:KeyDescriptor use="signing">
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -72,4 +81,4 @@ iMkYL+yQK1JqNXDJwr+eW3+iWptUXnyRCnGBrYMAvqw=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect-test.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
</md:SPSSODescriptor>
-</md:EntityDescriptor> \ No newline at end of file
+</md:EntityDescriptor>
diff --git a/swamid-1.0/connect.sunet.se.xml b/swamid-1.0/connect.sunet.se.xml
index c7b1bf97..24ff1fe7 100644
--- a/swamid-1.0/connect.sunet.se.xml
+++ b/swamid-1.0/connect.sunet.se.xml
@@ -1,6 +1,15 @@
-
<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.sunet.se/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/research-and-education</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+ <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
<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://connect.sunet.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
diff --git a/swamid-1.0/vmidgw.miun.se.xml b/swamid-1.0/vmidgw.miun.se.xml
deleted file mode 100644
index 9054d0f3..00000000
--- a/swamid-1.0/vmidgw.miun.se.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<EntityDescriptor entityID="https://vmidgw.miun.se/idp/shibboleth"
- xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAPHtItYHI9B2lBySyOcXbvJyO3g7MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnZtaWRndy5taXVuLnNlMB4XDTA5MTAyOTEyMDQxMloX
-DTI5MTAyOTEyMDQxMlowGTEXMBUGA1UEAxMOdm1pZGd3Lm1pdW4uc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUpp7w/M9xt+QmzsVWyAKKISbmaInZ
-QX4DNep5kS9SgA0GX7Cl8otK8gy+8Ezu32nyc142Lmoz2JzfeHOuAZCwpXH0yLXe
-urL1HzmGftJ0TD1JEmJjKw1wQUjcFQMLtsmBv3ojn6tG7FTZVhBcunfputIX+K0L
-BUKrZCShShgquJxEWxEg2o6BzbIE7BgYxUwdDQ0NTjOpBB7XwbBqqjIAzKPvMjJX
-07xNrRfbJpOr9zekYWyjWUqdhVncQi3xK75iquIKcrjXvbLIUcl7qLSjNgvfuUee
-MvPr/F1PA3QOB1B0EYqoUD6jf/4HYr85xvZWrz18AjmLR07VxNuAngJHAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnZtaWRndy5taXVuLnNlhiVodHRwczovL3ZtaWRndy5t
-aXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTc3zYTOorpuyNzQqNZpy7m
-4ppK9zANBgkqhkiG9w0BAQUFAAOCAQEAefQmUr2yV8lZXjSn3M5CWOAa+MDVLckh
-LFJ46QBqlUf/7gbhsW+/N9BlrAEa2WiBczK/RxbvodGHZP8kfVFosYba4pe/0keQ
-bS03mvRlMAiP047mAHIXVZszLDYgrBcjhP5p+xozzYVE4Ku8A5v3klILuNNwu5OW
-hMrFcqaddz+0w/FAWlhgNqgEToUbR2xWQh5yVGZ9vkcj0priytnsBIZZWJsdlpaH
-EwQmOmY1IlHM1SSucXdJpfVc1epYD/s2fOyy+orDvK8Gh1wO7nYByGrS14Vl/gkx
-6hs9Dgk3r873PhGOHDlxxZllIH782RtYUv4QKs/MqiZQeKoDa6YjIQ==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://vmidgw.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution"
- index="1"/>
-
- <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://vmidgw.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution"
- index="2"/>
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
- Location="https://vmidgw.miun.se/idp/profile/Shibboleth/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
- Location="https://vmidgw.miun.se/idp/profile/SAML2/POST/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://vmidgw.miun.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-
- <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
- Location="https://vmidgw.miun.se/idp/profile/SAML2/Redirect/SSO" />
- </IDPSSODescriptor>
-
- <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <Extensions>
- <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
- </Extensions>
-
- <KeyDescriptor>
- <ds:KeyInfo>
- <ds:X509Data>
- <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAPHtItYHI9B2lBySyOcXbvJyO3g7MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnZtaWRndy5taXVuLnNlMB4XDTA5MTAyOTEyMDQxMloX
-DTI5MTAyOTEyMDQxMlowGTEXMBUGA1UEAxMOdm1pZGd3Lm1pdW4uc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUpp7w/M9xt+QmzsVWyAKKISbmaInZ
-QX4DNep5kS9SgA0GX7Cl8otK8gy+8Ezu32nyc142Lmoz2JzfeHOuAZCwpXH0yLXe
-urL1HzmGftJ0TD1JEmJjKw1wQUjcFQMLtsmBv3ojn6tG7FTZVhBcunfputIX+K0L
-BUKrZCShShgquJxEWxEg2o6BzbIE7BgYxUwdDQ0NTjOpBB7XwbBqqjIAzKPvMjJX
-07xNrRfbJpOr9zekYWyjWUqdhVncQi3xK75iquIKcrjXvbLIUcl7qLSjNgvfuUee
-MvPr/F1PA3QOB1B0EYqoUD6jf/4HYr85xvZWrz18AjmLR07VxNuAngJHAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnZtaWRndy5taXVuLnNlhiVodHRwczovL3ZtaWRndy5t
-aXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTc3zYTOorpuyNzQqNZpy7m
-4ppK9zANBgkqhkiG9w0BAQUFAAOCAQEAefQmUr2yV8lZXjSn3M5CWOAa+MDVLckh
-LFJ46QBqlUf/7gbhsW+/N9BlrAEa2WiBczK/RxbvodGHZP8kfVFosYba4pe/0keQ
-bS03mvRlMAiP047mAHIXVZszLDYgrBcjhP5p+xozzYVE4Ku8A5v3klILuNNwu5OW
-hMrFcqaddz+0w/FAWlhgNqgEToUbR2xWQh5yVGZ9vkcj0priytnsBIZZWJsdlpaH
-EwQmOmY1IlHM1SSucXdJpfVc1epYD/s2fOyy+orDvK8Gh1wO7nYByGrS14Vl/gkx
-6hs9Dgk3r873PhGOHDlxxZllIH782RtYUv4QKs/MqiZQeKoDa6YjIQ==
-
- </ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </KeyDescriptor>
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
- Location="https://vmidgw.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-
- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
- Location="https://vmidgw.miun.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
-
- <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
- <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
- </AttributeAuthorityDescriptor>
-
- <Organization>
- <OrganizationName xml:lang="en">MIUNold</OrganizationName>
- <OrganizationDisplayName xml:lang="en">Mittuniversitetet (old)</OrganizationDisplayName>
- <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
- </Organization>
- <ContactPerson contactType="technical">
- <Company>Mittuniversitetet</Company>
- <EmailAddress>Ove.Olander@miun.se</EmailAddress>
- </ContactPerson>
-
-</EntityDescriptor>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 21:56:04 +0000