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 issue(#1156) and issue(#1057) to branch opendistro-1.10 #1262

Merged
merged 2 commits into from
Jun 21, 2021

Conversation

niravpi
Copy link

@niravpi niravpi commented Jun 17, 2021

opensearch-security pull request intake form

Please provide as much details as possible to get feedback/acceptance on your PR quickly

  1. Category: (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)
    Backporting

  2. Github Issue # or road-map entry, if available:

  3. Description of changes:

  4. Why these changes are required?

  5. What is the old behavior before changes and new behavior after changes? (Please add any example/logs/screen-shot if available)

  6. Testing done: (Please provide details of testing done: Unit testing, integration testing and manual testing)

  7. Setup Instructions

8.Is it backport from main branch? (If yes, please add backport PR # and commits #)
Yes,

  • Introducing passive_intertransport_auth to facilitate communication b… #1156 and commit hash is : 9adcd20

  • Correcting setupSslOnlyMode to use AbstractSecurityUnitTest.hasCustom… #1057 and commit hash is : 70a4f70

    By making a contribution to this project, I certify that:

    (a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

    (b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

    (c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

    (d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

    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.

@codecov-commenter
Copy link

Codecov Report

Merging #1262 (dd6d66f) into opendistro-1.10 (8a10070) will increase coverage by 0.06%.
The diff coverage is 75.38%.

Impacted file tree graph

@@                  Coverage Diff                  @@
##             opendistro-1.10    #1262      +/-   ##
=====================================================
+ Coverage              63.99%   64.06%   +0.06%     
- Complexity              3168     3183      +15     
=====================================================
  Files                    239      241       +2     
  Lines                  16889    16940      +51     
  Branches                3032     3040       +8     
=====================================================
+ Hits                   10808    10852      +44     
- Misses                  4530     4535       +5     
- Partials                1551     1553       +2     
Impacted Files Coverage Δ
...arch/security/ssl/OpenDistroSecuritySSLPlugin.java 82.60% <0.00%> (ø)
...ort/OpenDistroSecuritySSLTransportInterceptor.java 0.00% <0.00%> (ø)
...lasticsearch/security/support/ConfigConstants.java 94.44% <ø> (ø)
...rch/security/setting/OpenDistroDynamicSetting.java 60.00% <60.00%> (ø)
...ticsearch/security/configuration/CompatConfig.java 38.23% <66.66%> (+10.64%) ⬆️
.../security/setting/TransportPassiveAuthSetting.java 80.00% <80.00%> (ø)
...ty/transport/OpenDistroSecurityRequestHandler.java 75.53% <83.33%> (+0.53%) ⬆️
...arch/security/filter/OpenDistroSecurityFilter.java 77.77% <87.50%> (+2.47%) ⬆️
...asticsearch/security/OpenDistroSecurityPlugin.java 83.54% <100.00%> (+0.10%) ⬆️
...ch/security/ssl/transport/OpenDistroSSLConfig.java 100.00% <100.00%> (+9.52%) ⬆️
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8a10070...dd6d66f. Read the comment docs.

…etween nodes with adv sec enabled and nodes without adv sec enabled.(opensearch-project#1156)

(Cherry picked from commit 9adcd20)
@vrozov vrozov merged commit 9b6d422 into opensearch-project:opendistro-1.10 Jun 21, 2021
gaobinlong pushed a commit to gaobinlong/security that referenced this pull request Aug 30, 2023
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Co-authored-by: Peter Nied <petern@amazon.com>
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.

5 participants