ARTEMIS-4356 ensure match regexp expression is anchored on eot to avoid partial matches in error

This commit is contained in:
Gary Tully 2023-07-11 13:21:00 +01:00
parent aebdcc5eb8
commit f5251bc5cb
2 changed files with 85 additions and 1 deletions

View File

@ -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() {

View File

@ -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"));
}
}