Handle BC-FIPS related exception and propagate exception causes #155
Conversation
This file contains 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
PereBueno
approved these changes
Jul 5, 2024
jtnord
commented
Jul 5, 2024
| throw new AssertionError( | ||
| "RSA algorithm support is mandated by Java Language Specification. See https://docs.oracle.com/javase/7/docs/api/java/security/KeyFactory.html"); | ||
| throw new IOException("Algorithm required for parsing is not implemented", e); |
There was a problem hiding this comment.
the key could be types other than RSA so this was not actually correct.
| @@ -245,13 +244,23 @@ private static final PEMEncodable convertedPemToPemDecodable(Object object, char | |||
| + object.getClass().getName()); | |||
| } | |||
| } catch (PKCSException | InvalidKeySpecException e) { | |||
| LOGGER.log(Level.WARNING, "Could not read PEM encrypted information", e); | |||
| throw new UnrecoverableKeyException(); | |||
There was a problem hiding this comment.
this previously swallowed the reason why from the caller - let the caller log and handle all the information just as they would for the other exceptions
When testing with BC-FIPS PEMEncodeable was failing in some unexpected ways. in the first if we could not convert due to a PKCSException or InvalidKeySpecException then the cause was logged and a new exception without details was thrown. This means the underlying cause is lost when using any exception in a FormValidation. In the second case when using a key that had too short of salt an org.bouncycastle.crypto.fips.FipsUnapprovedOperationError was thrown which being an error would ripple up and cause an unexpected error. We now catch this error and wrap it in an UnrecoverableKeyException so it can be handled by the caller
jtnord
force-pushed
the
better-exception-handling
branch
from
2031aad to
e306e53
Compare
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.
When testing with BC-FIPS PEMEncodeable was failing in some unexpected ways.
in the first if we could not convert due to a PKCSException or InvalidKeySpecException then the cause was logged and a new exception without details was thrown. This means the underlying cause is lost when using any exception in a FormValidation.
In the second case when using a key that had too short of salt an org.bouncycastle.crypto.fips.FipsUnapprovedOperationError was thrown which being an error would ripple up and cause an unexpected error.
We now catch this error and wrap it in an UnrecoverableKeyException so it can be handled by the caller
Testing done
Submitter checklist