summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Mattsson <bjorn@sunet.se>2021-03-15 13:26:24 +0100
committerBjörn Mattsson <bjorn@sunet.se>2021-03-15 13:26:24 +0100
commitf63e85f084301175c9dec9c0fe1f3bf23650de50 (patch)
treeb5b2c56c04d3470149533516fdc9cc0ce068c19b
parenta730e4de9732c742246f0456f65da1991d56ef05 (diff)
SWAMID-140, Fundering entitetskategorier för SP
-rw-r--r--Makefile.validate2
-rw-r--r--swamid-2.0/expert.stage.antagning.se-expert-sp.xml5
-rw-r--r--swamid-2.0/expert.stage.antagning.se-hubble-sp.xml5
3 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.validate b/Makefile.validate
index f7c968b0..7d2e657f 100644
--- a/Makefile.validate
+++ b/Makefile.validate
@@ -4,4 +4,4 @@ all: validate
validate: $(VALIDATEXML)
.time/%.validate: swamid-2.0/%.xml
- @docker exec release-check /var/www/scripts/importXML.bash /opt/swamid-metadata/$< Prod > $@
+ @docker exec release-check /var/www/scripts/importXML.bash /opt/swamid-metadata/$< Prod | grep -v "Import -> Added to db" > $@
diff --git a/swamid-2.0/expert.stage.antagning.se-expert-sp.xml b/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
index e38a2e57..7312e617 100644
--- a/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
+++ b/swamid-2.0/expert.stage.antagning.se-expert-sp.xml
@@ -20,6 +20,11 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
<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 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>
<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>
diff --git a/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml b/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
index 84158cbe..2be40f6d 100644
--- a/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/expert.stage.antagning.se-hubble-sp.xml
@@ -20,6 +20,11 @@
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
<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 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>
<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>