Merge pull request #686 from andreaTP/fix-playframework-10206

Fix: Avoid loading all the environment variables as configurations
lightbend · Jun 24, 2020 · e0984d4 · e0984d4
2 parents 44f21c3 + 379a1f0
commit e0984d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/config/src/main/java/com/typesafe/config/impl/ConfigImpl.java b/config/src/main/java/com/typesafe/config/impl/ConfigImpl.java
@@ -371,7 +371,7 @@ public static void reloadEnvVariablesConfig() {
 
     private static AbstractConfigObject loadEnvVariablesOverrides() {
         Map<String, String> env = new HashMap(System.getenv());
-        Map<String, String> result = new HashMap(System.getenv());
+        Map<String, String> result = new HashMap();
 
         for (String key : env.keySet()) {
             if (key.startsWith(ENV_VAR_OVERRIDE_PREFIX)) {

diff --git a/config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala b/config/src/test/scala/com/typesafe/config/impl/ConfigTest.scala
@@ -1135,6 +1135,10 @@ class ConfigTest extends TestUtils {
             assertEquals(3, conf02.getInt("a-c"))
             assertEquals(4, conf02.getInt("a_c"))
 
+            intercept[ConfigException.Missing] {
+                conf02.getInt("CONFIG_FORCE_a_b_c")
+            }
+
             assertEquals("foo", conf04.getString("akka.version"))
             assertEquals(10, conf04.getInt("akka.event-handler-dispatcher.max-pool-size"))
         } finally {