From 728739133cc0f3999ad4a0717135128944bc5bee Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Mon, 4 Mar 2024 09:32:55 -0800 Subject: [PATCH 1/4] replace sensitive log message with generic string --- .../pds/api/registry/configuration/AWSSecretsAccessTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/service/src/test/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccessTest.java b/service/src/test/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccessTest.java index c711113a..eeac8d09 100644 --- a/service/src/test/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccessTest.java +++ b/service/src/test/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccessTest.java @@ -28,8 +28,7 @@ public static final void main(String args[]) { for (String secretName : args) { DefaultKeyValue secret = testGetSecret(secretName); if (secret != null) { - log.info(String.format("Secret name : %s, Secret Id : %s / Secret Value : %s", secretName, - secret.getKey(), secret.getValue())); + log.info("Successfully retrieved secret."); } else { log.error(String.format("Lookup for secrete %s returned null.", secretName)); } From e73107629f36813aa9d5f3c5d39fb192ad29aba3 Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Mon, 4 Mar 2024 09:33:31 -0800 Subject: [PATCH 2/4] remove sensitive debug log message --- .../search/OpenSearchRegistryConnectionImplBuilder.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/gov/nasa/pds/api/registry/search/OpenSearchRegistryConnectionImplBuilder.java b/service/src/main/java/gov/nasa/pds/api/registry/search/OpenSearchRegistryConnectionImplBuilder.java index 5f3694de..074f9859 100644 --- a/service/src/main/java/gov/nasa/pds/api/registry/search/OpenSearchRegistryConnectionImplBuilder.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/search/OpenSearchRegistryConnectionImplBuilder.java @@ -55,11 +55,11 @@ public int getTimeOutSeconds() { return timeOutSeconds; } - + public boolean getCCSEnabled() { return CCSEnabled; } - + public boolean isSsl() { return ssl; } @@ -123,7 +123,6 @@ public void trySetESCredsFromEnv() { this.username = esCreds.getKey(); this.password = esCreds.getValue(); - log.debug(String.format("ES Username from environment : [%s]", this.username)); } } From ee454f0063e7afa84bce5e9f64ae87808d29681e Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Mon, 4 Mar 2024 09:35:35 -0800 Subject: [PATCH 3/4] replace sensitive log message with more-generic string --- .../nasa/pds/api/registry/configuration/AWSSecretsAccess.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccess.java b/service/src/main/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccess.java index 0b6dfd11..a834b859 100644 --- a/service/src/main/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccess.java +++ b/service/src/main/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccess.java @@ -43,7 +43,7 @@ public DefaultKeyValue getSecret(String secretName, String regio region = REGISTRY_DEFAULT_AWS_REGION; } - log.debug(String.format("Looking up secret %s in region %s", secretName, region)); + log.debug(String.format("Looking up secret in non-default region %s", region)); // Create a Secrets Manager client AWSSecretsManager client = AWSSecretsManagerClientBuilder.standard().withRegion(region).build(); From 8a6b344256d6bb979ccc773d5e2a0be09481db11 Mon Sep 17 00:00:00 2001 From: Alex Dunn Date: Mon, 4 Mar 2024 09:37:09 -0800 Subject: [PATCH 4/4] replace sensitive log message with generic string --- .../pds/api/registry/configuration/AWSSecretsAccessTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/test/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccessTest.java b/service/src/test/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccessTest.java index eeac8d09..9492df7a 100644 --- a/service/src/test/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccessTest.java +++ b/service/src/test/java/gov/nasa/pds/api/registry/configuration/AWSSecretsAccessTest.java @@ -24,13 +24,13 @@ static DefaultKeyValue testGetSecret(String secretName) { return result; } - public static final void main(String args[]) { + public static void main(String[] args) { for (String secretName : args) { DefaultKeyValue secret = testGetSecret(secretName); if (secret != null) { log.info("Successfully retrieved secret."); } else { - log.error(String.format("Lookup for secrete %s returned null.", secretName)); + log.error("Lookup for secret returned null."); } } }