Merge pull request #95 from browserstack/LOC-6208-handle-invalid-json-source-url

Fix: 400 status code bad request in case of invalid json fetch binary URL

Author: yashdsaraf

pom.xml

@@ -3,7 +3,7 @@
     <groupId>com.browserstack</groupId>
     <artifactId>browserstack-local-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.1.6</version>
+    <version>1.1.7</version>
 
     <name>browserstack-local-java</name>
     <description>Java bindings for BrowserStack Local</description>

src/main/java/com/browserstack/local/Local.java

@@ -23,7 +23,7 @@ public class Local {
     private LocalProcess proc = null;
 
     // Current version of binding package, used for --source option of binary
-    private static final String packageVersion = "1.1.6";
+    private static final String packageVersion = "1.1.7";
     private final Map<String, String> parameters;
     private final Map<String, String> avoidValueParameters;
 

src/main/java/com/browserstack/local/LocalBinary.java

@@ -207,12 +207,17 @@ private void fetchSourceUrl() throws LocalException {
           connection.setRequestProperty("Content-Type", "application/json");
           connection.setRequestProperty("User-Agent", "browserstack-local-java/" + Local.getPackageVersion());
           connection.setRequestProperty("Accept", "application/json");
-          if (fallbackEnabled) connection.setRequestProperty("X-Local-Fallback-Cloudflare", "true");
 
-          String jsonInput = "{\"auth_token\": \"" + key + (fallbackEnabled ? ("\", \"error_message\": \"" + downloadFailureThrowable.getMessage()) + "\"" : "\"") + "}";
+          JSONObject inputParams = new JSONObject();
+          inputParams.put("auth_token", this.key);
+          if (fallbackEnabled) {
+              connection.setRequestProperty("X-Local-Fallback-Cloudflare", "true");
+              inputParams.put("error_message", downloadFailureThrowable.getMessage());
+          }
+          String jsonInputParams = inputParams.toString();
 
           try (OutputStream os = connection.getOutputStream()) {
-              byte[] input = jsonInput.getBytes("utf-8");
+              byte[] input = jsonInputParams.getBytes("utf-8");
               os.write(input, 0, input.length);
           }