From 1461ae8b5b0c0ac2b80f914ffa5d5abc91198913 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Mon, 13 Feb 2017 14:56:43 +0000 Subject: [PATCH] Normalise xenc namespace without prefix in production, wayf and export preview aggregates See ukf/ukf-meta#110. --- mdx/uk/README.md | 10 +++++----- mdx/uk/ns_norm_export_preview.xsl | 24 +++++++++++++++++++++++- mdx/uk/ns_norm_uk.xsl | 24 +++++++++++++++++++++++- 3 files changed, 51 insertions(+), 7 deletions(-) diff --git a/mdx/uk/README.md b/mdx/uk/README.md index 18455dee..ac44d347 100644 --- a/mdx/uk/README.md +++ b/mdx/uk/README.md @@ -28,9 +28,9 @@ before being included in the `export` version consumed by interfederation partne ### Export Preview Aggregate vs. Export Aggregate -Status (2017-02-10): +Status (2017-02-13): -* these aggregates are currently identical +* The export preview aggregate normalises the `xenc` namespace to not use a prefix, as it is not very commonly used. (2017-02-13) ## Production Maturity Pipeline @@ -59,15 +59,14 @@ when it appeared in the fallback aggregate, which would be too late to take corr ### Test Aggregate vs. Production Aggregate -Status (2017-02-08): +Status (2017-02-13): * the test aggregate implements a _blacklisting_ approach to entity attributes imported from eduGAIN, while the production aggregate implements the traditional entity attribute _whitelist_. -* The test aggregate normalises the `xenc` namespace to not use a prefix, as it is not very commonly used. ### Fallback Aggregate vs. Production Aggregate -Status (2017-02-08): +Status (2017-02-13): * The production aggregate defines the `saml` namespace prefix (used by entity attributes) on the document element instead of in each SAML ``. (2017-02-08) @@ -76,3 +75,4 @@ instead of in each `` element. (2017-02-08) * the production aggregate no longer implements the "key use" fixup required for pre-1.3.1 Shibboleth SPs. This adds the `use="signing"` XML attribute to `` elements present in IdP metadata without a `use` attribute. It is not needed for later releases of the Shibboleth SP. (2017-02-10) +* The production aggregate normalises the `xenc` namespace to not use a prefix, as it is not very commonly used. (2017-02-13) diff --git a/mdx/uk/ns_norm_export_preview.xsl b/mdx/uk/ns_norm_export_preview.xsl index 59e402e6..cb79a27c 100644 --- a/mdx/uk/ns_norm_export_preview.xsl +++ b/mdx/uk/ns_norm_export_preview.xsl @@ -32,8 +32,9 @@ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF" + xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" - exclude-result-prefixes="alg md ukfedlabel wayf" + exclude-result-prefixes="alg md ukfedlabel wayf xenc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="urn:oasis:names:tc:SAML:2.0:metadata"> @@ -107,5 +108,26 @@ + + + + + + + + + + + diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl index fb3d7896..20930f67 100644 --- a/mdx/uk/ns_norm_uk.xsl +++ b/mdx/uk/ns_norm_uk.xsl @@ -38,8 +38,9 @@ xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF" + xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" - exclude-result-prefixes="alg md wayf" + exclude-result-prefixes="alg md wayf xenc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="urn:oasis:names:tc:SAML:2.0:metadata"> @@ -113,5 +114,26 @@ + + + + + + + + + + +