Skip to content

Commit

Permalink
Inbound flows for InCommon, ARNES and CAF.
Browse files Browse the repository at this point in the history
  • Loading branch information
iay committed May 2, 2011
1 parent 95a390c commit 8b1e929
Show file tree
Hide file tree
Showing 9 changed files with 328 additions and 25 deletions.
91 changes: 66 additions & 25 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -976,12 +976,46 @@
</sequential>
</macrodef>

<!--
*******************************
*** ***
*** M D X : A R N E S ***
*** ***
*******************************
-->

<property name="arnes.dir" value="${mdx.dir}/arnes"/>

<target name="flow.arnes.import">
<echo>Running ARNES import flow.</echo>
<MDA config="${arnes.dir}/arnes-import.xml" out="${arnes.dir}/imported.xml"/>
<CHECK.imported i="${arnes.dir}/imported.xml"/>
<echo>Completed ARNES import flow.</echo>
</target>

<!--
***************************
*** ***
*** M D X : C A F ***
*** ***
***************************
-->

<property name="caf.dir" value="${mdx.dir}/caf"/>

<target name="flow.caf.import">
<echo>Running CAF import flow.</echo>
<MDA config="${caf.dir}/caf-import.xml" out="${caf.dir}/imported.xml"/>
<CHECK.imported i="${caf.dir}/imported.xml"/>
<echo>Completed CAF import flow.</echo>
</target>

<!--
***********************************************
*** ***
*** E D U G A T E F E D E R A T I O N ***
*** ***
***********************************************
***********************************
*** ***
*** M D X : E D U G A T E ***
*** ***
***********************************
-->

<property name="edugate.dir" value="${mdx.dir}/edugate"/>
Expand All @@ -994,21 +1028,28 @@
</target>

<!--
*************************************************
*** ***
*** I N C O M M O N F E D E R A T I O N ***
*** ***
*************************************************
************************************
*** ***
*** M D X: I N C O M M O N ***
*** ***
************************************
-->

<property name="incommon.dir" value="${mdx.dir}/incommon"/>

<target name="flow.incommon.import">
<echo>Running InCommon import flow.</echo>
<MDA config="${incommon.dir}/incommon-import.xml" out="${incommon.dir}/imported.xml"/>
<CHECK.imported i="${incommon.dir}/imported.xml"/>
<echo>Completed InCommon import flow.</echo>
</target>

<!--
*************************
*** ***
*** E D U G A I N ***
*** ***
*************************
**********************************
*** ***
*** M D X: E D U G A I N ***
*** ***
**********************************
-->

<property name="edugain.dir" value="${mdx.dir}/edugain"/>
Expand All @@ -1021,11 +1062,11 @@
</target>

<!--
*********************************************
*** ***
*** S W A M I D F E D E R A T I O N ***
*** ***
*********************************************
*********************************
*** ***
*** M D X : S W A M I D ***
*** ***
*********************************
-->

<property name="swamid.dir" value="${mdx.dir}/swamid"/>
Expand All @@ -1038,11 +1079,11 @@
</target>

<!--
*********************************************
*** ***
*** S W I T C H F E D E R A T I O N ***
*** ***
*********************************************
*********************************
*** ***
*** M D X : S W I T C H ***
*** ***
*********************************
-->

<property name="switch.dir" value="${mdx.dir}/switch"/>
Expand Down
16 changes: 16 additions & 0 deletions mdx/arnes/aai.arnes.si.crt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
-----BEGIN CERTIFICATE-----
MIICfzCCAegCCQD3rv/N2WIUfDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
U0kxEjAQBgNVBAcTCUxqdWJsamFuYTEOMAwGA1UEChMFQVJORVMxDDAKBgNVBAsT
A0FBSTEdMBsGA1UEAxMUQUFJIE1ldGFkYXRhIHNpZ25pbmcxIzAhBgkqhkiG9w0B
CQEWFGFhYS1wb2Rwb3JhQGFybmVzLnNpMB4XDTEwMDIwNDA5MjgzNVoXDTE1MDIw
MzA5MjgzNVowgYMxCzAJBgNVBAYTAlNJMRIwEAYDVQQHEwlManVibGphbmExDjAM
BgNVBAoTBUFSTkVTMQwwCgYDVQQLEwNBQUkxHTAbBgNVBAMTFEFBSSBNZXRhZGF0
YSBzaWduaW5nMSMwIQYJKoZIhvcNAQkBFhRhYWEtcG9kcG9yYUBhcm5lcy5zaTCB
nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvmW/4Eebdf+zPNdgZ2Cr3BPp/1HJ
UAk+/HIxK9Y2JLU/QsE3zxUoQbbi3Ta182CxVhmRFbfBjT/YwBVT6BlZGCoIKdfH
NSbl3lSFf3l/nz8Ug68IDI62ARJ0VlyASMvnRJ6GOxWU53T4YqekPuMoMIBUlV7N
N+/gBqD+iCaHKTMCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBU5Cv2wnMQbEEbYSMH
x9clNE5t5UlqAA2DZvItE016kxhpaG597Cr+gczufTNxarUBmGEhOviJCoI1wBGX
LnRJZObagrhrIpJpgngbe/+/uSumGuVnBC7lxdtPCpItFtma868SfiYEu/2TZ5Bb
Kwh60xP9QEPbBpSREJxi9x0Ucg==
-----END CERTIFICATE-----
40 changes: 40 additions & 0 deletions mdx/arnes/arnes-beans.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Common beans for ARNES operations.
-->
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

