Skip to content

Commit

Permalink
Fatal error if any signature checks fail.
Browse files Browse the repository at this point in the history
Fatal error if any other checks fail on the collection flow.
Requires a ukf-mda artifact bump to bring in the updated filter definition required.
  • Loading branch information
iay committed Jun 12, 2011
1 parent 2fba07d commit c71fdad
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 11 deletions.
5 changes: 4 additions & 1 deletion mdx/aaf/aaf-import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<list>
<ref bean="fetchAafExportAggregate"/>
<ref bean="checkAafSignature"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure to validate signature is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="disassemble"/>

<ref bean="standardImportActions"/>
Expand Down
5 changes: 4 additions & 1 deletion mdx/arnes/arnes-import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<list>
<ref bean="fetchArnesExportAggregate"/>
<ref bean="checkArnesSignature"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure to validate signature is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="disassemble"/>

<ref bean="standardImportActions"/>
Expand Down
5 changes: 4 additions & 1 deletion mdx/caf/caf-import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<list>
<ref bean="fetchCafExportAggregate"/>
<ref bean="checkCafSignature"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure to validate signature is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="disassemble"/>

<ref bean="standardImportActions"/>
Expand Down
12 changes: 12 additions & 0 deletions mdx/common-beans.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,18 @@
<property name="id" value="errorAnnouncingFilter"/>
</bean>

<!--
errorTerminatingFilter
A pipeline stage that checks for any errors, and then announces
and filters any encountered.
-->
<bean id="errorTerminatingFilter" class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStage"
init-method="initialize" lazy-init="true">
<property name="id" value="errorTerminatingFilter"/>
<property name="terminating" value="true"/>
</bean>

<!--
cleanImport
Expand Down
5 changes: 4 additions & 1 deletion mdx/edugain/edugain-import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
<list>
<ref bean="fetchEduGainAggregate"/>
<ref bean="checkEdugainSignature"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure to validate signature is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="disassemble"/>

<ref bean="standardImportActions"/>
Expand Down
5 changes: 4 additions & 1 deletion mdx/edugain/edugain-test-import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
<list>
<ref bean="fetchEduGainTestAggregate"/>
<ref bean="checkEdugainSignature"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure to validate signature is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="disassemble"/>

<ref bean="standardImportActions"/>
Expand Down
5 changes: 4 additions & 1 deletion mdx/edugate/edugate-import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<list>
<ref bean="fetchEdugateExportAggregate"/>
<ref bean="checkEdugateSignature"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure to validate signature is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="disassemble"/>

<ref bean="standardImportActions"/>
Expand Down
5 changes: 4 additions & 1 deletion mdx/incommon/incommon-import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<list>
<ref bean="fetchInCommonExportAggregate"/>
<ref bean="checkInCommonSignature"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure to validate signature is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="disassemble"/>

<ref bean="standardImportActions"/>
Expand Down
5 changes: 4 additions & 1 deletion mdx/swamid/swamid-import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<list>
<ref bean="fetchSwamidExportAggregate"/>
<ref bean="checkSwamidSignature"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure to validate signature is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="disassemble"/>

<ref bean="standardImportActions"/>
Expand Down
5 changes: 4 additions & 1 deletion mdx/switch/switch-import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<list>
<ref bean="fetchSwitchExportAggregate"/>
<ref bean="checkSwitchSignature"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure to validate signature is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="disassemble"/>

<ref bean="standardImportActions"/>
Expand Down
9 changes: 7 additions & 2 deletions mdx/uk/uk-collect.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@
<ref bean="populateItemIds"/>
<ref bean="checkSchemas"/>
<ref bean="CHECK.std"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure of any check on registered metadata is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="assemble.uk"/>

<!--
Expand All @@ -124,7 +127,9 @@
fixed to use a parameter.
-->
<ref bean="check_check"/>
<ref bean="errorAnnouncingFilter"/><!-- should be fatal -->

<!-- failure of any check on registered metadata is fatal -->
<ref bean="errorTerminatingFilter"/>

<ref bean="normaliseNamespaces"/>
</list>
Expand Down
Binary file modified tools/ukf-mda/ukf-mda-0.6-SNAPSHOT.jar
Binary file not shown.

0 comments on commit c71fdad

Please sign in to comment.