Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Retire key use fixup in fallback aggregate
Browse files Browse the repository at this point in the history
See ukf/ukf-meta#109.
  • Loading branch information
iay committed Mar 10, 2017
1 parent b55e1a3 commit fdabcbc
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 141 deletions.
3 changes: 0 additions & 3 deletions mdx/uk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,4 @@ Status (2017-03-10):

* the production aggregate implements a _blacklisting_ approach to entity attributes imported from eduGAIN,
while the production aggregate implements the traditional entity attribute _whitelist_. (2017-03-02)
* 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 `<KeyDescriptor>` 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)
44 changes: 0 additions & 44 deletions mdx/uk/check_fixup_keyuse.xsl

This file was deleted.

52 changes: 0 additions & 52 deletions mdx/uk/fixup_keyuse.xsl

This file was deleted.

43 changes: 1 addition & 42 deletions mdx/uk/generate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,46 +61,6 @@
</property>
</bean>


<!--
***********************
*** ***
*** F I X U P S ***
*** ***
***********************
-->

<!--
Published UK federation metadata for consumption by federation
members has a couple of restrictions arising from known bugs in
early software. We address these by "fixups" which transform the
metadata into a form which doesn't trigger the bug, and verify that
each constraints is met before publication.
We apply fixups "late" in each publication pipeline, so that
the metadata is only transformed if required for a particular
output document. Our export aggregate, for example, does
not have any of the fixups applied.
In the long term, we'd hope to retire these fixups entirely as the
software they to cater for is retired.
-->

<!--
fixup_keyuse
Patch any @use-less KeyName descriptors in IdP roles
for the benefit of Shib SPs pre-1.3.1.
-->
<bean id="fixup_keyuse" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/fixup_keyuse.xsl"/>

<!--
check_fixup_keyuse
-->
<bean id="check_fixup_keyuse" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_fixup_keyuse.xsl"/>

<!--
checkPublishable
Expand All @@ -120,6 +80,7 @@
</property>
</bean>


<!--
*****************************************
*** ***
Expand Down Expand Up @@ -573,13 +534,11 @@
<ref bean="entityAttributes.whitelist"/>
<ref bean="uk_assemble"/>
<ref bean="stripWayfNamespace"/>
<ref bean="fixup_keyuse"/>
<ref bean="stripEmptyExtensions"/>
<ref bean="uk_finaliseFallback"/>
<ref bean="uk_normaliseFallback"/>

<!-- fallback aggregate MUST pass publishability test -->
<ref bean="check_fixup_keyuse"/>
<ref bean="checkPublishable"/>
<ref bean="errorTerminatingFilter"/>

Expand Down

0 comments on commit fdabcbc

Please sign in to comment.