<!--
Fetch the ARNES export metadata aggregate. For the moment, use the production aggregate in lieu
of a designated export aggregate.
-->
<bean id="fetchArnesExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
<property name="id" value="fetchArnesExportAggregate"/>
<property name="parserPool" ref="parserPool"/>
<property name="sourceUrl" value="http://ds.aai.arnes.si/metadata/aai.arnes.si.signed.xml"/>
</bean>

<!--
ARNES signing certificate.
-->
<bean id="arnesSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
<property name="certificateFile">
<bean class="java.io.File">
<constructor-arg value="#{ systemProperties['basedir'] }/mdx/arnes/aai.arnes.si.crt"/>
</bean>
</property>
</bean>

<!--
Check ARNES signing signature.
-->
<bean id="checkArnesSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
<property name="id" value="checkArnesSignature"/>
<property name="verificationCertificate" ref="arnesSigningCertificate"/>
<property name="postProcessFilter">
<bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
</property>
</bean>

</beans>
34 changes: 34 additions & 0 deletions mdx/arnes/arnes-import.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Import pipeline for metadata from ARNES.
-->
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

<!--
Import commonly used beans.
-->
<import resource="../common-beans.xml"/>

<!--
Import ARNES-specific beans.
-->
<import resource="arnes-beans.xml"/>

<bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
<property name="id" value="pipeline"/>
<property name="stages">
<list>
<ref bean="fetchArnesExportAggregate"/>
<ref bean="checkArnesSignature"/>
<ref bean="cleanImport"/>
<ref bean="disassemble"/>
<ref bean="checkSchemas"/>
<ref bean="assemble"/>
</list>
</property>
</bean>

<bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>

</beans>
40 changes: 40 additions & 0 deletions mdx/caf/caf-beans.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Common beans for CAF operations.
-->
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

<!--
Fetch the CAF export metadata aggregate. For the moment, use the production aggregate in lieu
of a designated export aggregate.
-->
<bean id="fetchCafExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
<property name="id" value="fetchCafExportAggregate"/>
<property name="parserPool" ref="parserPool"/>
<property name="sourceUrl" value="https://caf-shibops.ca/CoreServices/cafshib_metadata_signed.xml"/>
</bean>

<!--
CAF signing certificate.
-->
<bean id="cafSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
<property name="certificateFile">
<bean class="java.io.File">
<constructor-arg value="#{ systemProperties['basedir'] }/mdx/caf/cafshib_metadata_verify.pem"/>
</bean>
</property>
</bean>

<!--
Check CAF signing signature.
-->
<bean id="checkCafSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
<property name="id" value="checkCafSignature"/>
<property name="verificationCertificate" ref="cafSigningCertificate"/>
<property name="postProcessFilter">
<bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
</property>
</bean>

</beans>
34 changes: 34 additions & 0 deletions mdx/caf/caf-import.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Import pipeline for metadata from CAF.
-->
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

<!--
Import commonly used beans.
-->
<import resource="../common-beans.xml"/>

<!--
Import CAF-specific beans.
-->
<import resource="caf-beans.xml"/>

<bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
<property name="id" value="pipeline"/>
<property name="stages">
<list>
<ref bean="fetchCafExportAggregate"/>
<ref bean="checkCafSignature"/>
<ref bean="cleanImport"/>
<ref bean="disassemble"/>
<ref bean="checkSchemas"/>
<ref bean="assemble"/>
</list>
</property>
</bean>

<bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>

