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

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@iay
iay committed Apr 13, 2016
2 parents 9b4b5f2 + 56ea82d commit bdd2532
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 199 deletions.
6 changes: 6 additions & 0 deletions mdx/_rules/check_mdui.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@
</xsl:call-template>
</xsl:if>

<xsl:if test="contains(., '&#xA0;')">
<xsl:call-template name="error">
<xsl:with-param name="m">mdui:Logo contains non-breaking space</xsl:with-param>
</xsl:call-template>
</xsl:if>

<!--
Require that the URL starts with https://
Expand Down
9 changes: 9 additions & 0 deletions mdx/_rules/check_saml2meta.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@
-->

<xsl:template match="md:SPSSODescriptor">

<xsl:variable name="indices" select="md:ArtifactResolutionService/@index"/>
<xsl:variable name="distinct.indices" select="set:distinct($indices)"/>
<xsl:if test="count($indices) != count($distinct.indices)">
<xsl:call-template name="error">
<xsl:with-param name="m">ArtifactResolutionService index values not all different</xsl:with-param>
</xsl:call-template>
</xsl:if>

<xsl:variable name="indices" select="md:AssertionConsumerService/@index"/>
<xsl:variable name="distinct.indices" select="set:distinct($indices)"/>
<xsl:if test="count($indices) != count($distinct.indices)">
Expand Down
18 changes: 4 additions & 14 deletions mdx/common-beans.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1032,13 +1032,8 @@
A pipeline stage that removes all XML comments from items.
-->

<bean id="stripComments" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="ClassPathResource">
<constructor-arg value="strip-comments.xsl"/>
</bean>
</property>
</bean>
<bean id="stripComments" parent="XSLTransformationStage"
p:XSLResource="classpath:strip-comments.xsl"/>

<!--
everythingSelector
Expand Down Expand Up @@ -1075,13 +1070,8 @@
presented, for example by removing redundant attributes or elements which only have
meaning when added by the UK federation registrar.
-->
<bean id="cleanImport" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="ClassPathResource">
<constructor-arg value="clean-import.xsl"/>
</bean>
</property>
</bean>
<bean id="cleanImport" parent="XSLTransformationStage"
p:XSLResource="classpath:clean-import.xsl"/>

<!--
trimImportElementWhitespace
Expand Down
4 changes: 0 additions & 4 deletions mdx/conventions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ An underscore ('`_`') at the start of a directory name indicates that the direct

Note that the `schema` directory is functional but does not follow this convention, instead following the convention established for classpath schema resources used by the Shibboleth project.

### OpenSSL Blacklists Directory

The `_openssl_blacklists` directory holds a copy of the Debian weak key blacklists, extracted from Debian 7.2 "Wheezy". These blacklists are in OpenSSL format.

### Ruleset Directory

The `_rules` subdirectory of `/mdx/` holds checking rulesets.
Expand Down
9 changes: 2 additions & 7 deletions mdx/int_cobweb/beans.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,8 @@
<!--
Signing certificate.
-->
<bean id="int_cobweb_signingCertificate" parent="X509CertificateFactoryBean">
<property name="certificateFile">
<bean class="java.io.File">
<constructor-arg value="${basedir}/mdx/int_cobweb/cobweb.pem"/>
</bean>
</property>
</bean>
<bean id="int_cobweb_signingCertificate" parent="X509CertificateFactoryBean"
p:resource="classpath:int_cobweb/cobweb.pem"/>

<!--
Check signing signature.
Expand Down
10 changes: 3 additions & 7 deletions mdx/int_edugain/verbs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,9 @@
p:designatedEntities-ref="int_edugain_verify_blacklist"/>

<!-- flag up any remaining entities -->
<bean id="check_recovered" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/int_edugain/check_recovered.xsl"/>
</bean>
</property>
</bean>
<bean id="check_recovered" parent="XSLValidationStage"
p:XSLResource="classpath:int_edugain/check_recovered.xsl"/>

<ref bean="errorTerminatingFilter"/>
</list>
</property>
Expand Down
11 changes: 2 additions & 9 deletions mdx/test/beans.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,8 @@
<!--
Fetch the aggregate aggregate.
-->
<bean id="test_aggregate" parent="stage_parent"
class="net.shibboleth.metadata.dom.DomFilesystemSourceStage">
<property name="parserPool" ref="parserPool"/>
<property name="source">
<bean class="java.io.File">
<constructor-arg value="${basedir}/mdx/test/input.xml"/>
</bean>
</property>
</bean>
<bean id="test_aggregate" parent="DOMResourceSourceStage"
p:DOMResource="classpath:test/input.xml"/>

