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/backport-2802-to-2.x? #3429

Conversation

parasjain1
Copy link
Contributor

@parasjain1 parasjain1 commented Sep 30, 2023

Use custom serialization in security plugin.

Description

Refer #2802

Issues Resolved

Is this a backport? If so, please add backport PR # and/or commits #
Yes
#2802

Testing

Refer

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

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.

Use custom serialization in security plugin.
- Resolves opensearch-project#2780

Signed-off-by: Paras Jain <[email protected]>
Signed-off-by: Peter Nied <[email protected]>
Co-authored-by: Paras Jain <[email protected]>
Co-authored-by: Peter Nied <[email protected]>
Signed-off-by: Paras Jain <[email protected]>
@codecov
Copy link

codecov bot commented Sep 30, 2023

Codecov Report

Merging #3429 (46862ea) into 2.x (a2daf9f) will increase coverage by 0.45%.
Report is 8 commits behind head on 2.x.
The diff coverage is 80.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #3429      +/-   ##
============================================
+ Coverage     64.11%   64.56%   +0.45%     
- Complexity     3367     3508     +141     
============================================
  Files           256      260       +4     
  Lines         19515    19719     +204     
  Branches       3297     3308      +11     
============================================
+ Hits          12512    12732     +220     
+ Misses         5360     5356       -4     
+ Partials       1643     1631      -12     
Files Coverage Δ
.../main/java/com/amazon/dlic/auth/ldap/LdapUser.java 89.28% <100.00%> (+3.57%) ⬆️
...earch/security/auditlog/impl/AbstractAuditLog.java 76.53% <100.00%> (+0.10%) ⬆️
...ava/org/opensearch/security/auth/UserInjector.java 90.66% <100.00%> (+0.66%) ⬆️
...org/opensearch/security/filter/SecurityFilter.java 66.66% <100.00%> (+0.80%) ⬆️
...urity/ssl/transport/SecuritySSLRequestHandler.java 62.22% <100.00%> (+3.13%) ⬆️
.../org/opensearch/security/support/Base64Helper.java 90.90% <100.00%> (+23.63%) ⬆️
...g/opensearch/security/support/ConfigConstants.java 95.23% <100.00%> (+0.23%) ⬆️
.../org/opensearch/security/support/HeaderHelper.java 62.50% <100.00%> (+2.50%) ⬆️
...rch/security/transport/SecurityRequestHandler.java 55.03% <100.00%> (+0.30%) ⬆️
...c/main/java/org/opensearch/security/user/User.java 71.95% <100.00%> (+15.70%) ⬆️
... and 7 more

... and 17 files with indirect coverage changes

@DarshitChanpura
Copy link
Member

@parasjain1 Is this targeting 2.11 release?

@parasjain1
Copy link
Contributor Author

@DarshitChanpura yes this is targeting 2.11 release.

@parasjain1
Copy link
Contributor Author

FYI BWC tests are failing due to compilation failures. Seems like the recent fixes were not backported to 2.x.

  • While resolving conflicts, I've not brought in any changes to the CI configuration. Please see if we need to bring those in, feel free to open a separate PR if needed.
  • I've updated the ConfigConstants.FIRST_CUSTOM_SERIALIZATION_SUPPORTED_OS_VERSION to 2.11.0 in this PR and accordingly also updated the versions in SecuritySSLRequestHandlerTests.

@cwperks
Copy link
Member

cwperks commented Oct 3, 2023

@parasjain1 The compilation failures are due to a difference in the version of the Apache HttpClient/HttpComponent libraries used in main vs 2.x. main uses HttpClientV5 while 2.x uses HttpClientV4. This PR will need to adjust to the difference between the main and 2.x branch of the security plugin.

@cwperks
Copy link
Member

cwperks commented Oct 3, 2023

Closing as #3444 was merged.

@cwperks cwperks closed this Oct 3, 2023
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