Properly handle invalid credential files

coeuvre · copybara-github · commit 4cf764d35943 · 2023-06-26T05:51:56.000-07:00
to prevent Bazel sever from crashing. The functions used to construct credentials could throw runtime exception which will crash Bazel server in which case the Bazel client will just exit silently. Fixes #18755. Closes #18770. PiperOrigin-RevId: 543413376 Change-Id: I71238345f350caaac51f9cc9f654661a90cf6737
diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java b/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java
@@ -330,7 +330,7 @@ public static Credentials newGoogleCredentialsFromFile(
         creds = creds.createScoped(authScopes);
       }
       return creds;
-    } catch (IOException e) {
+    } catch (Exception e) {
       String message = "Failed to init auth credentials: " + e.getMessage();
       throw new IOException(message, e);
     }

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ public static Credentials newGoogleCredentialsFromFile(`
`330`	`330`	`creds = creds.createScoped(authScopes);`
`331`	`331`	`}`
`332`	`332`	`return creds;`
`333`		`- } catch (IOException e) {`
	`333`	`+ } catch (Exception e) {`
`334`	`334`	`String message = "Failed to init auth credentials: " + e.getMessage();`
`335`	`335`	`throw new IOException(message, e);`
`336`	`336`	`}`