Sanitize URIs with non-alpha characters in their schemes

See gh-27482
This commit is contained in:
Billy Tobon 2021-07-23 15:10:29 -04:00 committed by Andy Wilkinson
parent cff1827e27
commit bafa9c4784
2 changed files with 3 additions and 3 deletions

View File

@ -50,7 +50,7 @@ public class Sanitizer {
private static final Set<String> URI_USERINFO_KEYS = new LinkedHashSet<>(
Arrays.asList("uri", "uris", "address", "addresses"));
private static final Pattern URI_USERINFO_PATTERN = Pattern.compile("\\[?[A-Za-z]+://.+:(.*)@.+$");
private static final Pattern URI_USERINFO_PATTERN = Pattern.compile("^[A-Za-z][A-Za-z0-9\\+\\.\\-]+://.+:(.*)@.+$");
private Pattern[] keysToSanitize;

View File

@ -52,8 +52,8 @@ class SanitizerTests {
@MethodSource("matchingUriUserInfoKeys")
void uriWithSingleValueWithPasswordShouldBeSanitized(String key) {
Sanitizer sanitizer = new Sanitizer();
assertThat(sanitizer.sanitize(key, "http://user:password@localhost:8080"))
.isEqualTo("http://user:******@localhost:8080");
assertThat(sanitizer.sanitize(key, "view-source://user:password@localhost:8080"))
.isEqualTo("view-source://user:******@localhost:8080");
}
@ParameterizedTest(name = "key = {0}")