libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

KEYCLOAK-15833 Look for end bracket only if current block is pattern

Browse source
This commit is contained in:
Michal Hajas 2020-10-21 16:39:12 +02:00 committed by Hynek Mlnařík
parent 267f1797d4
commit 9058cc75d9
2 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/org/keycloak/common/util/PathMatcher.java
View file

@ -202,7 +202,9 @@ public abstract class PathMatcher<P> {
}
}
i = expectedUri.indexOf('}', i);
if (c == '{') {
i = expectedUri.indexOf('}', i);
}
if (i == expectedUri.lastIndexOf('}') && onlyFirstParam) {
return String.valueOf(matchingUri).substring(0, matchingUriLastIndex);

34
common/src/test/java/org/keycloak/common/util/PathMatcherTest.java Normal file
View file

@ -0,0 +1,34 @@
package org.keycloak.common.util;
import org.junit.Assert;
import org.junit.Test;
import java.util.Collection;
public class PathMatcherTest {
@Test
public void keycloak15833Test() {
TestingPathMatcher matcher = new TestingPathMatcher();
Assert.assertNull(matcher.customBuildUriFromTemplate("/api/v1/{clientId}/campaigns/*/excelFiles", "/api/v1/1/contentConnectorConfigs/29/contentConnectorContents", false));
}
private static final class TestingPathMatcher extends PathMatcher<Object> {
@Override
protected String getPath(Object entry) {
return null;
}
@Override
protected Collection<Object> getPaths() {
return null;
}
// Make buildUriFromTemplate accessible from test
public String customBuildUriFromTemplate(String template, String targetUri, boolean onlyFirstParam) {
return buildUriFromTemplate(template, targetUri, onlyFirstParam);
}
}
}