Skip to content

Fix misleading exception in AdvancedTlsX509TrustManager when cert file is missing #12353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 15, 2025
+15 −0
Merged

Fix misleading exception in AdvancedTlsX509TrustManager when cert file is missing #12353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd44f7d
Util: AdvancedTlsX509TrustManager code changes for handling fine not …
Sangamesh1997 Sep 11, 2025
84c8663
Util: AdvancedTlsX509TrustManager code changes for handling fine not …
Sangamesh1997 Sep 11, 2025
02f8ba2
Util: AdvancedTlsX509TrustManager review comments addressed
Sangamesh1997 Sep 12, 2025
02bd4eb
Merge branch 'grpc:master' into Issue_Fixed_10221
Sangamesh1997 Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions util/src/main/java/io/grpc/util/AdvancedTlsX509TrustManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,10 @@ public void run() {
private long readAndUpdate(File trustCertFile, long oldTime)
throws IOException, GeneralSecurityException {
long newTime = checkNotNull(trustCertFile, "trustCertFile").lastModified();
if (newTime == 0) {
throw new IOException(
"Certificate file not found or not readable: " + trustCertFile.getAbsolutePath());
}
if (newTime == oldTime) {
return oldTime;
}
Expand Down
11 changes: 11 additions & 0 deletions util/src/test/java/io/grpc/util/AdvancedTlsX509TrustManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,17 @@ record -> record.getMessage().contains("Default value of "));
}
}

@Test
public void missingFile_throwsFileNotFoundException() throws Exception {
AdvancedTlsX509TrustManager trustManager = AdvancedTlsX509TrustManager.newBuilder().build();
File nonExistentFile = new File("missing_cert.pem");
Exception thrown =
assertThrows(Exception.class, () -> trustManager.updateTrustCredentials(nonExistentFile));
assertNotNull(thrown);
assertEquals(thrown.getMessage(),
"Certificate file not found or not readable: " + nonExistentFile.getAbsolutePath());
}

@Test
public void clientTrustedWithSocketTest() throws Exception {
AdvancedTlsX509TrustManager trustManager = AdvancedTlsX509TrustManager.newBuilder()
Expand Down