SWAMID-140, Fundering entitetskategorier för SP
authorBjörn Mattsson <bjorn@sunet.se>
Mon, 15 Mar 2021 12:26:24 +0000 (13:26 +0100)
committerBjörn Mattsson <bjorn@sunet.se>
Mon, 15 Mar 2021 12:26:24 +0000 (13:26 +0100)
Makefile.validate
swamid-2.0/expert.stage.antagning.se-expert-sp.xml
swamid-2.0/expert.stage.antagning.se-hubble-sp.xml

index f7c968b..7d2e657 100644 (file)
@@ -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" > $@
index e38a2e5..7312e61 100644 (file)
     <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>
index 84158cb..2be40f6 100644 (file)
     <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>