summaryrefslogtreecommitdiff
path: root/swamid-2.0
diff options
context:
space:
mode:
authorBjörn Mattsson <bjorn@sunet.se>2022-09-09 11:20:14 +0200
committerBjörn Mattsson <bjorn@sunet.se>2022-09-09 11:20:14 +0200
commit1b4b12781910ca5036177d34fc059773dcae55b4 (patch)
tree12bf7d6d5cd431d90208e96d669365a43eacb893 /swamid-2.0
parent04e9560d56039e8f4160f3dd0d048a331cefcc60 (diff)
parent5a0ac08837a166e425b0044719c84aa75c174521 (diff)
Merge branch 'master' of git.swamid.se:swamid-metadata
Diffstat (limited to 'swamid-2.0')
-rw-r--r--swamid-2.0/demo.antagning.se-aws-sp-en.xml47
-rw-r--r--swamid-2.0/demo.antagning.se-aws-sp.xml46
-rw-r--r--swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml1
3 files changed, 77 insertions, 17 deletions
diff --git a/swamid-2.0/demo.antagning.se-aws-sp-en.xml b/swamid-2.0/demo.antagning.se-aws-sp-en.xml
index dffaacdf..4832260a 100644
--- a/swamid-2.0/demo.antagning.se-aws-sp-en.xml
+++ b/swamid-2.0/demo.antagning.se-aws-sp-en.xml
@@ -21,14 +21,9 @@
<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>
- <samla:Attribute 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>
- <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+ <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+ <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -42,6 +37,10 @@
<mdui:Description xml:lang="en">Apply online to Swedish universities and university colleges.</mdui:Description>
<mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
<mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="en">https://www.universityadmissions.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="sv">https://www.antagning.se</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://www.antagning.se/sv/service-provider-policy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.universityadmissions.se/en/service-provider-policy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -94,5 +93,37 @@ KGw+axYUkPctTA7WM2+liZBdokjKUzMQuobA33KZ6sG/gwk=
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.antagning.se:446/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.antagning.se:446/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.antagning.se:446/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">Universityadmissions.se demo</md:ServiceName>
+ <md:ServiceName xml:lang="sv">Antagning.se demo</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:Company>Antagning.se</md:Company>
+ <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:Company>Antagning.se</md:Company>
+ <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>Antagning.se</md:Company>
+ <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:Company>NyAdrift</md:Company>
+ <md:GivenName>NyAdrift</md:GivenName>
+ <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/demo.antagning.se-aws-sp.xml b/swamid-2.0/demo.antagning.se-aws-sp.xml
index 053857a7..7efdaa45 100644
--- a/swamid-2.0/demo.antagning.se-aws-sp.xml
+++ b/swamid-2.0/demo.antagning.se-aws-sp.xml
@@ -21,14 +21,8 @@
<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>
- <samla:Attribute 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>
- <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
- <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
+ <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+ <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>
</md:Extensions>
@@ -42,6 +36,10 @@
<mdui:Description xml:lang="en">Apply online to Swedish universities and university colleges.</mdui:Description>
<mdui:Logo height="52" width="195" xml:lang="sv">https://www.antagning.se/images/logo/antagning_se.png</mdui:Logo>
<mdui:Logo height="52" width="205" xml:lang="en">https://www.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
+ <mdui:InformationURL xml:lang="sv">https://www.antagning.se</mdui:InformationURL>
+ <mdui:InformationURL xml:lang="en">https://www.universityadmissions.se</mdui:InformationURL>
+ <mdui:PrivacyStatementURL xml:lang="en">https://www.universityadmissions.se/en/service-provider-policy</mdui:PrivacyStatementURL>
+ <mdui:PrivacyStatementURL xml:lang="sv">https://www.antagning.se/sv/service-provider-policy</mdui:PrivacyStatementURL>
</mdui:UIInfo>
</md:Extensions>
<md:KeyDescriptor>
@@ -94,5 +92,37 @@ GaOIXROJIA1evbI5BWXf8PrjHD6fB0X0rCqTCmjzBeauGOxKqEk0yGGy
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.antagning.se:444/Shibboleth.sso/SAML2/ECP" index="4"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.antagning.se:444/Shibboleth.sso/SAML/POST" index="5"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.antagning.se:444/Shibboleth.sso/SAML/Artifact" index="6"/>
+ <md:AttributeConsumingService index="1">
+ <md:ServiceName xml:lang="en">Universityadmissions.se demo</md:ServiceName>
+ <md:ServiceName xml:lang="sv">Antagning.se demo</md:ServiceName>
+ <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ </md:AttributeConsumingService>
</md:SPSSODescriptor>
+ <md:Organization>
+ <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
+ <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
+ <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
+ <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+ <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
+ <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+ </md:Organization>
+ <md:ContactPerson contactType="administrative">
+ <md:Company>Antagning.se</md:Company>
+ <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="technical">
+ <md:Company>Antagning.se</md:Company>
+ <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson contactType="support">
+ <md:Company>Antagning.se</md:Company>
+ <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+ </md:ContactPerson>
+ <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+ <md:Company>NyAdrift</md:Company>
+ <md:GivenName>NyAdrift</md:GivenName>
+ <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
+ </md:ContactPerson>
</md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
index fcfb5cd1..794cd813 100644
--- a/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.test.universityadmissions.se-aws-sp-en.xml
@@ -22,7 +22,6 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
<mdattr:EntityAttributes>
<samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
- <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
<samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
</samla:Attribute>
</mdattr:EntityAttributes>