summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile11
-rw-r--r--swamid-2.0/adfs.rkh.se-adfs-services-trust.xml1
-rw-r--r--swamid-2.0/login.fhs.se-adfs-services-trust.xml1
3 files changed, 9 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index b5a9b752..0fd28a7a 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ swamid-externals-sp-2.0.xml: swamid-externals-2.0.mxml
syntaxtest: clean dependencies schematest
-pedantic: clean dependencies schematest testRefedsRnS testGeantCoCo
+pedantic: clean dependencies schematest testRefedsRnS testGeantCoCo testEduGAINchecks
schematest:
@fail=false ; for x in $(MXML); do test=`xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x 2>&1`; rc=$$?; echo $$test | sed 's/fails to validate/&/;s/validates/&/'; if [ $$rc -gt 0 ]; then fail=true ; fi; done ; if $$fail ; then exit 1 ; fi
@@ -152,7 +152,14 @@ testGeantCoCo:
if [ -z "$$requestedAttribute" ] ; then echo " $$x: Missing RequestedAttribute." | sed 's/.*/&/' ; fi ; \
fi ; \
done
-
+
+testEduGAINchecks:
+ @echo "Checking for attributes not allowed in 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 \
+ if ( grep -q "AssertionConsumerService Binding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" $$x ); then \
+ echo " $$x: AssertionConsumerService Binding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect\" not allowed"; \
+ fi ; \
+ done
testMDUI:
@echo "Checking for bad lang codes"
diff --git a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
index 1ded6d54..5862a6d7 100644
--- a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
@@ -601,7 +601,6 @@
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.se/adfs/ls/" index="0" isDefault="true"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.rkh.se/adfs/ls/" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/" index="2"/>
</SPSSODescriptor>
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>
diff --git a/swamid-2.0/login.fhs.se-adfs-services-trust.xml b/swamid-2.0/login.fhs.se-adfs-services-trust.xml
index 03e942e1..cb182b76 100644
--- a/swamid-2.0/login.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login.fhs.se-adfs-services-trust.xml
@@ -615,7 +615,6 @@
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fhs.se/adfs/ls/" index="0" isDefault="true"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.fhs.se/adfs/ls/" index="1"/>
- <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fhs.se/adfs/ls/" index="2"/>
</SPSSODescriptor>
<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
<Extensions>