Skip to content

Commit

Permalink
Simplify rules for export aggregate
Browse files Browse the repository at this point in the history 
Remove from both export aggregates:
* Filter for SAML-1-only IdPs (we no longer have any registered)
* Filter for a specific entity that is no longer registered.
See ukf/ukf-meta#190.
  • Loading branch information
@iay
iay committed Sep 3, 2019
1 parent 3582ceb commit 6a7c457
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions mdx/uk/generate.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,13 +657,6 @@
<property name="stages">
<list>

<!-- Identity providers lacking support for SAML 2.0 -->
<bean id="SAML1onlyIdPs" parent="mda.XPathFilteringStage"
p:namespaceContext-ref="commonNamespaces"
p:XPathExpression="md:IDPSSODescriptor
[not(contains(@protocolSupportEnumeration,'urn:oasis:names:tc:SAML:2.0:protocol'))]">
</bean>

<!-- Aggregated schools sector identity providers -->
<!--
Preferred implementation:
Expand All @@ -678,14 +671,6 @@
<bean id="syntheticScopes" parent="mda.XPathFilteringStage"
p:namespaceContext-ref="commonNamespaces"
p:XPathExpression="//shibmd:Scope[contains(., '.eng.ukfederation.org.uk')]"/>
<!-- Specific providers not caught by the previous condition -->
<bean id="GlowScotland" parent="mda.EntityFilterStage">
<property name="designatedEntities">
<set>
<value>https://idp.glowscotland.org.uk/shibboleth</value>
</set>
</property>
</bean>

<!-- Identity providers with regular expression scopes -->
<bean id="regexScopes" parent="mda.XPathFilteringStage"
Expand Down Expand Up @@ -772,13 +757,6 @@
<property name="stages">
<list>

<!-- Identity providers lacking support for SAML 2.0 -->
<bean id="SAML1onlyIdPs" parent="mda.XPathFilteringStage"
p:namespaceContext-ref="commonNamespaces"
p:XPathExpression="md:IDPSSODescriptor
[not(contains(@protocolSupportEnumeration,'urn:oasis:names:tc:SAML:2.0:protocol'))]">
</bean>

<!-- Aggregated schools sector identity providers -->
<!--
Preferred implementation:
Expand All @@ -793,14 +771,6 @@
<bean id="syntheticScopes" parent="mda.XPathFilteringStage"
p:namespaceContext-ref="commonNamespaces"
p:XPathExpression="//shibmd:Scope[contains(., '.eng.ukfederation.org.uk')]"/>
<!-- Specific providers not caught by the previous condition -->
<bean id="GlowScotland" parent="mda.EntityFilterStage">
<property name="designatedEntities">
<set>
<value>https://idp.glowscotland.org.uk/shibboleth</value>
</set>
</property>
</bean>

<!-- Identity providers with regular expression scopes -->
<bean id="regexScopes" parent="mda.XPathFilteringStage"
Expand Down

0 comments on commit 6a7c457

Please sign in to comment.