forked from opensearch-project/security
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into upgrade-roles
Signed-off-by: Peter Nied <[email protected]>
- Loading branch information
Showing
8 changed files
with
151 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -81,7 +81,7 @@ jobs: | |
| working-directory: downloaded-artifacts | ||
|
|
||
| - name: Upload Coverage with retry | ||
| uses: Wandalen/[email protected].4 | ||
| uses: Wandalen/[email protected].10 | ||
| with: | ||
| attempt_limit: 5 | ||
| attempt_delay: 2000 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
src/test/java/org/opensearch/security/ssl/util/SSLConfigConstantsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| * | ||
| * Modifications Copyright OpenSearch Contributors. See | ||
| * GitHub history for details. | ||
| */ | ||
| package org.opensearch.security.ssl.util; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import org.opensearch.common.settings.Settings; | ||
|
|
||
| import static org.opensearch.security.ssl.util.SSLConfigConstants.SECURITY_SSL_HTTP_ENABLED_PROTOCOLS; | ||
| import static org.opensearch.security.ssl.util.SSLConfigConstants.SECURITY_SSL_TRANSPORT_ENABLED_PROTOCOLS; | ||
| import static org.junit.Assert.assertArrayEquals; | ||
|
|
||
| public class SSLConfigConstantsTest { | ||
|
|
||
| @Test | ||
| public void testDefaultTLSProtocols() { | ||
| final var tlsDefaultProtocols = SSLConfigConstants.getSecureSSLProtocols(Settings.EMPTY, false); | ||
| assertArrayEquals(new String[] { "TLSv1.3", "TLSv1.2", "TLSv1.1" }, tlsDefaultProtocols); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDefaultSSLProtocols() { | ||
| final var sslDefaultProtocols = SSLConfigConstants.getSecureSSLProtocols(Settings.EMPTY, true); | ||
| assertArrayEquals(new String[] { "TLSv1.3", "TLSv1.2", "TLSv1.1" }, sslDefaultProtocols); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCustomTLSProtocols() { | ||
| final var tlsDefaultProtocols = SSLConfigConstants.getSecureSSLProtocols( | ||
| Settings.builder().putList(SECURITY_SSL_TRANSPORT_ENABLED_PROTOCOLS, List.of("TLSv1", "TLSv1.1")).build(), | ||
| false | ||
| ); | ||
| assertArrayEquals(new String[] { "TLSv1", "TLSv1.1" }, tlsDefaultProtocols); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCustomSSLProtocols() { | ||
| final var sslDefaultProtocols = SSLConfigConstants.getSecureSSLProtocols( | ||
| Settings.builder().putList(SECURITY_SSL_HTTP_ENABLED_PROTOCOLS, List.of("TLSv1", "TLSv1.1")).build(), | ||
| true | ||
| ); | ||
| assertArrayEquals(new String[] { "TLSv1", "TLSv1.1" }, sslDefaultProtocols); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters