[java-identity-provider] branch main updated: Property-ify remaining matchExpression settings.

[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=d6f57dd18782b0520cccc0b0302b30a6dab5e338

The following commit(s) were added to refs/heads/main by this push:
       new  d6f57dd18 Property-ify remaining matchExpression settings.
d6f57dd18 is described below

commit d6f57dd18782b0520cccc0b0302b30a6dab5e338
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 14 15:51:37 2020 -0400

    Property-ify remaining matchExpression settings.
---
 .../net/shibboleth/idp/flows/authn/external-authn-beans.xml       | 2 +-
 .../net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml     | 2 +-
 .../idp/flows/authn/remoteuser-internal-authn-beans.xml           | 2 +-
 .../shibboleth/idp/module/conf/authn/external-authn-config.xml    | 8 ++------
 .../shibboleth/idp/module/conf/authn/remoteuser-authn-config.xml  | 8 ++------
 .../idp/module/conf/authn/remoteuser-internal-authn-config.xml    | 6 ------
 idp-conf/src/main/resources/conf/authn/authn.properties           | 3 +++
 7 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml
index f41f6d823..2b95f04a7 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/external-authn-beans.xml
@@ -26,7 +26,7 @@
 
     <bean id="ValidateExternalAuthentication"
         class="net.shibboleth.idp.authn.impl.ValidateExternalAuthentication" scope="prototype"
-        p:matchExpression="#{getObject('shibboleth.authn.External.matchExpression')}"
+        p:matchExpression="#{getObject('shibboleth.authn.External.matchExpression') ?: '%{idp.authn.External.matchExpression:}'}"
         p:addDefaultPrincipals="#{getObject('shibboleth.authn.External.addDefaultPrincipals') ?: %{idp.authn.External.addDefaultPrincipals:true}}"
         p:classifiedMessages="#{getObject('shibboleth.authn.External.ClassifiedMessageMap')}"
         p:resultCachingPredicate="#{getObject('shibboleth.authn.External.resultCachingPredicate')}"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml
index 27a529335..b66fcd51b 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-authn-beans.xml
@@ -27,7 +27,7 @@
     <bean id="ValidateExternalAuthentication"
         class="net.shibboleth.idp.authn.impl.ValidateExternalAuthentication" scope="prototype"
         p:metricName="net.shibboleth.idp.authn.remoteuser"
-        p:matchExpression="#{getObject('shibboleth.authn.RemoteUser.matchExpression')}"
+        p:matchExpression="#{getObject('shibboleth.authn.RemoteUser.matchExpression') ?: '%{idp.authn.RemoteUser.matchExpression:}'}"
         p:addDefaultPrincipals="#{getObject('shibboleth.authn.RemoteUser.addDefaultPrincipals') ?: %{idp.authn.RemoteUser.addDefaultPrincipals:true}}"
         p:classifiedMessages="#{getObject('shibboleth.authn.RemoteUser.ClassifiedMessageMap')}"
         p:resultCachingPredicate="#{getObject('shibboleth.authn.RemoteUser.resultCachingPredicate')}" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
index a6b5e181b..606fc2a17 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/authn/remoteuser-internal-authn-beans.xml
@@ -56,7 +56,7 @@
         c:_0="#{'%{idp.authn.RemoteUserInternal.deniedUsernames:}'.trim()}" />
         
     <bean id="ValidateRemoteUser" class="net.shibboleth.idp.authn.impl.ValidateRemoteUser" scope="prototype"
-        p:matchExpression="#{getObject('shibboleth.authn.RemoteUser.matchExpression')}"
+        p:matchExpression="#{getObject('shibboleth.authn.RemoteUser.matchExpression') ?: '%{idp.authn.RemoteUserInternal.matchExpression:}'}"
         p:allowedUsernames="#{getObject('shibboleth.authn.RemoteUser.allowedUsernames') ?: (getObject('shibboleth.authn.RemoteUser.whitelistedUsernames') ?: getObject('PropertyDrivenAllowList'))}"
         p:deniedUsernames="#{getObject('shibboleth.authn.RemoteUser.deniedUsernames') ?: (getObject('shibboleth.authn.RemoteUser.blacklistedUsernames') ?: getObject('PropertyDrivenDenyList'))}"
         p:addDefaultPrincipals="#{getObject('shibboleth.authn.RemoteUser.addDefaultPrincipals') ?: %{idp.authn.RemoteUserInternal.addDefaultPrincipals:true}}"
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/external-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/external-authn-config.xml
index af1ac3cc1..0d19b78d9 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/external-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/external-authn-config.xml
@@ -12,18 +12,14 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <!-- Most settings are controlled with authn.properties -->
+
     <!--
     The idp.authn.External.externalAuthnPath property controls the default location to use.
     For advanced cases, define a bean called "shibboleth.authn.External.externalAuthnPathStrategy"
     of type Function<ProfileRequestContext,String> that returns the path to use.
     -->
 
-    <!-- Define if you want to apply a filtering expression. -->
-    <!--
-    <bean id="shibboleth.authn.External.matchExpression" class="java.util.regex.Pattern" factory-method="compile"
-        c:_0="^(.+)@example\.org$" />
-    -->
-
     <!--
     Define entries here to map error messages returned by external modules and classify them as particular
     kinds of errors for use in your templates and as events in flows.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-authn-config.xml
index 62d759b43..67d292105 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-authn-config.xml
@@ -12,18 +12,14 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <!-- Most settings are controlled with authn.properties -->
+
     <!--
     The idp.authn.RemoteUser.externalAuthnPath property controls the default location to use.
     For advanced cases, define a bean called "shibboleth.authn.RemoteUser.externalAuthnPathStrategy"
     of type Function<ProfileRequestContext,String> that returns the path to use.
     -->
 
-    <!-- Define if you want to apply a filtering expression. -->
-    <!--
-    <bean id="shibboleth.authn.RemoteUser.matchExpression" class="java.util.regex.Pattern" factory-method="compile"
-        c:_0="^(.+)@example\.org$" />
-    -->
-
     <!--
     Define entries here to map error messages returned by external modules and classify them as particular
     kinds of errors for use in your templates and as events in flows.
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-internal-authn-config.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-internal-authn-config.xml
index 517de4d08..ab96d2aff 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-internal-authn-config.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/authn/remoteuser-internal-authn-config.xml
@@ -21,10 +21,4 @@
         -->
     </util:list>
     
-    <!-- Define if you want to apply a filtering expression. -->
-    <!--
-    <bean id="shibboleth.authn.RemoteUser.matchExpression" class="java.util.regex.Pattern" factory-method="compile"
-        c:_0="^(.+)@example\.org$" />
-    -->
-    
 </beans>
diff --git a/idp-conf/src/main/resources/conf/authn/authn.properties b/idp-conf/src/main/resources/conf/authn/authn.properties
index e20a466aa..3e7915ba7 100644
--- a/idp-conf/src/main/resources/conf/authn/authn.properties
+++ b/idp-conf/src/main/resources/conf/authn/authn.properties
@@ -78,6 +78,7 @@
 
 #idp.authn.External.order = 1000
 #idp.authn.External.nonBrowserSupported = false
+#idp.authn.External.matchExpression = 
 # Unset if you plan to return full Java Subject from external source
 #idp.authn.External.addDefaultPrincipals = true
 # Servlet context-relative path to wherever your implementation lives
@@ -87,6 +88,7 @@ idp.authn.External.externalAuthnPath = contextRelative:external.jsp
 
 #idp.authn.RemoteUser.order = 1000
 #idp.authn.RemoteUser.nonBrowserSupported = false
+#idp.authn.RemoteUser.matchExpression = 
 # Unset in most cases only if using the authnMethodHeader or
 # subjectAttribute settings
 #idp.authn.RemoteUser.addDefaultPrincipals = true
@@ -106,6 +108,7 @@ idp.authn.External.externalAuthnPath = contextRelative:external.jsp
 #idp.authn.RemoteUserInternal.trim = true
 #idp.authn.RemoteUserInternal.lowercase = false
 #idp.authn.RemoteUserInternal.uppercase = false
+#idp.authn.RemoteUserInternal.matchExpression = 
 #idp.authn.RemoteUserInternal.allowedUsernames = 
 #idp.authn.RemoteUserInternal.deniedUsernames = 
 

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