Skip to content
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

[Backport 2.x] Switch from org.apache.cxf.rs.security.jose to com.nimbusds.jose.jwk. #3595

Merged
merged 2 commits into from
Oct 25, 2023

Conversation

RyanL1997
Copy link
Collaborator

@RyanL1997 RyanL1997 commented Oct 24, 2023

Description

Switch from org.apache.cxf.rs.security.jose to com.nimbusds.jose.jwk.

Issues Resolved

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff
  • Add a checkstyle rule to detect including references to org.apache.cxf.rs.security.jose
  • Remove all references to org.apache.cxf.rs.security.jose [15] files impacted
  • Replace all unfulfilled references with com.nimbusds.jose.* components
  • Add backwards combability tests for any features that have previously shipped

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…ject#3421)

Switch from org.apache.cxf.rs.security.jose to com.nimbusds.jose.jwk.

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
Signed-off-by: Ryan Liang <jiallian@amazon.com>
Co-authored-by: Peter Nied <petern@amazon.com>
Co-authored-by: Ryan Liang <jiallian@amazon.com>
Signed-off-by: Ryan Liang <jiallian@amazon.com>
@codecov
Copy link

codecov bot commented Oct 24, 2023

Codecov Report

Merging #3595 (da6108f) into 2.x (587d747) will decrease coverage by 0.07%.
Report is 3 commits behind head on 2.x.
The diff coverage is 78.26%.

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #3595      +/-   ##
============================================
- Coverage     64.84%   64.77%   -0.07%     
+ Complexity     3596     3590       -6     
============================================
  Files           281      282       +1     
  Lines         20382    20381       -1     
  Branches       3374     3372       -2     
============================================
- Hits          13216    13202      -14     
- Misses         5491     5507      +16     
+ Partials       1675     1672       -3     
Files Coverage Δ
...ic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java 59.77% <100.00%> (ø)
...zon/dlic/auth/http/saml/HTTPSamlAuthenticator.java 67.36% <ø> (ø)
.../dlic/auth/http/jwt/keybyoidc/KeySetRetriever.java 80.00% <33.33%> (-1.56%) ⬇️
...azon/dlic/auth/http/jwt/keybyoidc/JwtVerifier.java 79.62% <85.71%> (-9.05%) ⬇️
...nsearch/security/authtoken/jwt/KeyPaddingUtil.java 57.14% <57.14%> (ø)
.../auth/http/jwt/keybyoidc/SelfRefreshingKeySet.java 57.74% <58.33%> (-8.46%) ⬇️
...g/opensearch/security/authtoken/jwt/JwtVendor.java 88.13% <87.17%> (-8.84%) ⬇️
...dlic/auth/http/saml/AuthTokenProcessorHandler.java 50.28% <75.00%> (+3.87%) ⬆️

... and 3 files with indirect coverage changes

Copy link
Member

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @RyanL1997! Feel free to merge this after adding a brief comment on why manual backport was required.

@RyanL1997
Copy link
Collaborator Author

@DarshitChanpura thanks. Yes the auto backport failure was due to the conflict of the http library. We are using org.apache.hc.core5.http in main branch. #3581 also captured this.

@RyanL1997 RyanL1997 merged commit 587f403 into opensearch-project:2.x Oct 25, 2023
57 of 58 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants