[SHIBUI-704]

updated dev config set metadata filter for dhmr
TIER · Nov 28, 2018 · 972fdc1 · 972fdc1
1 parent 1c70e77
commit 972fdc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...end/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/...end/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy
@@ -68,6 +68,7 @@ class DevConfig {
                     return it
                 }
                 it.attributeRelease = ['eduPersonPrincipalName', 'givenName', 'surname', 'mail']
+                it.relyingPartyOverrides = null
                 return it
             })
             return it
@@ -88,10 +89,11 @@ class DevConfig {
                 it.filterEnabled = true
                 it.entityAttributesFilterTarget = new EntityAttributesFilterTarget().with {
                     it.entityAttributesFilterTargetType = EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY
-                    it.value = ["https://carmenwiki.osu.edu/shibboleth"]
+                    it.value = ["https://issues.shibboleth.net/shibboleth"]
                     return it
                 }
                 it.attributeRelease = ['eduPersonPrincipalName', 'givenName', 'surname', 'mail']
+                it.relyingPartyOverrides = null
                 return it
             })
             return it

diff --git a/...admin/ui/domain/resolvers/opensaml/OpenSamlFunctionDrivenDynamicHTTPMetadataResolver.java b/...admin/ui/domain/resolvers/opensaml/OpenSamlFunctionDrivenDynamicHTTPMetadataResolver.java
@@ -9,6 +9,7 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.velocity.app.VelocityEngine;
+import org.opensaml.saml.metadata.resolver.filter.MetadataFilterChain;
 import org.opensaml.saml.metadata.resolver.impl.FunctionDrivenDynamicHTTPMetadataResolver;
 import org.opensaml.saml.metadata.resolver.impl.MetadataQueryProtocolRequestURLBuilder;
 import org.opensaml.saml.metadata.resolver.impl.RegexRequestURLBuilder;
@@ -40,6 +41,8 @@ public OpenSamlFunctionDrivenDynamicHTTPMetadataResolver(ParserPool parserPool,
 
         this.setSupportedContentTypes(sourceResolver.getSupportedContentTypes());
 
+        this.setMetadataFilter(new MetadataFilterChain());
+
         //TODO: These don't seem to be used anywhere.
         // In the parser, if not null, a warning is logged .. but nothing else happens with them.
         // sourceResolver.getMaxConnectionsPerRoute();