erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Better query parameters handling in getSanitizedMessage().

Browse source
This commit is contained in:
Erik C. Thauvin 2019-04-14 19:03:46 -07:00
parent 4b772f0564
commit 8bbeb8d7c8
3 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.java
View file

@ -46,7 +46,7 @@ import java.util.regex.Pattern;
class ModuleException extends Exception {
private static final long serialVersionUID = -3036774290621088107L;
private final String debugMessage;
private final Pattern urlPattern = Pattern.compile("(https?://\\S+)");
private final Pattern urlPattern = Pattern.compile("(https?://\\S+)(\\?\\S+)");
/**
* Creates a new exception.
@ -100,20 +100,20 @@ class ModuleException extends Exception {
final String causeMessage = getCause().getMessage();
final Matcher matcher = urlPattern.matcher(causeMessage);
if (matcher.find()) {
final HttpUrl url = HttpUrl.parse(matcher.group());
if ((url != null) && (matcher.group().contains("?"))) {
final StringBuilder query = new StringBuilder();
final HttpUrl url = HttpUrl.parse(matcher.group(1)+matcher.group(2));
if (url != null){
final StringBuilder query = new StringBuilder("?");
for (int i = 0, size = url.querySize(); i < size; i++) {
if (i > 0) query.append('&');
query.append(url.queryParameterName(i)).append('=').append('[')
.append(url.queryParameterValue(i).length()).append(']').append('&');
.append(url.queryParameterValue(i).length()).append(']');
}
return getDebugMessage() + "\nCaused by: " + getCause().getClass().getName() + ": "
+ causeMessage.replace(matcher.group(),
matcher.group().substring(0, matcher.group().indexOf('?') + 1) + query);
+ causeMessage.replace(matcher.group(2), query);
}
}
}
return getMessage();
return getDebugMessage() + "\nCaused by: " + getCause().getClass().getName() + ": " + getCause().getMessage();
}
/**