Bring lv_laife channel up to date with conventions. Add eduGAIN suppo…

…rt for lv_laife.
InCommon · Feb 26, 2013 · 898834b · 898834b
1 parent d1441e3
commit 898834b
Show file tree

Hide file tree

Showing 4 changed files with 145 additions and 11 deletions.
diff --git a/build.xml b/build.xml
@@ -870,7 +870,6 @@
         <CHANNEL.import channel="int_edugain"/>
 		<CHANNEL.do channel="int_edugain" verb="testImport"/>
         <CHANNEL.import channel="jp_gakunin"/>
-        <CHANNEL.import channel="lv_laife"/>
 		<CHANNEL.import channel="nl_surfconext"/>
 		<CHANNEL.import channel="nz_tuakiri"/>
         <CHANNEL.import channel="si_arnes"/>
@@ -898,6 +897,7 @@
     	<CHANNEL.do verb="importProduction" channel="hu_eduid"/>
     	<CHANNEL.do verb="importProduction" channel="in_infed"/>
     	<CHANNEL.do verb="importProduction" channel="it_idem"/>
+    	<CHANNEL.do verb="importProduction" channel="lv_laife"/>
     	<CHANNEL.do verb="importProduction" channel="nl_surfnet"/>
     	<CHANNEL.do verb="importProduction" channel="no_feide"/>
     	<CHANNEL.do verb="importProduction" channel="se_swamid"/>
@@ -922,6 +922,7 @@
     	<CHANNEL.do verb="importEdugain" channel="hr_eduhr"/>
     	<CHANNEL.do verb="importEdugain" channel="hu_eduid"/>
     	<CHANNEL.do verb="importEdugain" channel="it_idem"/>
+    	<CHANNEL.do verb="importEdugain" channel="lv_laife"/>
     	<CHANNEL.do verb="importEdugain" channel="nl_surfnet"/>
     	<CHANNEL.do verb="importEdugain" channel="no_feide"/>
     	<CHANNEL.do verb="importEdugain" channel="se_swamid"/>
@@ -945,6 +946,7 @@
         <CHANNEL.do verb="importEdugainRaw" channel="hr_eduhr"/>
         <CHANNEL.do verb="importEdugainRaw" channel="hu_eduid"/>
         <CHANNEL.do verb="importEdugainRaw" channel="it_idem"/>
+    	<CHANNEL.do verb="importEdugainRaw" channel="lv_laife"/>
         <CHANNEL.do verb="importEdugainRaw" channel="nl_surfnet"/>
         <CHANNEL.do verb="importEdugainRaw" channel="no_feide"/>
         <CHANNEL.do verb="importEdugainRaw" channel="se_swamid"/>

diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
@@ -11,6 +11,16 @@
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
+    <!--
+        Location of various resources.
+    -->
+    <bean id="lv_laife_productionAggregate_url" class="java.lang.String">
+        <constructor-arg value="https://laife.lanet.lv/metadata/laife-metadata.xml"/>
+    </bean>
+    <bean id="lv_laife_edugainAggregate_url" class="java.lang.String">
+        <constructor-arg value="https://laife.lanet.lv/metadata/laife-edugain-metadata.xml"/>
+    </bean>
+
     <!--
         Fetch the production aggregate.
     -->
@@ -19,19 +29,54 @@
         <property name="domResource">
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
                 <constructor-arg name="client" ref="httpClient"/>
-                <constructor-arg name="url" value="https://laife.lanet.lv/metadata/laife-metadata.xml"/>
+                <constructor-arg name="url"    ref="lv_laife_productionAggregate_url"/>
             </bean>
         </property>
     </bean>
 
     <!--
-        Fetch and process the exported entities as a collection.
+        Fetch the eduGAIN export aggregate.
     -->
