summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Wassberg <jocar@sunet.se>2023-08-25 09:04:02 +0200
committerJohan Wassberg <jocar@sunet.se>2023-08-25 09:04:02 +0200
commit939a6603ea49fc472bb31b71f30b7a50c9200746 (patch)
treeb21e2697471c838b50e9524074bbf3d5d6f6536c
parent0fedf7d397ace8b7d7c09e3bf4ca8d0dd903185e (diff)
Revert "Add missing Schema Namepaces since they where lost in the split"
This reverts commit ac9405a48f8caf96511db6cb68c7f389cf0715bc.
-rwxr-xr-xmetadata/scripts/pull-and-verify.sh4
-rw-r--r--metadata/xslt/import-metadata.xsl2
2 files changed, 4 insertions, 2 deletions
diff --git a/metadata/scripts/pull-and-verify.sh b/metadata/scripts/pull-and-verify.sh
index 0598560..f1b11b2 100755
--- a/metadata/scripts/pull-and-verify.sh
+++ b/metadata/scripts/pull-and-verify.sh
@@ -24,6 +24,10 @@ if [ $? -ne 0 ]; then
exit 1
fi
for md in $TMPD/*.xml; do
+ if (grep -q 'xs:string' $md); then
+ echo "cleaning $md"
+ sed 's/ xsi:type="xs:string"//' $md > $md.c && mv $md.c $md
+ fi
if (! (grep -q 'IDPSSODescriptor ' $md)); then
# Check if SP is OK else remove
SP=$(grep "entityID=" $md | sed 's/.*entityID="\(.*[a-zA-Z0-9/]\)".*/\1/')
diff --git a/metadata/xslt/import-metadata.xsl b/metadata/xslt/import-metadata.xsl
index 769d420..2edf7ed 100644
--- a/metadata/xslt/import-metadata.xsl
+++ b/metadata/xslt/import-metadata.xsl
@@ -3,8 +3,6 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
xmlns:exsl="http://exslt.org/common"