Skip to content

fixed: Polynomial regular expression used on uncontrolled data #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 17, 2025
Merged

fixed: Polynomial regular expression used on uncontrolled data #299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/main/java/org/summerboot/jexpress/util/FormatterUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ public static String[] parseDsv(String dsv, String delimiter, boolean trim) {

if (trim) {
// Replace all consecutive spaces or delimiter characters with a single delimiter character
dsv = dsv.trim().replaceAll("\\s*" + delimiter + "\\s*", delimiter);
//String regex = "\\s*" + delimiter + "\\s*";
String regex = "\\s*+" + delimiter + "\\s*+";
dsv = dsv.trim().replaceAll(regex, delimiter);
}
// Use StringUtils.split, which does not use regular expressions
return StringUtils.split(dsv, delimiter);
Expand All @@ -97,7 +99,9 @@ public static String[] parsePsv(String psv, boolean trim) {
}
if (trim) {
// Replace all consecutive spaces or delimiter characters with a single delimiter character
psv = psv.trim().replaceAll("[\\s|]+", "|");
String regex = "[\\s|]+";
//String regex = "\\s*+|\\s*+";
psv = psv.trim().replaceAll(regex, "|");
}
// Use StringUtils.split, which does not use regular expressions
return StringUtils.split(psv, '|');
Expand All @@ -108,14 +112,14 @@ public static String[] parseCsv(String csv) {
}

public static String[] parseCsv(String csv, boolean trim) {
//return StringUtils.isBlank(csv) ? EMPTY_STR_ARRAY : csv.trim().split(REGEX_CSV);
if (StringUtils.isBlank(csv)) {
return EMPTY_STR_ARRAY;
}
//return StringUtils.isBlank(csv) ? EMPTY_STR_ARRAY : StringUtils.split(csv);
if (trim) {
// Replace all consecutive spaces or delimiter characters with a single delimiter character
csv = csv.trim().replaceAll("\\s*,\\s*", ",");
//String regex = "\\s*,\\s*";
String regex = "\\s*+,\\s*+";
csv = csv.trim().replaceAll(regex, ",");
}
// Use StringUtils.split, which does not use regular expressions
return StringUtils.split(csv, ',');
Expand All @@ -126,13 +130,14 @@ public static String[] parseURL(String url) {
}

public static String[] parseURL(String url, boolean trim) {
//return StringUtils.isBlank(url) ? EMPTY_STR_ARRAY : url.trim().split(REGEX_URL);
if (StringUtils.isBlank(url)) {
return EMPTY_STR_ARRAY;
}
if (trim) {
// Replace all consecutive spaces or delimiter characters with a single delimiter character
url = url.trim().replaceAll("\\s*/\\s*", "/");
//String regex = "\\s*/\\s*";
String regex = "\\s*+/\\s*+";
url = url.trim().replaceAll(regex, "/");
}
return StringUtils.split(url, '/');
}
Expand Down Expand Up @@ -295,9 +300,10 @@ public static Map<String, String> parseMap(String mapCVS, boolean trim) {
Map<String, String> ret = new HashMap<>();
String[] mapKeyValues = parseCsv(mapCVS, true);
for (String mapKeyValue : mapKeyValues) {
//String[] ap = mapKeyValue.trim().split(REGEX_BINDING_MAP);
if (trim) {
mapKeyValue = mapKeyValue.trim().replaceAll("\\s*:\\s*", ":");
//String regex = "\\s*:\\s*";
String regex = "\\s*+:\\s*+";
mapKeyValue = mapKeyValue.trim().replaceAll(regex, ":");
}
String[] ap = StringUtils.split(mapKeyValue, ':');
ret.put(ap[0], ap[1]);
Expand Down