Skip to content

Updates the style of all java files under the */dlic/util/ dir.#2823

Merged
stephen-crawford merged 4 commits intoopensearch-project:mainfrom
stephen-crawford:updateStyleUtil
Jun 1, 2023
Merged

Updates the style of all java files under the */dlic/util/ dir.#2823
stephen-crawford merged 4 commits intoopensearch-project:mainfrom
stephen-crawford:updateStyleUtil

Conversation

@stephen-crawford
Copy link
Contributor

Description

Follows #2822. Updates all java files unders **/util/.

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.

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
) throws KeyManagementException {
sslContext.init(
!keyManagers.isEmpty() ? keyManagers.toArray(new KeyManager[keyManagers.size()]) : null,
new TrustManager[] { new OverlyTrustfulTrustManager() },

Check failure

Code scanning / CodeQL

`TrustManager` that accepts all certificates

This uses [TrustManager](1), which is defined in [SettingsBasedSSLConfigurator$OverlyTrustfulTrustManager](2) and trusts any certificate.
) throws KeyManagementException {
sslContext.init(
!keyManagers.isEmpty() ? keyManagers.toArray(new KeyManager[keyManagers.size()]) : null,
new TrustManager[] { new OverlyTrustfulTrustManager() },

Check failure

Code scanning / CodeQL

`TrustManager` that accepts all certificates

This uses [TrustManager](1), which is defined in [SettingsBasedSSLConfiguratorV4$OverlyTrustfulTrustManager](2) and trusts any certificate.
@codecov
Copy link

codecov bot commented May 31, 2023

Codecov Report

Merging #2823 (8586c40) into main (5f9c90b) will decrease coverage by 0.02%.
The diff coverage is 57.73%.

@@             Coverage Diff              @@
##               main    #2823      +/-   ##
============================================
- Coverage     61.61%   61.59%   -0.02%     
  Complexity     3413     3413              
============================================
  Files           266      266              
  Lines         18893    18917      +24     
  Branches       3305     3303       -2     
============================================
+ Hits          11640    11652      +12     
- Misses         5656     5669      +13     
+ Partials       1597     1596       -1     
Impacted Files Coverage Δ
...ic/auth/http/jwt/AbstractHTTPJwtAuthenticator.java 58.42% <0.00%> (ø)
...ic/auth/http/kerberos/HTTPSpnegoAuthenticator.java 0.00% <0.00%> (ø)
...azon/dlic/auth/http/kerberos/util/JaasKrbUtil.java 0.00% <0.00%> (ø)
...zon/dlic/auth/http/kerberos/util/KrbConstants.java 0.00% <0.00%> (ø)
.../dlic/auth/http/saml/SamlHTTPMetadataResolver.java 62.96% <ø> (ø)
.../main/java/com/amazon/dlic/auth/ldap/LdapUser.java 85.71% <ø> (ø)
...a/org/opensearch/security/DefaultObjectMapper.java 64.55% <ø> (ø)
.../action/configupdate/ConfigUpdateNodeResponse.java 77.27% <ø> (ø)
...tion/configupdate/TransportConfigUpdateAction.java 100.00% <ø> (ø)
.../security/action/whoami/TransportWhoAmIAction.java 33.33% <0.00%> (ø)
... and 124 more

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
apply plugin: 'opensearch.pluginzip'
apply plugin: 'opensearch.rest-test'
apply plugin: 'opensearch.testclusters'
//apply from: 'gradle/formatting.gradle'
Copy link
Collaborator

@RyanL1997 RyanL1997 May 31, 2023

Choose a reason for hiding this comment

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

nit: should we just remove it? Or just leave as comment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we are going to leave it as a comment for the time being per this conversation: #2821 (comment)

@stephen-crawford stephen-crawford added the refactoring code/test refactoring label Jun 1, 2023
@stephen-crawford stephen-crawford merged commit 76a5d7f into opensearch-project:main Jun 1, 2023
@stephen-crawford stephen-crawford deleted the updateStyleUtil branch June 5, 2023 14:52
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
…search-project#2823)

* rebase

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update java style under **/auth

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Util dir

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* readd formatting

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
MaciejMierzwa pushed a commit to MaciejMierzwa/security that referenced this pull request Jun 13, 2023
…search-project#2823)

* rebase

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update java style under **/auth

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Util dir

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* readd formatting

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com>
samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023
…search-project#2823)

* rebase

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update java style under **/auth

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Util dir

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* readd formatting

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023
…search-project#2823)

* rebase

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update java style under **/auth

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Util dir

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* readd formatting

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
Signed-off-by: Sam <samuel.costa@eliatra.com>
samuelcostae pushed a commit to samuelcostae/security that referenced this pull request Jun 19, 2023
…search-project#2823)

* rebase

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update java style under **/auth

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* Update Util dir

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* readd formatting

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
peternied added a commit to peternied/security that referenced this pull request Aug 3, 2023
…til/ dir

Backporting opensearch-project#2823

Signed-off-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

refactoring code/test refactoring

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments