summaryrefslogtreecommitdiff
path: root/swamid-2.0
diff options
context:
space:
mode:
authorBjörn Mattsson <Bjorn.Mattsson@bth.se>2021-02-10 16:22:59 +0100
committerBjörn Mattsson <Bjorn.Mattsson@bth.se>2021-02-10 16:22:59 +0100
commit2e371df0754f8687debc0d6f160da5d0752e8d54 (patch)
treedd836b1de9c387a6c321a65618bf46125ebabf26 /swamid-2.0
parentf9f02de7e5d05a4e83c8bfeb2e4f5083deb0d51e (diff)
parentd35ee5bcf23151dfe26c3e8dd2551ee1380aa70f (diff)
Merge branch 'master' of git.swamid.se:swamid-metadata
Diffstat (limited to 'swamid-2.0')
-rw-r--r--swamid-2.0/data.houseoffinance.se-shibboleth.xml1
-rw-r--r--swamid-2.0/drive-idp-proxy.sunet.se-sp.xml15
2 files changed, 13 insertions, 3 deletions
diff --git a/swamid-2.0/data.houseoffinance.se-shibboleth.xml b/swamid-2.0/data.houseoffinance.se-shibboleth.xml
index 9b2ec542..3df8ad89 100644
--- a/swamid-2.0/data.houseoffinance.se-shibboleth.xml
+++ b/swamid-2.0/data.houseoffinance.se-shibboleth.xml
@@ -87,6 +87,7 @@ bi+i8GP0b/0=
<md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
<md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+ <md:RequestedAttribute FriendlyName="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
</md:AttributeConsumingService>
</md:SPSSODescriptor>
<md:ContactPerson contactType="administrative">
diff --git a/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml b/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
index 1a12e604..e119f0f6 100644
--- a/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/drive-idp-proxy.sunet.se-sp.xml
@@ -25,6 +25,11 @@
<ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
<ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
<ns2:SigningMethod xmlns:ns2="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+ <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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
</md:Extensions>
<ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<ns0:Extensions>
@@ -109,12 +114,16 @@ nFazsTrNSZlEGo3j2eQJF+jcoe/dBg/fTJkDpehuCObZ6KOCGBIiYSu6wISlbti9
<ns0:OrganizationDisplayName xml:lang="en">SUNET Drive</ns0:OrganizationDisplayName>
<ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
</ns0:Organization>
+ <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+ <ns0:GivenName>Richard Freitag</ns0:GivenName>
+ <ns0:EmailAddress>mailto:freitag@sunet.se</ns0:EmailAddress>
+ </ns0:ContactPerson>
<ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
- <ns0:GivenName>Technical</ns0:GivenName>
- <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
+ <ns0:GivenName>Jonas Hagström</ns0:GivenName>
+ <ns0:EmailAddress>mailto:jonas@nordu.net</ns0:EmailAddress>
</ns0:ContactPerson>
<ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
- <ns0:GivenName>Support</ns0:GivenName>
+ <ns0:GivenName>Sunet NOC</ns0:GivenName>
<ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
</ns0:ContactPerson>
</md:EntityDescriptor>