Use lazy lookahead to find the env key name

Signed-off-by: Peter Nied <[email protected]>
opensearch-project · Oct 25, 2022 · f876447 · f876447
1 parent a44c85a
commit f876447
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/org/opensearch/security/support/SecurityUtils.java b/src/main/java/org/opensearch/security/support/SecurityUtils.java
@@ -46,7 +46,7 @@
 public final class SecurityUtils {
 
     protected final static Logger log = LogManager.getLogger(SecurityUtils.class);
-    private static final String ENV_PATTERN_SUFFIX = "\\.([\\w=():\\-_]+)((\\:\\-)?[\\w=():\\-_]*)\\}";
+    private static final String ENV_PATTERN_SUFFIX = "\\.([\\w=():\\-_]+?)(\\:\\-[\\w=():\\-_]*)?\\}";
     static final Pattern ENV_PATTERN = Pattern.compile("\\$\\{env" + ENV_PATTERN_SUFFIX);
     static final Pattern ENVBC_PATTERN = Pattern.compile("\\$\\{envbc" + ENV_PATTERN_SUFFIX);
     static final Pattern ENVBASE64_PATTERN = Pattern.compile("\\$\\{envbase64" + ENV_PATTERN_SUFFIX);

diff --git a/src/test/java/org/opensearch/security/support/SecurityUtilsTest.java b/src/test/java/org/opensearch/security/support/SecurityUtilsTest.java
@@ -28,7 +28,10 @@ public class SecurityUtilsTest {
         "=ExitCode",
         "=C:",
         "ProgramFiles(x86)",
-        "INPUT_GRADLE-HOME-CACHE-CLEANUP"
+        "INPUT_GRADLE-HOME-CACHE-CLEANUP",
+        "MYENV",
+        "MYENV:",
+        "MYENV::"
     );
     private final Collection<String> namesFromThisRuntimeEnvironment = System.getenv().keySet();