Merge remote-tracking branch 'upstream/master'

internet2 · Jul 15, 2014 · fcd2900 · fcd2900
2 parents f3e40b6 + 0947c2c
commit fcd2900
Show file tree

Hide file tree

Showing 79 changed files with 369 additions and 304 deletions.
diff --git a/build.xml b/build.xml
@@ -442,6 +442,30 @@
 	    ***************************
 	-->
 
+	<!--
+	    Property definitions for the mda tool.
+	    
+	    Any Ant property with a name of the form "mda.*" is passed through
+	    as a system property to the mda invocation with the "mda." stripped
+	    off. Thus, a property "mda.foo" will be passed through as a system
+	    property called "foo".
+	    
+	    The individual properties listed here can be augmented or overridden
+	    by properties defined in the external properties files, e.g., build.properties.
+	-->
+    <property name="mda.java.endorsed.dirs" value="${tools.mda}/lib/endorsed"/>
+    <property name="mda.basedir" value="${basedir}"/>
+    <property name="mda.rulesdir" value="${rules.dir}"/>
+
+	<!--
+	    Build a property set of all the properties to be passed through, with
+	    the "mda." prefix stripped off.
+	-->
+	<propertyset id="mda.properties">
+        <propertyref prefix="mda."/>
+	    <mapper type="glob" from="mda.*" to="*"/>
+	</propertyset>
+
 	<!--
 	    Macro to run the mda (metadata aggregator CLI) tool.
 	-->
@@ -471,9 +495,9 @@
                         <include name="ukf-members-*.jar"/>
                     </fileset>
                 </classpath>
-                <jvmarg value="-Djava.endorsed.dirs=${tools.mda}/lib/endorsed"/>
-            	<jvmarg value="-Dbasedir=${basedir}"/>
-            	<jvmarg value="-Drulesdir=${rules.dir}"/>
+                <syspropertyset>
+                    <propertyset refid="mda.properties"/>
+                </syspropertyset>
             	<jvmarg value="-enableassertions"/>
             	<arg value="--quiet"/>
             	<arg value="@{config}"/>
@@ -1383,7 +1407,14 @@
         List all the properties ant is using.
     -->
     <target name="echoproperties">
+    	<echo>All properties:</echo>
         <echoproperties/>
+    	<echo>MDA properties:</echo>
+    	<echoproperties>
+    		<propertyset>
+    			<propertyset refid="mda.properties"/>
+    		</propertyset>
+    	</echoproperties>
     </target>
 
 </project>
diff --git a/mdx/_openssl_blacklists/compromised-2048.txt b/mdx/_openssl_blacklists/compromised-2048.txt
@@ -0,0 +1,15 @@
+#
+# This is a list of known-compromised 2048-bit keys in OpenSSL format.
+#
+# Derive new values from a private key file as follows:
+#
+#   openssl rsa -noout -modulus -in /tmp/key.pem | sha1sum | \
+#       cut -d ' ' -f 1 | cut -c 21-
+#
+# You can also derive a new blacklist value from an X.509 certificate as follows:
+#
+#   openssl x509 -noout -modulus -in /tmp/cert.pem | sha1sum | \
+#       cut -d ' ' -f 1 | cut -c 21-
+#
+# Shibboleth IdP dummy key, shipped in 3.0.0-alpha1 release
+959a1a153444578d010b
diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Location of various resources.
@@ -56,7 +56,7 @@
     <bean id="at_aconet_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/at_aconet/aconet-aai-metadata-signing.crt"/>
+                <constructor-arg value="${basedir}/mdx/at_aconet/aconet-aai-metadata-signing.crt"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/at_aconet/verbs.xml b/mdx/at_aconet/verbs.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Import commonly used beans.
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/at_aconet/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/at_aconet/imported.xml"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Fetch the production aggregate.
@@ -31,7 +31,7 @@
     <bean id="au_aaf_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/au_aaf/aaf-metadata-cert.pem"/>
+                <constructor-arg value="${basedir}/mdx/au_aaf/aaf-metadata-cert.pem"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/au_aaf/verbs.xml b/mdx/au_aaf/verbs.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Import commonly used beans.
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/au_aaf/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/au_aaf/imported.xml"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Location of various resources.
@@ -54,7 +54,7 @@
     <bean id="be_belnet_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/be_belnet/certificate.federation.belnet.be.pem"/>
+                <constructor-arg value="${basedir}/mdx/be_belnet/certificate.federation.belnet.be.pem"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/be_belnet/verbs.xml b/mdx/be_belnet/verbs.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Import commonly used beans.
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/be_belnet/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/be_belnet/imported.xml"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Location of various resources.
@@ -54,7 +54,7 @@
     <bean id="br_cafe_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/br_cafe/metadata.crt"/>
+                <constructor-arg value="${basedir}/mdx/br_cafe/metadata.crt"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/br_cafe/verbs.xml b/mdx/br_cafe/verbs.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Import commonly used beans.
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/br_cafe/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/br_cafe/imported.xml"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Location of various resources.
@@ -56,7 +56,7 @@
     <bean id="ca_caf_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ca_caf/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/ca_caf/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>
@@ -77,7 +77,7 @@
     <bean id="ca_caf_cafShibSigningCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ca_caf/cafshib_metadata_verify.crt"/>
+                <constructor-arg value="${basedir}/mdx/ca_caf/cafshib_metadata_verify.crt"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/ca_caf/verbs.xml b/mdx/ca_caf/verbs.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Import commonly used beans.
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ca_caf/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/ca_caf/imported.xml"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Location of various resources.
@@ -54,7 +54,7 @@
     <bean id="ch_switchaai_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ch_switchaai/metadata.crt"/>
+                <constructor-arg value="${basedir}/mdx/ch_switchaai/metadata.crt"/>
             </bean>
         </property>
     </bean>
@@ -65,7 +65,7 @@
     <bean id="ch_switchaai_interfedSigningCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ch_switchaai/interfed.crt"/>
+                <constructor-arg value="${basedir}/mdx/ch_switchaai/interfed.crt"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/ch_switchaai/verbs.xml b/mdx/ch_switchaai/verbs.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Import commonly used beans.
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/ch_switchaai/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/ch_switchaai/imported.xml"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/cl_cofre/beans.xml b/mdx/cl_cofre/beans.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Location of various resources.
@@ -39,7 +39,7 @@
     <bean id="cl_cofre_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cl_cofre/metadata-signer.crt"/>
+                <constructor-arg value="${basedir}/mdx/cl_cofre/metadata-signer.crt"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/cl_cofre/verbs.xml b/mdx/cl_cofre/verbs.xml
@@ -9,8 +9,8 @@
     xmlns:util="http://www.springframework.org/schema/util"
     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
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <!--
         Import commonly used beans.
@@ -26,7 +26,7 @@
         p:id="serializeImported">
         <property name="outputFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/cl_cofre/imported.xml"/>
+                <constructor-arg value="${basedir}/mdx/cl_cofre/imported.xml"/>
             </bean>
         </property>
     </bean>