Skip to content

Commit 74dfcd1

Browse files
Fixes base64 encoded hardcoded admin credentials (#1331)
* Fixes base64 encoded hardcoded admin credentials Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes broken integTest task Signed-off-by: Darshit Chanpura <dchanp@amazon.com> --------- Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
1 parent 3f4f216 commit 74dfcd1

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ int endJmxPort = startJmxPort
450450
integTest {
451451
useCluster testClusters.leaderCluster
452452
useCluster testClusters.followCluster
453+
systemProperty "password", "admin" // setting it to `admin` explicitly since its a custom security setup
453454

454455
if(knnEnabled){
455456
nonInputProperties.systemProperty('tests.knn_plugin_enabled', "true")

src/test/kotlin/org/opensearch/replication/MultiClusterRestTestCase.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,14 @@ import org.junit.After
5757
import org.junit.AfterClass
5858
import org.junit.Before
5959
import org.junit.BeforeClass
60+
import java.nio.charset.StandardCharsets
6061
import java.nio.file.Files
6162
import java.security.KeyManagementException
6263
import java.security.KeyStore
6364
import java.security.KeyStoreException
6465
import java.security.NoSuchAlgorithmException
6566
import java.security.cert.CertificateException
67+
import java.util.Base64
6668
import java.util.concurrent.TimeUnit
6769
import java.util.concurrent.atomic.AtomicReference
6870
import java.util.Collections
@@ -233,8 +235,10 @@ abstract class MultiClusterRestTestCase : OpenSearchTestCase() {
233235
for ((key, value) in headers) {
234236
defaultHeaders[i++] = BasicHeader(key, value)
235237
}
238+
239+
val creds = System.getProperty("user", "admin") + ":" + System.getProperty("password", "myStrongPassword123!")
236240
if(securityEnabled) {
237-
defaultHeaders[i++] = BasicHeader("Authorization", "Basic YWRtaW46YWRtaW4=")
241+
defaultHeaders[i++] = BasicHeader("Authorization", "Basic " + Base64.getEncoder().encodeToString(creds.toByteArray(StandardCharsets.UTF_8)))
238242
}
239243

240244
builder.setDefaultHeaders(defaultHeaders)

0 commit comments

Comments
 (0)