diff options
| author | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2017-11-14 16:58:13 +0100 |
|---|---|---|
| committer | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2017-11-14 16:58:13 +0100 |
| commit | 883e3009485d1a5b60914bf2e7b9f1e783efb5cd (patch) | |
| tree | 8e956934a8ecf8e242153ae53911bf2b71fbd3bc | |
| parent | 53a694566935314e5549799f3da495acaf1a4a53 (diff) | |
Moved research-and-scholarship and corrected checks for research-and-scholarship and code-of-conduct in Makefile"
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | swamid-2.0/fs.liu.se-adfs-services-trust.xml | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -110,7 +110,7 @@ testMetadataUsage: testRefedsRnS: @echo "Checking for refeds R&S compatibillity for entities exported to eduGAIN" @for x in `cat swamid-edugain-*.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | xargs grep -l SPSSODescriptor` ; do \ - got_refeds_RnS=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Extensions/EntityAttributes" - 2>/dev/null | grep 'http://refeds.org/category/research-and-scholarship'` ; \ + got_refeds_RnS=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Extensions/EntityAttributes[@Name='http://macedir.org/entity-category']/AttributeValue" - 2>/dev/null | grep 'http://refeds.org/category/research-and-scholarship'` ; \ if [ -n "$$got_refeds_RnS" ] ; then \ http_post=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/AssertionConsumerService" - 2>/dev/null | grep 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'` ; \ if [ -z "$$http_post" ] ; then echo " $$x: Missing HTTP-POST binding." | sed 's/.*/[1;31m&[0m/' ; fi ; \ @@ -128,7 +128,7 @@ testRefedsRnS: testGeantCoCo: @echo "Checking for Geant CoCo compliance for entities exported to eduGAIN" @for x in `cat swamid-edugain-*.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | xargs grep -l SPSSODescriptor` ; do \ - got_geant_CoCo=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Extensions/EntityAttributes" - 2>/dev/null | grep 'http://www.geant.net/uri/dataprotection-code-of-conduct/v1'` ; \ + got_geant_CoCo=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/Extensions/EntityAttributes/Attribute[@Name='http://macedir.org/entity-category']/AttributeValue" - 2>/dev/null | grep 'http://www.geant.net/uri/dataprotection-code-of-conduct/v1'` ; \ if [ -n "$$got_geant_CoCo" ] ; then \ mdui_check=`cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/Extensions/UIInfo" - 2>/dev/null` ; \ if [ -z "$$mdui_check" ] ; then \ diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml index 2753501f..904577cb 100644 --- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml +++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml @@ -6,9 +6,9 @@ <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue> <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue> <saml:AttributeValue>https://refeds.org/sirtfi</saml:AttributeValue> - <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue> </saml: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-support"> + <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> |