Merge pull request #198 from ZenAnnard/abrouwer/json_crash_fix

basoko · web-flow · commit 3197d2e059f4 · 2020-03-13T11:21:44.000+01:00
Fix for a 403 error response from Nginx
diff --git a/rollbar-java/src/main/java/com/rollbar/notifier/sender/json/JsonSerializerImpl.java b/rollbar-java/src/main/java/com/rollbar/notifier/sender/json/JsonSerializerImpl.java
@@ -71,7 +71,12 @@ public String toJson(Payload payload) {
   @Override
   public Result resultFrom(String response) {
     Matcher codeMatcher = CODE_PATTERN.matcher(response);
-    codeMatcher.find();
+    if (!codeMatcher.find()) {
+      return new Result.Builder()
+          .code(1)
+          .body(response)
+          .build();
+    }
     String codeStr = codeMatcher.group(1);
     int code;
     try {
diff --git a/rollbar-java/src/test/java/com/rollbar/notifier/sender/json/JsonSerializerImplTest.java b/rollbar-java/src/test/java/com/rollbar/notifier/sender/json/JsonSerializerImplTest.java
@@ -12,11 +12,16 @@ public class JsonSerializerImplTest {
 
   static final String ERROR_MESSAGE = "This is the error message";
 
+  static final String UNEXPECTED_ERROR_MESSAGE = "Nobody expects the Spanish inquisition";
+
   static final String UUID = java.util.UUID.randomUUID().toString();
 
   static final String ERROR_RESPONSE = format("{\"err\": 1, {\"message\": \"%s\"}}",
       ERROR_MESSAGE);
 
+  static final String UNEXPECTED_ERROR_RESPONSE = format("<html><body>%s</body></html>",
+      UNEXPECTED_ERROR_MESSAGE);
+
   static final String SUCCESS_RESPONSE = format("{\"err\": 0, {\"uuid\": \"%s\"}}",
       UUID);
 
@@ -32,6 +37,18 @@ public void shouldDeserializeErrorResponse() {
     assertThat(sut.resultFrom(ERROR_RESPONSE), is(result));
   }
 
+  @Test
+  public void shouldDeserializeUnexpectedErrorResponse() {
+    Result result = new Result.Builder()
+        .code(1)
+        .body(UNEXPECTED_ERROR_RESPONSE)
+        .build();
+
+    JsonSerializerImpl sut = new JsonSerializerImpl();
+
+    assertThat(sut.resultFrom(UNEXPECTED_ERROR_RESPONSE), is(result));
+  }
+
   @Test
   public void shouldDeserializeSuccessResponse() {
     Result result = new Result.Builder()