<!--
Fetch and process the entities as a collection.
Expand Down
105 changes: 24 additions & 81 deletions mdx/uk/beans.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,8 @@
<!--
Metadata signing certificate.
-->
<bean id="uk_signingCertificate" parent="X509CertificateFactoryBean">
<property name="certificateFile">
<bean class="java.io.File">
<constructor-arg value="${basedir}/mdx/uk/ukfederation-2014.pem"/>
</bean>
</property>
</bean>
<bean id="uk_signingCertificate" parent="X509CertificateFactoryBean"
p:resource="classpath:uk/ukfederation-2014.pem"/>


<!--
Expand Down Expand Up @@ -143,12 +138,8 @@
This transform can be run on individual EntityDescriptors or on an
aggregate EntitiesDescriptor.
-->
<bean id="uk_processScopes" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="ClassPathResource">
<constructor-arg value="uk/scopes.xsl"/>
</bean>
</property>
<bean id="uk_processScopes" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/scopes.xsl">
<property name="transformParameters">
<map>
<entry key="members" value-ref="uk_members"/>
Expand Down Expand Up @@ -197,26 +188,17 @@
Adds "mailto:" to md:EmailAddress elements which don't already have it.
-->
<bean id="uk_fix_mailto" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="ClassPathResource">
<constructor-arg value="uk/fix_mailto.xsl"/>
</bean>
</property>
</bean>
<bean id="uk_fix_mailto" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/fix_mailto.xsl"/>


<!--
check_ukreg
Checks specific to the UK registrar function.
-->
<bean id="check_ukreg" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_ukreg.xsl"/>
</bean>
</property>
<bean id="check_ukreg" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_ukreg.xsl">
<property name="transformParameters">
<map>
<entry key="members" value-ref="uk_members"/>
Expand All @@ -228,63 +210,38 @@
<!--
check_uk_keydesc_key
-->
<bean id="check_uk_keydesc_key" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_uk_keydesc_key.xsl"/>
</bean>
</property>
</bean>
<bean id="check_uk_keydesc_key" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_uk_keydesc_key.xsl"/>


<!--
check_uk_mdattr
-->
<bean id="check_uk_mdattr" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_uk_mdattr.xsl"/>
</bean>
</property>
</bean>
<bean id="check_uk_mdattr" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_uk_mdattr.xsl"/>


<!--
check_uk_mdrps
-->
<bean id="check_uk_mdrps" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_uk_mdrps.xsl"/>
</bean>
</property>
</bean>
<bean id="check_uk_mdrps" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_uk_mdrps.xsl"/>


<!--
check_uk_urlenc
-->
<bean id="check_uk_urlenc" parent="XSLValidationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/check_uk_urlenc.xsl"/>
</bean>
</property>
</bean>
<bean id="check_uk_urlenc" parent="XSLValidationStage"
p:XSLResource="classpath:uk/check_uk_urlenc.xsl"/>


<!--
uk_processFragment
This stage performs any standard cleanup required for UK federation fragment files.
-->
<bean id="uk_processFragment" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="ClassPathResource">
<constructor-arg value="uk/fragment.xsl"/>
</bean>
</property>
</bean>
<bean id="uk_processFragment" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/fragment.xsl"/>


<!--
Expand Down Expand Up @@ -428,13 +385,8 @@
Strip those UK federation extensions which we never publish.
-->
<bean id="uk_stripExtensions" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="ClassPathResource">
<constructor-arg value="uk/strip_extensions.xsl"/>
</bean>
</property>
</bean>
<bean id="uk_stripExtensions" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/strip_extensions.xsl"/>


<!--
Expand All @@ -452,13 +404,8 @@
used in an XML document. This one is UK-specific, as it makes specific choices
in order to limit the number of prefixes used.
-->
<bean id="uk_normaliseNamespaces" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="FileSystemResource">
<constructor-arg value="${basedir}/mdx/uk/ns_norm_uk.xsl"/>
</bean>
</property>
</bean>
<bean id="uk_normaliseNamespaces" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/ns_norm_uk.xsl"/>

<!--
*************************************************
Expand Down Expand Up @@ -523,12 +470,8 @@
Input is an aggregate of all registered entities, output is the HTML statistics.
-->
<bean id="uk_generateStatistics" parent="XSLTransformationStage">
<property name="XSLResource">
<bean parent="ClassPathResource">
<constructor-arg value="uk/statistics.xsl"/>
</bean>
</property>
<bean id="uk_generateStatistics" parent="XSLTransformationStage"
p:XSLResource="classpath:uk/statistics.xsl">
<property name="transformParameters">
<map>
<entry key="memberDocument" value-ref="uk_membersDocument"/>
Expand Down
Loading

0 comments on commit bdd2532

Please sign in to comment.