-
Notifications
You must be signed in to change notification settings - Fork 272
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
Correcting setupSslOnlyMode to use AbstractSecurityUnitTest.hasCustom… #1057
Conversation
Codecov Report
@@ Coverage Diff @@
## main #1057 +/- ##
=========================================
Coverage 64.49% 64.49%
Complexity 3168 3168
=========================================
Files 244 244
Lines 17035 17035
Branches 3023 3023
=========================================
Hits 10986 10986
Misses 4515 4515
Partials 1534 1534
Continue to review full report at Codecov.
|
CI failed. |
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.
Please track all places where minimumSecuritySettings...
should be replaced from hardcoded flag to a call to hasCustomTransportSettings
. Please also revert the changes related to the introduction of the flag introduced in #493
src/test/java/com/amazon/opendistroforelasticsearch/security/test/AbstractSecurityUnitTest.java
Outdated
Show resolved
Hide resolved
7f3d80f
to
7bb73db
Compare
src/test/java/com/amazon/opendistroforelasticsearch/security/test/AbstractSecurityUnitTest.java
Outdated
Show resolved
Hide resolved
src/test/java/com/amazon/opendistroforelasticsearch/security/test/AbstractSecurityUnitTest.java
Outdated
Show resolved
Hide resolved
…TransportSettings()
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.
LGTM
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
…TransportSettings() (opensearch-project#1057) (cherry picked from commit 70a4f70)
* Correcting setupSslOnlyMode to use AbstractSecurityUnitTest.hasCustomTransportSettings() (#1057) (cherry picked from commit 70a4f70) * Introducing passive_intertransport_auth to facilitate communication between nodes with adv sec enabled and nodes without adv sec enabled.(#1156) (Cherry picked from commit 9adcd20) Co-authored-by: Debjani Banerjee <56744681+debjanibnrj@users.noreply.github.com> Co-authored-by: dhiAmzn <81139246+dhiAmzn@users.noreply.github.com>
* Correcting setupSslOnlyMode to use AbstractSecurityUnitTest.hasCustomTransportSettings() (#1057) (cherry picked from commit 70a4f70) * Introducing passive_intertransport_auth to facilitate communication between nodes with adv sec enabled and nodes without adv sec enabled.(#1156) (Cherry picked from commit 9adcd20) Co-authored-by: Debjani Banerjee <56744681+debjanibnrj@users.noreply.github.com> Co-authored-by: dhiAmzn <81139246+dhiAmzn@users.noreply.github.com>
* Correcting setupSslOnlyMode to use AbstractSecurityUnitTest.hasCustomTransportSettings() (#1057) (cherry picked from commit 70a4f70) * Introducing passive_intertransport_auth to facilitate communication between nodes with adv sec enabled and nodes without adv sec enabled.(#1156) (Cherry picked from commit 9adcd20) Co-authored-by: Debjani Banerjee <56744681+debjanibnrj@users.noreply.github.com> Co-authored-by: dhiAmzn <81139246+dhiAmzn@users.noreply.github.com>
…TransportSettings() (opensearch-project#1057)
…TransportSettings() (opensearch-project#1057)
…TransportSettings()
opendistro-for-elasticsearch/security pull request intake form
Please provide as much details as possible to get feedback/acceptance on your PR quickly
Category: (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)
Test fix
Github Issue # or road-map entry, if available:
N/A
Description of changes:
The setupSslOnlyMode helper method was incorrectly assuming that the hasCustomTransportSettings would always be false. Making this change to use AbstractSecurityUnitTest.hasCustomTransportSettings() helper.
I have also modified AbstractSecurityUnitTest.hasCustomTransportSettings() to return false if OPENDISTRO_SECURITY_SSL_TRANSPORT_EXTENDED_KEY_USAGE_ENABLED flag is defined in the settings
Why these changes are required?
See description.
What is the old behavior before changes and new behavior after changes? (Please add any example/logs/screen-shot if available)
Testing done: (Please provide details of testing done: Unit testing, integration testing and manual testing)
TO-DOs, if any: (Please describe pending items and provide Github issues# for each of them)
Is it backport from main branch? (If yes, please add backport PR # and commits #)
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.