-    <bean id="lv_laife_exportedEntities" parent="composite_parent"
-        p:id="lv_laife_exportedEntities">
+    <bean id="lv_laife_edugainAggregate" parent="domResourceStage_parent"
+        p:id="lv_laife_edugainAggregate">
+        <property name="domResource">
+            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpResource">
+                <constructor-arg name="client" ref="httpClient"/>
+                <constructor-arg name="url"    ref="lv_laife_edugainAggregate_url"/>
+            </bean>
+        </property>
+    </bean>
+
+    <!--
+        Signing certificate.
+        
+        This certificate is used to sign the eduGAIN aggregate, but the production
+        aggregate is not signed.
+    -->
+    <bean id="lv_laife_signingCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+        <property name="certificateFile">
+            <bean class="java.io.File">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/lv_laife/metadata-signer.crt"/>
+            </bean>
+        </property>
+    </bean>
+
+    <!--
+        Check signing signature.
+    -->
+    <bean id="lv_laife_checkSignature" parent="stage_parent"
+        class="net.shibboleth.metadata.dom.XMLSignatureValidationStage"
+        p:id="lv_laife_checkSignature">
+        <property name="verificationCertificate" ref="lv_laife_signingCertificate"/>
+    </bean>
+
+    <!--
+        Fetch and process the production entities as a collection.
+    -->
+    <bean id="lv_laife_productionEntities" parent="composite_parent"
+        p:id="lv_laife_productionEntities">
         <property name="composedStages">
             <list>
-                <!-- no export aggregate; use the production one instead -->
                 <ref bean="lv_laife_productionAggregate"/>
 
                 <!--
@@ -54,4 +99,38 @@
         </property>
     </bean>
 
+    <!--
+        Fetch and process the eduGAIN export entities as a collection.
+    -->
+    <bean id="lv_laife_edugainEntities" parent="composite_parent"
+        p:id="lv_laife_edugainEntities">
+        <property name="composedStages">
+            <list>
+                <ref bean="lv_laife_edugainAggregate"/>
+
+                <!--
+                    Check for fatal errors at the aggregate level:
+                        missing or expired validUntil attribute
+                        invalid signature
+                -->
+                <ref bean="check_validUntil"/>
+                <ref bean="lv_laife_checkSignature"/>
+                <ref bean="errorTerminatingFilter"/>
+
+                <ref bean="disassemble"/>
+
+                <ref bean="standardImportActions"/>
+
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+
+            </list>
+        </property>
+    </bean>
+
+    <!--
+        Select primary export aggregate.
+    -->
+    <alias alias="lv_laife_exportedAggregate" name="lv_laife_edugainAggregate"/>
+    <alias alias="lv_laife_exportedEntities"  name="lv_laife_edugainEntities"/>
 </beans>
