[SYNCOPE-1963] Check if null before pattern match

Author: ilgrosso

core/persistence-common/src/main/java/org/apache/syncope/core/persistence/common/dao/AbstractSearchDAO.java

@@ -27,6 +27,7 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
@@ -279,18 +280,20 @@ protected CheckResult<AnyCond> check(final AnyCond cond, final Field field, fina
             computed.setSchema(computed.getSchema() + "_id");
             schema.setType(AttrSchemaType.String);
 
-            if (!SyncopeConstants.UUID_PATTERN.matcher(computed.getExpression()).matches()) {
-                switch (StringUtils.substringBefore(computed.getSchema(), "_id")) {
-                    case "uManager" ->
-                        userDAO.findKey(computed.getExpression()).ifPresent(computed::setExpression);
+            Optional.ofNullable(computed.getExpression()).
+                    filter(expression -> !SyncopeConstants.UUID_PATTERN.matcher(expression).matches()).
+                    ifPresent(expression -> {
+                        switch (StringUtils.substringBefore(computed.getSchema(), "_id")) {
+                            case "uManager" ->
+                                userDAO.findKey(expression).ifPresent(computed::setExpression);
 
-                    case "gManager" ->
-                        groupDAO.findKey(computed.getExpression()).ifPresent(computed::setExpression);
+                            case "gManager" ->
+                                groupDAO.findKey(expression).ifPresent(computed::setExpression);
 
-                    default -> {
-                    }
-                }
-            }
+                            default -> {
+                            }
+                        }
+                    });
         }
 
         PlainAttrValue attrValue = new PlainAttrValue();

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/DefaultNotificationManager.java

@@ -358,15 +358,13 @@ public List<NotificationTask> createTasks(
                             },
                             () -> {
                                 switch (before) {
-                                    case null -> {
-                                    }
                                     case UserTO userTO ->
                                         jexlVars.put("user", userTO);
                                     case GroupTO groupTO ->
                                         jexlVars.put("group", groupTO);
                                     case AnyObjectTO anyObjectTO ->
                                         jexlVars.put("anyObject", anyObjectTO);
-                                    default -> {
+                                    case null, default -> {
                                     }
                                 }
                             });

fit/core-reference/src/test/java/org/apache/syncope/fit/core/SearchITCase.java

@@ -18,6 +18,7 @@
  */
 package org.apache.syncope.fit.core;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -1043,4 +1044,10 @@ void issueSYNCOPE1922() {
                     sce.getMessage().contains("IllegalArgumentException: Cannot search by encrypted schema obscure"));
         }
     }
+
+    @Test
+    void issueSYNCOPE1963() {
+        assertDoesNotThrow(() -> ANY_OBJECT_SERVICE.search(new AnyQuery.Builder().fiql(
+                SyncopeClient.getAnyObjectSearchConditionBuilder(PRINTER).isNotNull("gManager").query()).build()));
+    }
 }