From 972fdc190d98b5132b6a6329bf1086201c63063c Mon Sep 17 00:00:00 2001 From: Jj! Date: Wed, 28 Nov 2018 09:55:20 -0600 Subject: [PATCH] [SHIBUI-704] updated dev config set metadata filter for dhmr --- .../tier/shibboleth/admin/ui/configuration/DevConfig.groovy | 4 +++- .../OpenSamlFunctionDrivenDynamicHTTPMetadataResolver.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index 8c574b90e..e9e530d64 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/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/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFunctionDrivenDynamicHTTPMetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFunctionDrivenDynamicHTTPMetadataResolver.java index b53d7486b..0bb50c0c0 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlFunctionDrivenDynamicHTTPMetadataResolver.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/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();