Fix misleading exception in AdvancedTlsX509TrustManager when cert file is missing #12353
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -339,6 +340,9 @@ public void run() { | |||
| private long readAndUpdate(File trustCertFile, long oldTime) | |||
| throws IOException, GeneralSecurityException { | |||
| long newTime = checkNotNull(trustCertFile, "trustCertFile").lastModified(); | |||
| if (newTime == 0 && !trustCertFile.exists()) { | |||
There was a problem hiding this comment.
The check for !trustCertFile.exists() is redundant. See documentation for File.lastModified - 0 means file doesn't exist or an IO exception occurred. The exception we throw should say Certificate not found or not readable.
There was a problem hiding this comment.
@kannanjgithub Thanks for the feedback, I understand your point, to change this will removing the redundant trustCertFile.exists() check and throwing an appropriate IOException with message like "Certificate not found or not readable".
| @Test | ||
| public void missingFile_throwsFileNotFoundException() throws Exception { | ||
| AdvancedTlsX509TrustManager trustManager = AdvancedTlsX509TrustManager.newBuilder().build(); | ||
| Method readAndUpdateMethod = |
There was a problem hiding this comment.
You should not be calling the private method via reflection. Use the public method that calls it internally.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes : #10221
Adds a regression test using reflection on the private readAndUpdate() method to verify that a missing file properly results in a FileNotFoundException.