Skip to content

[Backport 2.x] Added secure settings for ssl related passwords: (#2296)#3037

Merged
davidlago merged 8 commits intoopensearch-project:2.xfrom
DarshitChanpura:backport/backport-2296-to-2.x
Jul 27, 2023
Merged

[Backport 2.x] Added secure settings for ssl related passwords: (#2296)#3037
davidlago merged 8 commits intoopensearch-project:2.xfrom
DarshitChanpura:backport/backport-2296-to-2.x

Conversation

@DarshitChanpura
Copy link
Member

Description

Backports 2c20be0 from #2296

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.

…2296)

Added secure settings for ssl related passwords:

* plugins.security.ssl.http.pemkey_password_secure
* plugins.security.ssl.http.keystore_password_secure
* plugins.security.ssl.http.keystore_keypassword_secure
* plugins.security.ssl.http.truststore_password_secure
* plugins.security.ssl.transport.pemkey_password_secure
* plugins.security.ssl.transport.server.pemkey_password_secure
* plugins.security.ssl.transport.client.pemkey_password_secure
* plugins.security.ssl.transport.keystore_password_secure
* plugins.security.ssl.transport.keystore_keypassword_secure
* plugins.security.ssl.transport.server.keystore_keypassword_secure
* plugins.security.ssl.transport.client.keystore_keypassword_secure
* plugins.security.ssl.transport.truststore_password_secure

Signed-off-by: Chris White <chriswhite199@gmail.com>
(cherry picked from commit 2c20be0)
@DarshitChanpura DarshitChanpura added the v2.10.0 Issues targeting release v2.10.0 label Jul 20, 2023
@DarshitChanpura DarshitChanpura changed the title Added secure settings for ssl related passwords: (#2296) [Backport 2.x] Added secure settings for ssl related passwords: (#2296) Jul 20, 2023
@DarshitChanpura
Copy link
Member Author

DarshitChanpura commented Jul 20, 2023

Blocked by #3036

Unblocked now.

@DarshitChanpura DarshitChanpura self-assigned this Jul 21, 2023
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura DarshitChanpura changed the base branch from 2.x to 2.0 July 21, 2023 16:02
@DarshitChanpura DarshitChanpura changed the base branch from 2.0 to 2.x July 21, 2023 16:02
@DarshitChanpura
Copy link
Member Author

DarshitChanpura commented Jul 21, 2023

Temporarily changing the base helped resolve the issue of the latest commits from the backport branch not being reflected here.

Edit: Needed to force-push same commit because DCO erroneously broke due to temporary change in base

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura DarshitChanpura force-pushed the backport/backport-2296-to-2.x branch from 6a5401b to 47cd84d Compare July 21, 2023 16:06
RyanL1997
RyanL1997 previously approved these changes Jul 21, 2023
@codecov
Copy link

codecov bot commented Jul 21, 2023

Codecov Report

Merging #3037 (4c988d9) into 2.x (38dab2e) will decrease coverage by 0.04%.
The diff coverage is 95.16%.

@@             Coverage Diff              @@
##                2.x    #3037      +/-   ##
============================================
- Coverage     62.25%   62.21%   -0.04%     
+ Complexity     3315     3314       -1     
============================================
  Files           264      265       +1     
  Lines         19471    19488      +17     
  Branches       3326     3328       +2     
============================================
+ Hits          12121    12124       +3     
- Misses         5722     5734      +12     
- Partials       1628     1630       +2     
Impacted Files Coverage Δ
...security/auditlog/sink/ExternalOpenSearchSink.java 62.36% <0.00%> (ø)
...ensearch/security/ssl/util/SSLConfigConstants.java 77.77% <ø> (ø)
...ic/auth/ldap/backend/LDAPAuthorizationBackend.java 57.38% <100.00%> (ø)
...amazon/dlic/util/SettingsBasedSSLConfigurator.java 70.55% <100.00%> (ø)
...opensearch/security/auditlog/sink/WebhookSink.java 76.47% <100.00%> (ø)
...ensearch/security/ssl/DefaultSecurityKeyStore.java 74.09% <100.00%> (-0.41%) ⬇️
...arch/security/ssl/OpenSearchSecuritySSLPlugin.java 83.56% <100.00%> (-1.38%) ⬇️
...org/opensearch/security/ssl/SecureSSLSettings.java 100.00% <100.00%> (ø)
...opensearch/security/ssl/util/SSLRequestHelper.java 66.96% <100.00%> (ø)

... and 9 files with indirect coverage changes

willyborankin
willyborankin previously approved these changes Jul 21, 2023
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura DarshitChanpura dismissed stale reviews from RyanL1997 and willyborankin via 1be111b July 21, 2023 19:50
@DarshitChanpura DarshitChanpura force-pushed the backport/backport-2296-to-2.x branch from f6f26e1 to 1be111b Compare July 21, 2023 19:50
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@davidlago davidlago merged commit 11041cd into opensearch-project:2.x Jul 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

v2.10.0 Issues targeting release v2.10.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants