[java-identity-provider] branch main updated: Move matchExpression into property.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/main by this push:
       new  115745eb4 Move matchExpression into property.
115745eb4 is described below

commit 115745eb4a9bab8e9f250ab5227e51d5fdbf994b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 15 14:32:46 2020 -0400

    Move matchExpression into property.
---
 .../resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml  | 2 +-
 .../net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml     | 5 -----
 idp-conf/src/main/resources/conf/authn/authn.properties              | 1 +
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml
index d78518f7d..d1dd9ddd6 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/spnego-authn-beans.xml
@@ -49,7 +49,7 @@
     <bean id="ValidateExternalAuthentication"
             class="net.shibboleth.idp.authn.impl.ValidateExternalAuthentication" scope="prototype"
             p:metricName="net.shibboleth.idp.authn.spnego"
-            p:matchExpression="#{getObject('shibboleth.authn.SPNEGO.matchExpression')}"
+            p:matchExpression="#{getObject('shibboleth.authn.SPNEGO.matchExpression') ?: '%{idp.authn.SPNEGO.matchExpression:}'}"
             p:addDefaultPrincipals="#{getObject('shibboleth.authn.SPNEGO.addDefaultPrincipals') ?: %{idp.authn.SPNEGO.addDefaultPrincipals:true}}"
             p:classifiedMessages="#{getObject('shibboleth.authn.SPNEGO.ClassifiedMessageMap')}" />
             
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml
index f3891046e..5be020400 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/spnego-authn-config.xml
@@ -31,11 +31,6 @@
 
     </util:list>
 
-    <!--
-    <bean id="shibboleth.authn.SPNEGO.matchExpression" class="java.util.regex.Pattern" factory-method="compile"
-        c:_0="^(.+)@example\.org$" />
-    -->
-
     <!--
     Define entries here to map events or error messages returned by the SPNEGO module
     and classify them as particular kinds of errors for use in your templates and as
diff --git a/idp-conf/src/main/resources/conf/authn/authn.properties b/idp-conf/src/main/resources/conf/authn/authn.properties
index 3e7915ba7..8b1801c42 100644
--- a/idp-conf/src/main/resources/conf/authn/authn.properties
+++ b/idp-conf/src/main/resources/conf/authn/authn.properties
@@ -118,6 +118,7 @@ idp.authn.External.externalAuthnPath = contextRelative:external.jsp
 #idp.authn.SPNEGO.nonBrowserSupported = false
 #idp.authn.SPNEGO.enforceRun = false
 #idp.authn.SPNEGO.refreshKrbConfig = false
+#idp.authn.SPNEGO.matchExpression = 
 #idp.authn.SPNEGO.supportedPrincipals = \
 #    saml2/urn:oasis:names:tc:SAML:2.0:ac:classes:Kerberos, \
 #    saml1/urn:ietf:rfc:1510

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