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

0
src/test/java/net/thauvin/erik/mobibot/modules/CurrentConverterTest.java → src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
View file

14
src/test/java/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.java
View file

@ -49,9 +49,12 @@ import static org.assertj.core.api.Assertions.assertThat;
public class ModuleExceptionTest { public class ModuleExceptionTest {
@DataProvider(name = "dp") @DataProvider(name = "dp")
Object[][] createData(final Method m) { Object[][] createData(final Method m) {
System.out.println(m.getName()); // print test method name
return new Object[][]{new Object[]{new ModuleException("debugMessage", "message", return new Object[][]{new Object[]{new ModuleException("debugMessage", "message",
new IOException("Secret URL http://foo.com?apiKey=sec&userID=me"))}, new IOException("Secret URL http://foo.com?apiKey=sec&userID=me"))},
new Object[]{new ModuleException("debugMessage", "message",
new IOException("URL http://foobar.com"))},
new Object[]{new ModuleException("debugMessage", "message",
new IOException("URL http://foobar.com?"))},
new Object[]{new ModuleException("debugMessage", "message")} new Object[]{new ModuleException("debugMessage", "message")}
}; };
} }
@ -67,10 +70,15 @@ public class ModuleExceptionTest {
} }
@Test(dataProvider = "dp") @Test(dataProvider = "dp")
final void testGetStanitizedMessage(final ModuleException e) { final void testGetSanitizedMessage(final ModuleException e) {
if (e.hasCause()) { if (e.hasCause()) {
assertThat(e.getSanitizedMessage()).as("get sanitzed url") if (e.getSanitizedMessage().contains("Secret")) {
assertThat(e.getSanitizedMessage()).as("get sanitized url")
.contains("http://foo.com?apiKey=[3]&userID=[2]"); .contains("http://foo.com?apiKey=[3]&userID=[2]");
} else {
assertThat(e.getSanitizedMessage()).as("get sanitized url")
.contains("http://foobar.com");
}
} }
} }
} }