[activemq-artemis] branch main updated: ARTEMIS-4356 ensure match regexp expression is anchored on eot to avoid partial matches in error

[gt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gtully pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new f5251bc5cb ARTEMIS-4356 ensure match regexp expression is anchored on eot to avoid partial matches in error
f5251bc5cb is described below

commit f5251bc5cb6b12e3df45301ec3b9013ccb58b942
Author: Gary Tully <ga...@gmail.com>
AuthorDate: Tue Jul 11 13:21:00 2023 +0100

    ARTEMIS-4356 ensure match regexp expression is anchored on eot to avoid partial matches in error
---
 .../activemq/artemis/core/settings/impl/Match.java |  3 +-
 .../artemis/core/settings/impl/MatchTest.java      | 83 ++++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/Match.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/Match.java
index 6fc29101ed..8aad6f81a6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/Match.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/Match.java
@@ -77,7 +77,8 @@ public class Match<T> {
             actMatch = actMatch.replace(wildcardConfiguration.getAnyWordsString(), String.format(WILDCARD_CHILD_REPLACEMENT_FORMAT, Pattern.quote(wildcardConfiguration.getDelimiterString())));
          }
       }
-      return Pattern.compile(actMatch);
+      // we need to anchor with eot to ensure we have a full match
+      return Pattern.compile(actMatch + "$");
    }
 
    public final String getMatch() {
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/impl/MatchTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/impl/MatchTest.java
new file mode 100644
index 0000000000..130bbaa8ba
--- /dev/null
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/impl/MatchTest.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.core.settings.impl;
+
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
+import org.apache.activemq.artemis.core.config.WildcardConfiguration;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class MatchTest {
+
+   @Test
+   public void predicateTestAnyChild() {
+
+      final Match<?> underTest = new Match<>("test.#", null, new WildcardConfiguration());
+      final Predicate<String> predicate = underTest.getPattern().asPredicate();
+
+      Assert.assertTrue(predicate.test("test"));
+      Assert.assertTrue(predicate.test("test.A"));
+      Assert.assertTrue(predicate.test("test.A.B"));
+
+      Assert.assertFalse(predicate.test("testing.A"));
+   }
+
+   @Test
+   public void predicateTestAnyWord() {
+
+      final Match<?> underTest = new Match<>("test.*", null, new WildcardConfiguration());
+      final Predicate<String> predicate = underTest.getPattern().asPredicate();
+
+      Assert.assertTrue(predicate.test("test.A"));
+
+      Assert.assertFalse(predicate.test("testing.A"));
+      Assert.assertFalse(predicate.test("test"));
+      Assert.assertFalse(predicate.test("test.A.B"));
+   }
+
+   @Test
+   public void patterDirectAnyChild() {
+
+      final Pattern pattern = Match.createPattern("test.#", new WildcardConfiguration(), true);
+      final Predicate<String> predicate = pattern.asPredicate();
+
+      Assert.assertTrue(predicate.test("test.A"));
+      Assert.assertTrue(predicate.test("test.A.B"));
+
+      Assert.assertFalse(predicate.test("testing.A"));
+      // see: org.apache.activemq.artemis.tests.integration.mqtt5.spec.controlpackets.PublishTests#testSubscriptionIdentifierMultiLevel
+      Assert.assertFalse(predicate.test("test"));
+   }
+
+   @Test
+   public void patterDirectAnyWord() {
+
+      final Pattern pattern = Match.createPattern("test.*", new WildcardConfiguration(), true);
+      final Predicate<String> predicate = pattern.asPredicate();
+
+      // no change with direct = true|false
+      Assert.assertTrue(predicate.test("test.A"));
+
+      Assert.assertFalse(predicate.test("testing.A"));
+      Assert.assertFalse(predicate.test("test"));
+      Assert.assertFalse(predicate.test("test.A.B"));
+
+   }
+}
\ No newline at end of file