-
Notifications
You must be signed in to change notification settings - Fork 3
Backport to branch(3.12) : Fix NullPointerException when a client is misconfigured with digital signature #314
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.
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
Conversation
…l signature for HMAC (#302)
Summary of ChangesHello @feeblefakie, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This backport addresses a potential Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request effectively addresses a NullPointerException arising from a client misconfiguration with digital signatures. The core change, modifying SecretRegistry.lookup to throw a specific MissingSecretException instead of returning null, is a robust solution that prevents this and similar null-related issues. The accompanying changes in error handling, status codes, and tests are consistent and thorough, including a new integration test that validates the fix. Overall, the changes improve code quality and reliability. I have a couple of suggestions to further enhance code clarity and maintainability.
| public void register(SecretEntry entry) { | ||
| SecretEntry existing = registry.lookup(entry.getKey()); | ||
| if (existing != null) { | ||
| try { | ||
| registry.lookup(entry.getKey()); | ||
| throw new DatabaseException(CommonError.SECRET_ALREADY_REGISTERED); | ||
| } catch (MissingSecretException e) { | ||
| registry.bind(entry); | ||
| } | ||
| registry.bind(entry); | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While this implementation is functionally correct, using a try-catch block for control flow to check for existence can be considered an anti-pattern as it can make the code's intent less clear. A more conventional approach would be to have an exists(Key) method in the SecretRegistry that returns a boolean. This would make the logic in register more explicit: check for existence, then either throw an exception or bind the new entry. This change would improve readability and maintainability.
| Result result; | ||
| try { | ||
| return storage.get(get).map(this::toSecretEntry).orElse(null); | ||
| result = | ||
| storage | ||
| .get(get) | ||
| .orElseThrow(() -> new MissingSecretException(CommonError.SECRET_NOT_FOUND)); | ||
| } catch (ExecutionException e) { | ||
| throw new DatabaseException(CommonError.GETTING_SECRET_KEY_FAILED, e, e.getMessage()); | ||
| } | ||
|
|
||
| return toSecretEntry(result); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This implementation can be written more concisely using a more functional style with Optional.map(). This would avoid the need for the local result variable and make the flow more streamlined.
try {
return storage
.get(get)
.map(this::toSecretEntry)
.orElseThrow(() -> new MissingSecretException(CommonError.SECRET_NOT_FOUND));
} catch (ExecutionException e) {
throw new DatabaseException(CommonError.GETTING_SECRET_KEY_FAILED, e, e.getMessage());
}
This is an automated backport of the following:
Please merge this PR after all checks have passed.