[java-identity-provider] branch master updated: IDP-1456 imp, ement matchers based on the shibmd:scope

Rod Widdowson rdw at steadingsoftware.com
Fri May 31 09:59:03 EDT 2019


This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=76b958e23dc8bfe8a50aef1120ef080d7698daa0

The following commit(s) were added to refs/heads/master by this push:
       new  76b958e   IDP-1456 imp,ement matchers based on the shibmd:scope
76b958e is described below

commit 76b958e23dc8bfe8a50aef1120ef080d7698daa0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 31 14:56:20 2019 +0100

    IDP-1456 imp,ement matchers based on the shibmd:scope
    
    https://issues.shibboleth.net/jira/browse/IDP-1456
    
    AttributeScopeMatchesShibMDScope, AttributeValueMatchesShibMDScope classes
    and associated tests.
---
 .../impl/AbstractMatchesShibMDScopeMatcher.java    | 150 +++++++++++++++++
 .../impl/AttributeScopeMatchesShibMDScope.java     |  46 ++++++
 .../impl/AttributeValueMatchesShibMDScope.java     |  52 ++++++
 .../saml/impl/ScopeMatchesShibMDScopeTests.java    | 180 +++++++++++++++++++++
 .../idp/filter/impl/saml/shibmd-metadata.xml       |  43 +++++
 5 files changed, 471 insertions(+)

diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AbstractMatchesShibMDScopeMatcher.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AbstractMatchesShibMDScopeMatcher.java
new file mode 100644
index 0000000..219d32d
--- /dev/null
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AbstractMatchesShibMDScopeMatcher.java
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements.  See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.shibboleth.idp.attribute.filter.matcher.saml.impl;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
+import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import org.opensaml.saml.saml2.metadata.RoleDescriptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.filter.Matcher;
+import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
+import net.shibboleth.idp.saml.metadata.ScopesContainer;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+
+/**
+ * Base class for filters which rely on the issuer's <shibmd:scope> extensions.
+ */
+
+public abstract class AbstractMatchesShibMDScopeMatcher
+                extends AbstractIdentifiableInitializableComponent implements Matcher {
+
+    /** Class logger. */
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractMatchesShibMDScopeMatcher.class);
+
+    /** The String used to prefix log message. */
+    private String logPrefix;
+
+    /** {@inheritDoc} */
+    @Override protected void doInitialize() throws ComponentInitializationException {
+        super.doInitialize();
+        // Id is now definitive, reset log prefix
+        logPrefix = null;
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    // CheckStyle: CyclomaticComplexity OFF
+    @Override @Nonnull @NonnullElements @Unmodifiable public Set<IdPAttributeValue> getMatchingValues(
+            @Nonnull final IdPAttribute attribute, @Nonnull final AttributeFilterContext filterContext) {
+
+        final SAMLMetadataContext issuerContext = filterContext.getIssuerMetadataContext();
+        if (issuerContext == null) {
+            LOG.warn("{} internal error: no IssueContext found",
+                    getLogPrefix());
+            return Collections.EMPTY_SET;
+        }
+        final RoleDescriptor roleDescriptor = issuerContext.getRoleDescriptor();
+        final EntityDescriptor entityDescriptor = issuerContext.getEntityDescriptor();
+        final List<ScopesContainer> roleContainers;
+        if (roleDescriptor == null) {
+            LOG.debug("{} No Role Descriptor found");
+            roleContainers = Collections.EMPTY_LIST;
+        } else {
+            roleContainers = roleDescriptor.getObjectMetadata().get(ScopesContainer.class);
+        }
+        
+        final List<ScopesContainer> entityContainers;
+        if (entityDescriptor == null) {
+            LOG.debug("{} No Entity Descriptor found");
+            entityContainers = Collections.EMPTY_LIST;
+        } else {
+            entityContainers= entityDescriptor.getObjectMetadata().get(ScopesContainer.class);
+        }
+        final Set<IdPAttributeValue> matchedValues = new LinkedHashSet<>(attribute.getValues().size());
+        LOG.debug("{} Applying shibmd scope comparison to all values of Attribute '{}'",
+                getLogPrefix(),
+                attribute.getId());
+
+        if (entityContainers.isEmpty() && roleContainers.isEmpty()) {
+            LOG.debug("{} No <shibmd:Scope> found for {}, no atributes matched",
+                    getLogPrefix(),
+                    entityDescriptor == null? "<unknown>" : entityDescriptor.getID());
+            return Collections.EMPTY_SET;
+        }
+        
+        for (final IdPAttributeValue value : attribute.getValues()) {
+            final String compareString = getCompareString(value);
+            
+            if (compareString == null) {
+                LOG.trace("{} not adding null-valued value {}", getLogPrefix(), value.getNativeValue().toString());
+            } else {
+                if (roleContainers.stream().anyMatch(e -> e.matchesScope(compareString))||
+                    entityContainers.stream().anyMatch(e -> e.matchesScope(compareString))) {
+                    LOG.trace("{} {} matches, adding value {}", getLogPrefix(), compareString,
+                            value.getNativeValue().toString());
+                    matchedValues.add(value);
+                }
+            }
+        }
+        LOG.debug("{} returning {} values", getLogPrefix(), matchedValues.size());
+        return Collections.unmodifiableSet(matchedValues);
+    }
+    // CheckStyle: CyclomaticComplexity ON
+
+    /** Return the string we want to compare with for the provided value. 
+     * @param value the vaue we are interested.
+     * @return the string, or null if empty of not relevant.
+     */
+    @Nullable @NotEmpty protected abstract String getCompareString(IdPAttributeValue value);
+
+    /**
+     * Return a string which is to be prepended to all log messages.
+     * 
+     * @return "Attribute Filter '<filterID>' :"
+     */
+    protected String getLogPrefix() {
+        // local cache of cached entry to allow unsynchronised clearing.
+        String prefix = logPrefix;
+        if (null == prefix) {
+            final StringBuilder builder = new StringBuilder("Attribute Filter '").append(getId()).append("':");
+            prefix = builder.toString();
+            if (null == logPrefix) {
+                logPrefix = prefix;
+            }
+        }
+        return prefix;
+    }
+
+}
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeScopeMatchesShibMDScope.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeScopeMatchesShibMDScope.java
new file mode 100644
index 0000000..a98463b
--- /dev/null
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeScopeMatchesShibMDScope.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements.  See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.shibboleth.idp.attribute.filter.matcher.saml.impl;
+
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.ScopedStringAttributeValue;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
+/** Class to implement a filter of scopes against <shibmd:scope>. */
+public class AttributeScopeMatchesShibMDScope extends AbstractMatchesShibMDScopeMatcher {
+
+    /** Class logger. */
+    private static final Logger LOG = LoggerFactory.getLogger(AttributeScopeMatchesShibMDScope.class);
+
+    /** {@inheritDoc} */
+    @Nullable @NotEmpty protected String getCompareString(final IdPAttributeValue value) {
+        if (value instanceof ScopedStringAttributeValue) {
+            return StringSupport.trimOrNull(((ScopedStringAttributeValue) value).getScope());
+        }
+        LOG.warn( "{} value of type {} and value {} not suitable for filtering",
+                getLogPrefix(), value.getClass(), value.getNativeValue());
+        return null;
+    }
+
+}
diff --git a/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeValueMatchesShibMDScope.java b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeValueMatchesShibMDScope.java
new file mode 100644
index 0000000..9fa06c3
--- /dev/null
+++ b/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/AttributeValueMatchesShibMDScope.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements.  See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.shibboleth.idp.attribute.filter.matcher.saml.impl;
+
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.ScopedStringAttributeValue;
+import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
+/** Class to implement a filter of string values against <shibmd:scope>. */
+public class AttributeValueMatchesShibMDScope extends AbstractMatchesShibMDScopeMatcher {
+
+    /** Class logger. */
+    private static final Logger LOG = LoggerFactory.getLogger(AttributeValueMatchesShibMDScope.class);
+
+    
+    /** {@inheritDoc} */
+    @Nullable @NotEmpty protected String getCompareString(final IdPAttributeValue value) {
+        if (value instanceof ScopedStringAttributeValue) {
+            LOG.warn("{} lossy test of AttributeValueMatchesShibMDScope against scoped Attribute value {}",
+                    getLogPrefix(), value.getNativeValue());
+        }
+        if (value instanceof StringAttributeValue) {
+            return StringSupport.trimOrNull(((StringAttributeValue)value).getValue());
+        }
+
+        LOG.warn("{} value of type {} and value {} not suitable for filtering",
+                    getLogPrefix(), value.getClass(), value.getNativeValue());
+        return null;
+    }
+}
diff --git a/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/ScopeMatchesShibMDScopeTests.java b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/ScopeMatchesShibMDScopeTests.java
new file mode 100644
index 0000000..1e198bb
--- /dev/null
+++ b/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/matcher/saml/impl/ScopeMatchesShibMDScopeTests.java
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements.  See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.shibboleth.idp.attribute.filter.matcher.saml.impl;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+import org.opensaml.core.criterion.EntityIdCriterion;
+import org.opensaml.core.xml.XMLObjectBaseTestCase;
+import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
+import org.opensaml.saml.metadata.resolver.filter.impl.NodeProcessingMetadataFilter;
+import org.opensaml.saml.metadata.resolver.impl.ResourceBackedMetadataResolver;
+import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import org.springframework.core.io.ClassPathResource;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import net.shibboleth.ext.spring.resource.ResourceHelper;
+import net.shibboleth.idp.attribute.IdPAttribute;
+import net.shibboleth.idp.attribute.IdPAttributeValue;
+import net.shibboleth.idp.attribute.ScopedStringAttributeValue;
+import net.shibboleth.idp.attribute.StringAttributeValue;
+import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
+import net.shibboleth.idp.saml.metadata.impl.ScopesNodeProcessor;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
+import net.shibboleth.utilities.java.support.resolver.ResolverException;
+
+/**
+ * Tests for {@link AttributeScopeMatchesShibMDScope} and {@link AttributeValueMatchesShibMDScope} matchers.
+ */
+public class ScopeMatchesShibMDScopeTests extends XMLObjectBaseTestCase {
+
+    private final static String bothEntityID = "https://both.example.org/idp/shibboleth";
+    private final static String noneEntityID = "https://none.example.org/idp/shibboleth";
+    private final static String aaEntityID = "https://aa.example.org/idp/shibboleth";
+    private final static String entityEntityID = "https://entity.example.org/idp/shibboleth";
+    
+    ResourceBackedMetadataResolver resolver;
+    
+    private final AttributeScopeMatchesShibMDScope scopeMatcher = new AttributeScopeMatchesShibMDScope();
+    private final AttributeValueMatchesShibMDScope valueMatcher = new AttributeValueMatchesShibMDScope();
+    
+    
+    @BeforeClass public void setup() throws IOException, ComponentInitializationException {
+        scopeMatcher.setId("scopeMatcher");
+        scopeMatcher.initialize();
+        valueMatcher.setId("valueMatcher");
+        valueMatcher.initialize();
+
+        NodeProcessingMetadataFilter filter = new NodeProcessingMetadataFilter();
+        filter.setNodeProcessors(List.of(new ScopesNodeProcessor()));
+        filter.initialize();
+        
+        resolver = 
+                new ResourceBackedMetadataResolver(ResourceHelper.of(
+                        new ClassPathResource("/net/shibboleth/idp/filter/impl/saml/shibmd-metadata.xml")));
+        resolver.setMetadataFilter(filter);
+        resolver.setId("resolver");
+        resolver.setParserPool(parserPool);
+        resolver.initialize();
+    }
+    
+    private AttributeFilterContext filterContextFor(final EntityDescriptor entity) {
+        final SAMLMetadataContext metadataContext = new SAMLMetadataContext();
+        metadataContext.setEntityDescriptor(entity);
+        metadataContext.setRoleDescriptor(entity.getRoleDescriptors().get(0));
+        
+        final AttributeFilterContext result = new AttributeFilterContext();
+        
+        
+        result.setIssuerMetadataContextLookupStrategy(e -> metadataContext);
+        // prime value
+        result.getIssuerMetadataContext();
+        return result;
+    }
+    
+    @Test public void aa() throws ResolverException {
+        IdPAttribute testAttribute = new IdPAttribute("test");
+        IdPAttributeValue resultValue1 = new ScopedStringAttributeValue("value", "aa.aa");
+        IdPAttributeValue resultValue2 = new StringAttributeValue("aa");
+
+        testAttribute.setValues(List.of(
+                    new ScopedStringAttributeValue("value", "scope"),
+                    resultValue1,
+                    new ScopedStringAttributeValue("value", "entity"),
+                    new StringAttributeValue("value"),
+                    resultValue2));
+        
+        final EntityDescriptor entity = resolver.resolveSingle(new CriteriaSet(new EntityIdCriterion(aaEntityID)));
+        Set<IdPAttributeValue> result = scopeMatcher.getMatchingValues(testAttribute, filterContextFor(entity));
+        assertEquals(result.size(), 1);
+        assertTrue(result.contains(resultValue1));
+
+        result = valueMatcher.getMatchingValues(testAttribute, filterContextFor(entity));
+        assertEquals(result.size(), 1);
+        assertTrue(result.contains(resultValue2));
+    }
+
+    @Test public void none() throws ResolverException {
+        IdPAttribute testAttribute = new IdPAttribute("test");
+
+        testAttribute.setValues(List.of(
+                    new ScopedStringAttributeValue("value", "scope"),
+                    new ScopedStringAttributeValue("value", "entity"),
+                    new StringAttributeValue("value")
+                    ));
+        
+        final EntityDescriptor entity = resolver.resolveSingle(new CriteriaSet(new EntityIdCriterion(noneEntityID)));
+        Set<IdPAttributeValue> result = scopeMatcher.getMatchingValues(testAttribute, filterContextFor(entity));
+        assertTrue(result.isEmpty());
+
+        assertTrue(valueMatcher.getMatchingValues(testAttribute, filterContextFor(entity)).isEmpty());
+        assertTrue(valueMatcher.getMatchingValues(testAttribute, new AttributeFilterContext()).isEmpty());
+    }
+
+    @Test public void both() throws ResolverException {
+        IdPAttribute testAttribute = new IdPAttribute("test");
+        
+        List<IdPAttributeValue> list = List.of(
+                new ScopedStringAttributeValue("value", "aa.both"),
+                new ScopedStringAttributeValue("value", "aa"),
+                new ScopedStringAttributeValue("value", "entity.both"),
+                new StringAttributeValue("entity"));
+
+        testAttribute.setValues(list);
+        
+        final EntityDescriptor entity = resolver.resolveSingle(new CriteriaSet(new EntityIdCriterion(bothEntityID)));
+        Set<IdPAttributeValue> result = scopeMatcher.getMatchingValues(testAttribute, filterContextFor(entity));
+        assertEquals(result.size(), 3);
+        for (int i = 0; i < 3; i++) {
+            assertTrue(result.contains(list.get(i)));
+        }
+
+        result = valueMatcher.getMatchingValues(testAttribute, filterContextFor(entity));
+        assertEquals(result.size(), 1);
+        assertTrue(result.contains(list.get(3)));
+    }
+
+    @Test public void entity() throws ResolverException {
+        IdPAttribute testAttribute = new IdPAttribute("test");
+        IdPAttributeValue resultValue1 = new ScopedStringAttributeValue("value", "entity.entity");
+        IdPAttributeValue resultValue2 = new StringAttributeValue("entity");
+
+        testAttribute.setValues(List.of(
+                    new ScopedStringAttributeValue("value", "scope"),
+                    resultValue1,
+                    new StringAttributeValue("value"),
+                    resultValue2));
+        
+        final EntityDescriptor entity = resolver.resolveSingle(new CriteriaSet(new EntityIdCriterion(entityEntityID)));
+        Set<IdPAttributeValue> result = scopeMatcher.getMatchingValues(testAttribute, filterContextFor(entity));
+        assertEquals(result.size(), 1);
+        assertTrue(result.contains(resultValue1));
+
+        result = valueMatcher.getMatchingValues(testAttribute, filterContextFor(entity));
+        assertEquals(result.size(), 1);
+        assertTrue(result.contains(resultValue2));
+    }
+
+}
diff --git a/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/shibmd-metadata.xml b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/shibmd-metadata.xml
new file mode 100644
index 0000000..2adcbed
--- /dev/null
+++ b/idp-attribute-filter-impl/src/test/resources/net/shibboleth/idp/filter/impl/saml/shibmd-metadata.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<EntitiesDescriptor 
+   xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+   xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <EntityDescriptor entityID="https://none.example.org/idp/shibboleth">
+    
+        <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"/>
+    </EntityDescriptor>
+    
+    <EntityDescriptor entityID="https://both.example.org/idp/shibboleth">
+        <Extensions>
+            <shibmd:Scope regexp="false">entity.both</shibmd:Scope>
+            <shibmd:Scope>entity</shibmd:Scope>
+        </Extensions>
+        <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+            <Extensions>
+                <shibmd:Scope regexp="false">aa.both</shibmd:Scope>
+                <shibmd:Scope>aa</shibmd:Scope>
+            </Extensions>
+        </AttributeAuthorityDescriptor>
+    </EntityDescriptor>
+    
+    <EntityDescriptor entityID="https://aa.example.org/idp/shibboleth">
+        <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+            <Extensions>
+                <shibmd:Scope regexp="false">aa.aa</shibmd:Scope>
+                <shibmd:Scope>aa</shibmd:Scope>
+            </Extensions>
+        </AttributeAuthorityDescriptor>
+    </EntityDescriptor>
+
+    <EntityDescriptor entityID="https://entity.example.org/idp/shibboleth">
+        <Extensions>
+            <shibmd:Scope regexp="false">entity.entity</shibmd:Scope>
+            <shibmd:Scope>entity</shibmd:Scope>
+        </Extensions>
+        <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"/>
+    </EntityDescriptor>
+
+</EntitiesDescriptor>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list