[java-identity-provider] branch main updated: Guard additional matchExpression injection points.

[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=1da2d68deb9a2b025268ef07cddff5f67fb1b0c2

The following commit(s) were added to refs/heads/main by this push:
       new  1da2d68de Guard additional matchExpression injection points.
1da2d68de is described below

commit 1da2d68deb9a2b025268ef07cddff5f67fb1b0c2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 14 15:33:39 2020 -0400

    Guard additional matchExpression injection points.
---
 .../shibboleth/idp/authn/impl/ValidateExternalAuthentication.java   | 6 +++++-
 .../main/java/net/shibboleth/idp/authn/impl/ValidateRemoteUser.java | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
index dfbe3ca56..8e44c598f 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
@@ -115,7 +115,11 @@ public class ValidateExternalAuthentication extends AbstractValidationAction {
     public void setMatchExpression(@Nullable final Pattern expression) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
-        matchExpression = expression;
+        if (expression != null && !expression.pattern().isEmpty()) {
+            matchExpression = expression;
+        } else {
+            matchExpression = null;
+        }
     }
 
     /**
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateRemoteUser.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateRemoteUser.java
index 2aa7fc77a..7a5364739 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateRemoteUser.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateRemoteUser.java
@@ -112,7 +112,11 @@ public class ValidateRemoteUser extends AbstractValidationAction {
     public void setMatchExpression(@Nullable final Pattern expression) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
-        matchExpression = expression;
+        if (expression != null && !expression.pattern().isEmpty()) {
+            matchExpression = expression;
+        } else {
+            matchExpression = null;
+        }
     }
 
     /** {@inheritDoc} */

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