-
Notifications
You must be signed in to change notification settings - Fork 25.7k
Bump json-smart and oauth2-oidc-sdk #122737
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
1a2e2f5
Bump json-smart and oauth2-oidc-sdk
jfreden d4de546
Update docs/changelog/122737.yaml
jfreden 194e572
fixup! Address code review comments
jfreden a40e6e3
Merge remote-tracking branch 'upstream/main' into bump_json_smart
jfreden 07b0078
fixup! Cleanup
jfreden 07f99c1
Merge branch 'main' into bump_json_smart
jfreden 322df60
fixup! Some more cleanup
jfreden bfda15b
fixup! Cleaned a little too much
jfreden 96018ab
fixup! Add new method
jfreden e8b32c6
[CI] Auto commit changes from spotless
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| pr: 122737 | ||
| summary: Bump json-smart and oauth2-oidc-sdk | ||
| area: Authentication | ||
| type: upgrade | ||
| issues: [] |
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ | |
| import java.text.ParseException; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Date; | ||
|
|
||
| /** | ||
| * This class wraps {@link org.elasticsearch.nimbus.jose.util.JSONObjectUtils}, which is copied directly from the source | ||
|
|
@@ -192,6 +193,16 @@ public static Base64URL getBase64URL(final Map<String, Object> o, final String k | |
| } | ||
| } | ||
|
|
||
| public static Date getEpochSecondAsDate(final Map<String, Object> o, final String key) throws ParseException { | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This method was added since we last upgraded: https://bitbucket.org/connect2id/nimbus-jose-jwt/commits/bd59d30bfc33c6eb8ec9514f67a4261d95c894c4#Lsrc/main/java/com/nimbusds/jose/util/JSONObjectUtils.javaT519 |
||
| try { | ||
| return AccessController.doPrivileged( | ||
| (PrivilegedExceptionAction<Date>) () -> org.elasticsearch.nimbus.jose.util.JSONObjectUtils.getEpochSecondAsDate(o, key) | ||
| ); | ||
| } catch (PrivilegedActionException e) { | ||
| throw (ParseException) e.getException(); | ||
| } | ||
| } | ||
|
|
||
| public static String toJSONString(final Map<String, ?> o) { | ||
| return AccessController.doPrivileged( | ||
| (PrivilegedAction<String>) () -> org.elasticsearch.nimbus.jose.util.JSONObjectUtils.toJSONString(o) | ||
|
|
||
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.
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.
These were part of
bcprov-jdk18on1.77but no longer used in1.79(updated transitive dependency fromnimbus-jose-jwt) and therefore they don't need to be declared as missing classes here anymore.