</beans>
24 changes: 24 additions & 0 deletions mdx/caf/cafshib_metadata_verify.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
-----BEGIN CERTIFICATE-----
MIIEGzCCAwOgAwIBAgIJAIjBzVazWCGZMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV
BAYTAkNBMRMwEQYDVQQKEwplZHVwYXNzLmNhMRYwFAYDVQQLEw1Db3JlIFNlcnZp
Y2VzMSowKAYDVQQDEyFNZXRhZGF0YSBWZXJpZmljYXRpb24gQ2VydGlmaWNhdGUw
HhcNMDgwMTE3MTYwNDIzWhcNMTAwMTE2MTYwNDIzWjBmMQswCQYDVQQGEwJDQTET
MBEGA1UEChMKZWR1cGFzcy5jYTEWMBQGA1UECxMNQ29yZSBTZXJ2aWNlczEqMCgG
A1UEAxMhTWV0YWRhdGEgVmVyaWZpY2F0aW9uIENlcnRpZmljYXRlMIIBIjANBgkq
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsCMnmbvuVGY/N5t5jp1+24v0+jD3UKXt
br1wJN8y2jLbc230s3ZoNV+71qQtnWVaTn+ozYuvwlMW8iPwqMjAwyGb4vbN7MjA
W1R837Y6SQiukK8WMdJag8AN4hjIibTY8a579FBODOQaFDnKD9s105pCNfXa5S6b
Zu3YnISHCXXLJ1PpdzQb+3HK2huL5v5028yhK0hMedyaan+mVmhTtAlqcrpw2o4j
EbPQ0XKM9sIJzZBnaSMnpyafvVxmjCIZqRnSSP1bFo8EFiBI0nOPDjPJB7MMdvXV
XcxO8Nd2EdfN4hyGafJ39TEL4kOA7Y7MK1bAphldofGZEh3cbAhmrQIDAQABo4HL
MIHIMB0GA1UdDgQWBBST5P6qL7qPzbEgitgWKCr5SMQ3FTCBmAYDVR0jBIGQMIGN
gBST5P6qL7qPzbEgitgWKCr5SMQ3FaFqpGgwZjELMAkGA1UEBhMCQ0ExEzARBgNV
BAoTCmVkdXBhc3MuY2ExFjAUBgNVBAsTDUNvcmUgU2VydmljZXMxKjAoBgNVBAMT
IU1ldGFkYXRhIFZlcmlmaWNhdGlvbiBDZXJ0aWZpY2F0ZYIJAIjBzVazWCGZMAwG
A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFoau6YEsurzNPAuYXKKZElE
2Z+2yEi/+rqcRN/qELaUfD9g9KEagMCQVXNavCAZK5bcekyNbAVeWHNUWFcsWLMb
ScM2WpBq/r/hQFTLQ5ibS7GEA75v0JWuUcIaoHCc5z/jmDFk8ioV9IBrsmMvEfrW
Igze8vwpNyqmJwrDZL9xRcS/XJBnNbEIc0VpIem8ccddfygIVka7HZrqv0I5Hc7S
CfWV5agThu+j26Dm8ZS6TJyb2Ge3X3J12xr6XIGbVkqD0kwlUFophYyOV0Mo46Zd
fvoq7pcJ6zkrq85xonqKcZAjdki0E9iW2on4AVETYsGYF9n1b5QqmGspMPROa5U=
-----END CERTIFICATE-----
40 changes: 40 additions & 0 deletions mdx/incommon/incommon-beans.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Common beans for InCommon operations.
-->
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

<!--
Fetch the InCommon export metadata aggregate. For the moment, use the production aggregate in lieu
of a designated export aggregate.
-->
<bean id="fetchInCommonExportAggregate" class="net.shibboleth.metadata.dom.stage.DomHttpSourceStage">
<property name="id" value="fetchInCommonExportAggregate"/>
<property name="parserPool" ref="parserPool"/>
<property name="sourceUrl" value="http://wayf.incommonfederation.org/InCommon/InCommon-metadata.xml"/>
</bean>

<!--
InCommon signing certificate.
-->
<bean id="inCommonSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
<property name="certificateFile">
<bean class="java.io.File">
<constructor-arg value="#{ systemProperties['basedir'] }/mdx/incommon/incommon.pem"/>
</bean>
</property>
</bean>

<!--
Check InCommon signing signature.
-->
<bean id="checkInCommonSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
<property name="id" value="checkInCommonSignature"/>
<property name="verificationCertificate" ref="inCommonSigningCertificate"/>
<property name="postProcessFilter">
<bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
</property>
</bean>

</beans>
34 changes: 34 additions & 0 deletions mdx/incommon/incommon-import.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Import pipeline for metadata from InCommon.
-->
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

<!--
Import commonly used beans.
-->
<import resource="../common-beans.xml"/>

<!--
Import InCommon-specific beans.
-->
<import resource="incommon-beans.xml"/>

<bean id="pipeline" class="net.shibboleth.metadata.pipeline.SimplePipeline">
<property name="id" value="pipeline"/>
<property name="stages">
<list>
<ref bean="fetchInCommonExportAggregate"/>
<ref bean="checkInCommonSignature"/>
<ref bean="cleanImport"/>
<ref bean="disassemble"/>
<ref bean="checkSchemas"/>
<ref bean="assemble"/>
</list>
</property>
</bean>

<bean id="serializer" class="net.shibboleth.metadata.dom.DomMetadataSerializer"/>

</beans>

0 comments on commit 8b1e929

Please sign in to comment.