diff --git a/mdx/lv_laife/metadata-signer.crt b/mdx/lv_laife/metadata-signer.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFKDCCAxACCQDGdspjaWjwIzANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJM
+VjEPMA0GA1UECBMGTGF0dmlhMQ0wCwYDVQQHEwRSaWdhMQ4wDAYDVQQKEwVMQU5F
+VDEXMBUGA1UEAxMObGFpZmUubGFuZXQubHYwHhcNMTIxMTA4MTQxNzE1WhcNMTcx
+MTA3MTQxNzE1WjBWMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0dmlhMQ0wCwYD
+VQQHEwRSaWdhMQ4wDAYDVQQKEwVMQU5FVDEXMBUGA1UEAxMObGFpZmUubGFuZXQu
+bHYwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD0/L1HVJMVz7ffHQEs
+mu+/cfNIBDzodcyJJTA8r+Z9UQCbzx6zsxEG+ZQHtr/2/QSBofirdxuGg8aRY/qN
+1MZstyKJTK7h+qdnS7nH8/wMG/x5c2oHQeuiAY8TKHSWPVlPOGuxs8twDFZxNEtz
+OfrusjU5agZk1LALns4IST+0FKFbabdKDoBM6dFQUoUKDSUvuY+Quk4VY3kj6JCU
+Qe9OIsh8gxu+Q4WfgfSB+9ZLM8dXNp31NGT1CqhRL8EFbxtHUYlP7u7CKKnakNqW
+4rQUlm8J3s/OJwUWbo1ruAXiBPyj4VUIXQDJrQQVwpJ2a4Rhs53iLUQmlFCiwV0V
+U73ObRich5Q4J3kFewTgq7zeb6VOwqAuO0l4RGtmVFlvFDRZDNopSdp3bgGXYjBj
+PMrt4/oRD/Y0JmBcH3NK0iAH4bSRuWARcYY6pdQ4sjWE91ZGMIU5SGM24TZAFtZI
+udtfuS9JzuBZ2Hc6NYUFeGDFgfXkZHEyzP7rGQjYWMNDQHlPdB8VqB3DFpEkypJs
+qZ1eMq6rmd+61mgaxGioizQPDZp29Y8uUmqk+pybNeUSXAIzgerCL4d5z/X6qqHZ
+oblKOzIUVMX9AsivpDs873lgBotckXbfNv5q2sARUVNR+Ss2ESjMGT+EjjCU60Cq
+KYeMsYi5MFBbvgAmp4MikQ0BqwIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQBgZjl8
+xBvGRSbh7tvsXpC4Ly2a6dBOvf0P9s/rIiWIiNEI7L6MlW2vxMngmRHCLfJXx8dH
+R7qigO6yhHf8l6hvRMGUIOam4X3N5eZs7reFPbpzK9OZLGAZh7TouMx65Vga0OZr
+yRoilysNW8Cra44yy1FPdg3yFo5tVR3EvjMYNi3m9PAbIaANxUFFI2yPPIalFbiJ
+fOUKiIb0+64SreaeJHdjjBNpzna+ZaFUW01tck6bQvt2PKx9EVVKT86nA3M32fRy
+9YcWCsywTkTpp3OoeFpqfQK46TzdBqoiQ9dWRhsuZYSWNdtotGtIHxvAUjqccvNJ
+6B/b8xO4uI1/LbHL8SF+fQo3wGOypvOmng+lDCX38eMInVlqggIcQU5OteoQtJhS
+MBvZ+Db/0PfOH90xBZ+ppFIQUMx4603k1udoE/zKCxHKyt7wl1Dnf54YK84+FkRB
+Xp6rgsaOLwCFCpcy4hXQ4+yONhglWzoBU4xHisBkc7Vd7v3K/sD9RMOua1uMjXOW
+8jjyQxhE8GLNoWejYym+KCHci3ZZHpx+Zk57bKHhSo+R+flrmbVZv/Eu/lwBV1tM
+oYa720fadJrWf67O7dx946YE5iC1E6XwaYrTY8zisVV7gDM+6uWwdmGUkvcf3Xv5
+eNb3ypwMXRDvvcQV/ik8bZAIlNhW0/C8C2d3LA==
+-----END CERTIFICATE-----
diff --git a/mdx/lv_laife/verbs.xml b/mdx/lv_laife/verbs.xml
@@ -30,19 +30,19 @@
         </property>
     </bean>
 
-    <bean id="import" parent="pipeline_parent"
-        p:id="import">
+    <bean id="importProduction" parent="pipeline_parent"
+        p:id="importProduction">
         <property name="stages">
             <list>
-                <ref bean="lv_laife_exportedEntities"/>
+                <ref bean="lv_laife_productionEntities"/>
                 <ref bean="standardImportTail"/>
                 <ref bean="serializeImported"/>
             </list>
         </property>
     </bean>
 
-    <bean id="importRaw" parent="pipeline_parent"
-        p:id="importRaw">
+    <bean id="importProductionRaw" parent="pipeline_parent"
+        p:id="importProductionRaw">
         <property name="stages">
             <list>
                 <ref bean="lv_laife_productionAggregate"/>
@@ -51,4 +51,27 @@
         </property>
     </bean>
 
+    <bean id="importEdugain" parent="pipeline_parent"
+        p:id="importEdugain">
+        <property name="stages">
+            <list>
+                <ref bean="lv_laife_edugainEntities"/>
+                <ref bean="standardImportTail"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="importEdugainRaw" parent="pipeline_parent"
+        p:id="importEdugainRaw">
+        <property name="stages">
+            <list>
+                <ref bean="lv_laife_edugainAggregate"/>
+                <ref bean="serializeImported"/>
+            </list>
+        </property>
+    </bean>
+
+    <alias alias="import"    name="importEdugain"/>
+    <alias alias="importRaw" name="importEdugainRaw"/>
 </beans>