summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Domeij <fredrik.domeij@umu.se>2017-02-15 18:38:31 +0100
committerFredrik Domeij <fredrik.domeij@umu.se>2017-02-15 18:38:31 +0100
commit036d2dbb30960840418ecdde745e00e42d52a420 (patch)
tree7b2acb9113ad4e36ac9e71087815bb08fe9019d6
parent6e226ef4842a938c5ca426a3a2d711f75265cce5 (diff)
check for bad strings in metadata (for example empty ServiceName
-rw-r--r--Makefile6
-rw-r--r--swamid-2.0/registry-test.swamid.se-saml2-metadata.xml4
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 00dd72ca..3c527319 100644
--- a/Makefile
+++ b/Makefile
@@ -191,7 +191,11 @@ testALlevel:
@echo "Check for IdP:s with AL2 without AL1"
@for x in `find $(SRCDIRS) -name \*.xml`; do if grep -q http://www.swamid.se/policy/assurance/al2 $$x && ! grep -q http://www.swamid.se/policy/assurance/al1 $$x ; then echo " $$x" | sed 's/.*/&/' ; fi ; done
-committest: test testMDUI testOrgData testEntCat testSimpleSign testALlevel testRefedsRnS testGeantCoCo testMetadataUsage
+testBadStrings:
+ @echo "Check for bad strings in metadata"
+ @for x in `find $(SRCDIRS) -name \*.xml`; do grep -E 'ServiceName xml:lang="[^"]*"/>' $$x | sed 's/^/ /' ; done | grep . && exit 1 || exit 0
+
+committest: test testMDUI testOrgData testEntCat testSimpleSign testALlevel testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings
deeptest: committest testMDUIreach
diff --git a/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml b/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
index 4e91562d..878a97bb 100644
--- a/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
+++ b/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
@@ -71,10 +71,6 @@ oMzgMjdgVTXdBPqXjdsunjPAiOZnJesxtLgWYEmQ
<md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://registry-test.swamid.se/saml2/ls/"/>
<md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registry-test.swamid.se/saml2/acs/" index="1"/>
<md:AttributeConsumingService index="1">
- <!-- Does not validate in Shibboleth SP 2.5.3
- ERROR OpenSAML.MetadataProvider.XML : metadata instance failed manual validation checking: ServiceName must have TextContent.
- <md:ServiceName xml:lang="en"/>
- -->
<md:ServiceName xml:lang="en">PEER SP</md:ServiceName>
<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 Name="givenName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>