[java] Handle bad gateway response from the server (#9444)

pujagani · AutomatedTester · web-flow · commit 584c59014b25 · 2021-05-06T08:56:44.000+01:00
Co-authored-by: David Burns &lt;david.burns@theautomatedtester.co.uk&gt;
diff --git a/java/client/src/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodec.java b/java/client/src/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodec.java
@@ -19,6 +19,7 @@
 
 import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
+import static java.net.HttpURLConnection.HTTP_BAD_GATEWAY;
 import static java.net.HttpURLConnection.HTTP_BAD_METHOD;
 import static java.net.HttpURLConnection.HTTP_GATEWAY_TIMEOUT;
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
@@ -90,7 +91,8 @@ public Response decode(HttpResponse encodedResponse) {
       if (HTTP_BAD_METHOD == encodedResponse.getStatus()) {
         response.setStatus(ErrorCodes.UNKNOWN_COMMAND);
         response.setValue(content);
-      } else if (HTTP_GATEWAY_TIMEOUT == encodedResponse.getStatus()) {
+      } else if (HTTP_GATEWAY_TIMEOUT == encodedResponse.getStatus() ||
+        HTTP_BAD_GATEWAY == encodedResponse.getStatus()) {
         response.setStatus(ErrorCodes.UNHANDLED_ERROR);
         response.setValue(content);
       } else {
diff --git a/java/client/test/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodecTest.java b/java/client/test/org/openqa/selenium/remote/codec/w3c/W3CHttpResponseCodecTest.java
@@ -17,6 +17,8 @@
 
 package org.openqa.selenium.remote.codec.w3c;
 
+import static java.net.HttpURLConnection.HTTP_BAD_GATEWAY;
+import static java.net.HttpURLConnection.HTTP_GATEWAY_TIMEOUT;
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
 import static java.net.HttpURLConnection.HTTP_OK;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -58,6 +60,56 @@ public void noErrorNoCry() {
     assertThat(decoded.getValue()).isEqualTo("cheese");
   }
 
+  @Test
+  public void shouldBeAbleToHandleGatewayTimeoutError() {
+    String responseString = "<html>\r\n" +
+      "<body>\r\n" +
+      "<h1>504 Gateway Time-out</h1>\r\n" +
+      "The server didn't respond in time.\r\n" +
+      "</body>\r\n" +
+      "</html>";
+
+    byte[] contents = responseString.getBytes(UTF_8);
+
+    HttpResponse response = new HttpResponse();
+    response.setStatus(HTTP_GATEWAY_TIMEOUT);
+    response.addHeader("Server", "nginx");
+    response.addHeader("Content-Type", "text/html");
+    response.addHeader("Content-Length", String.valueOf(contents.length));
+    response.setContent(bytes(contents));
+
+    Response decoded = new W3CHttpResponseCodec().decode(response);
+
+    assertThat(decoded.getStatus().intValue()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
+    assertThat(decoded.getValue()).isEqualTo(responseString);
+  }
+
+
+  @Test
+  public void shouldBeAbleToHandleBadGatewayError() {
+    String responseString = "<html>\r\n" +
+      "<head><title>502 Bad Gateway</title></head>\r\n" +
+      "<body>\r\n" +
+      "<center><h1>502 Bad Gateway</h1></center>\r\n" +
+      "<hr><center>nginx</center>\r\n" +
+      "</body>\r\n" +
+      "</html>";
+
+    byte[] contents = responseString.getBytes(UTF_8);
+
+    HttpResponse response = new HttpResponse();
+    response.setStatus(HTTP_BAD_GATEWAY);
+    response.addHeader("Server", "nginx");
+    response.addHeader("Content-Type", "text/html");
+    response.addHeader("Content-Length", String.valueOf(contents.length));
+    response.setContent(bytes(contents));
+
+    Response decoded = new W3CHttpResponseCodec().decode(response);
+
+    assertThat(decoded.getStatus().intValue()).isEqualTo(ErrorCodes.UNHANDLED_ERROR);
+    assertThat(decoded.getValue()).isEqualTo(responseString);
+  }
+
   @Test
   public void decodingAnErrorWithoutAStacktraceIsDecodedProperlyForNonCompliantImplementations() {
     Map<String, Object> error = new HashMap<>();
