diff options
| author | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2018-11-07 16:23:26 +0100 |
|---|---|---|
| committer | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2018-11-07 16:23:26 +0100 |
| commit | 7e96670449c5104286bcc9a9f8bceebbaba84924 (patch) | |
| tree | 0a45e57c1c79329454c105b90a6c8cb66208700f | |
| parent | ba77b7a0ff66bbe3d32ffa2e2630f9f2efd7e2ff (diff) | |
Added Contact information + updated Makefile part : test2
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | swamid-2.0/crowd.nordu.net-shibboleth.xml | 4 | ||||
| -rw-r--r-- | swamid-2.0/sdauth.sciencedirect.com.xml | 6 | ||||
| -rw-r--r-- | swamid-2.0/sp.swamid.se-shibboleth.xml | 4 |
4 files changed, 19 insertions, 5 deletions
@@ -243,11 +243,16 @@ testAttributeInIdP: test: syntaxtest testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact -test2: $(SWAMIDXML) +test2: $(SWAMIDXML) testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact .time/%.time: swamid-2.0/%.xml - @#testMDUI testOrgData testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact + @# make tidy + @xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $< + + @# make schematest @xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1 + + @# make testMDUI @cat $< | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u | grep -vxE 'cs|da|de|en|fi|fr|it|sv' | sed 's/.*/[1;31mBad lang code : &[0m/' | grep . && exit 1 || true @if ( grep -q IDPSSODescriptor $< ) ; then \ echo "Do IdP checks" ; \ @@ -256,6 +261,7 @@ test2: $(SWAMIDXML) for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor | egrep -v $<` ; do cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName[@xml:lang='$$lang']" - 2>/dev/null | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' | egrep "^$$mdui_displayname$$" | sed "s;^;Duplicate DisplayName in $$x for lang = $$lang\n;" | sed 's/.*/[1;31m&[0m/' ; done | grep . && exit 1 || true;\ done \ fi + # | sed 's/^[ ]*//;s/[ ]*$$//' ; done\ #| tr -d '\n' | sed 's;<[^>]*>\([^<]*\)</[^>]*>;\1\n;g' @#echo "Checking for invalid IPHint" diff --git a/swamid-2.0/crowd.nordu.net-shibboleth.xml b/swamid-2.0/crowd.nordu.net-shibboleth.xml index 3c3a3e35..616a6e59 100644 --- a/swamid-2.0/crowd.nordu.net-shibboleth.xml +++ b/swamid-2.0/crowd.nordu.net-shibboleth.xml @@ -97,4 +97,8 @@ Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA== <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/> </md:AttributeConsumingService> </md:SPSSODescriptor> + <md:ContactPerson contactType="administrative"> + <md:Company>NORDUnet</md:Company> + <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress> + </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-2.0/sdauth.sciencedirect.com.xml b/swamid-2.0/sdauth.sciencedirect.com.xml index 9ccce465..042d251c 100644 --- a/swamid-2.0/sdauth.sciencedirect.com.xml +++ b/swamid-2.0/sdauth.sciencedirect.com.xml @@ -57,14 +57,14 @@ </Organization> <ContactPerson contactType="technical"> <GivenName>Elsevier Shibboleth Support</GivenName> - <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress> + <EmailAddress>mailto:shibbolethsupport@elsevier.com</EmailAddress> </ContactPerson> <ContactPerson contactType="administrative"> <GivenName>Elsevier Shibboleth Support</GivenName> - <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress> + <EmailAddress>mailto:shibbolethsupport@elsevier.com</EmailAddress> </ContactPerson> <ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security"> <GivenName>Elsevier Security Incident Response</GivenName> - <EmailAddress>contentprotectionservices@elsevier.com</EmailAddress> + <EmailAddress>mailto:contentprotectionservices@elsevier.com</EmailAddress> </ContactPerson> </EntityDescriptor> diff --git a/swamid-2.0/sp.swamid.se-shibboleth.xml b/swamid-2.0/sp.swamid.se-shibboleth.xml index 04ab327d..58bc0855 100644 --- a/swamid-2.0/sp.swamid.se-shibboleth.xml +++ b/swamid-2.0/sp.swamid.se-shibboleth.xml @@ -104,4 +104,8 @@ IznEEJKY8IltpfdkKGE20g== <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/> </md:AttributeConsumingService> </md:SPSSODescriptor> + <md:ContactPerson contactType="administrative"> + <md:Company>SWAMID</md:Company> + <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress> + </md:ContactPerson> </md:EntityDescriptor> |