[BC breaking] Accept only valid base 64 in envvars

mcfedr · mcfedr · commit 90bc19fc7912 · 2018-03-16T15:13:45.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -118,7 +118,13 @@ public function getEnv($prefix, $name, \Closure $getEnv)
         }
 
         if ('base64' === $prefix) {
-            return base64_decode($env);
+            $env = base64_decode($env, true);
+
+            if (false === $env) {
+                throw new RuntimeException(sprintf('Invalid Base64 in env var "%s": ', $name));
+            }
+
+            return $env;
         }
 
         if ('json' === $prefix) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -233,6 +233,21 @@ public function testGetEnvBase64()
         $this->assertSame('hello', $result);
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedExceptionMessage Invalid Base64
+     */
+    public function testGetEnvInvalidBase64()
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $processor->getEnv('base64', 'foo', function ($name) {
+            $this->assertSame('foo', $name);
+
+            return 'this is invalid base64 %';
+        });
+    }
+
     public function testGetEnvJson()
     {
         $processor = new EnvVarProcessor(new Container());

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,13 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`if ('base64' === $prefix) {`
`121`		`- return base64_decode($env);`
	`121`	`+ $env = base64_decode($env, true);`
	`122`	`+`
	`123`	`+ if (false === $env) {`
	`124`	`+ throw new RuntimeException(sprintf('Invalid Base64 in env var "%s": ', $name));`
	`125`	`+ }`
	`126`	`+`
	`127`	`+ return $env;`
`122`	`128`	`}`
`123`	`129`
`124`	`130`	`if ('json' === $prefix) {`