[DI] made the %env(base64:...)% processor able to decode base64url

nicolas-grekas · nicolas-grekas · commit 3d12e46692c7 · 2019-10-22T08:40:11.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -14,6 +14,7 @@ CHANGELOG
  * added ability to define a static priority method for tagged service
  * added support for improved syntax to define method calls in Yaml
  * added `LazyString` for lazy computation of string values injected into services
+ * made the `%env(base64:...)%` processor able to decode base64url
 
 4.3.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -173,7 +173,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
         }
 
         if ('base64' === $prefix) {
-            return base64_decode($env);
+            return base64_decode(strtr($env, '-_', '+/'));
         }
 
         if ('json' === $prefix) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php b/src/Symfony/Component/DependencyInjection/Tests/EnvVarProcessorTest.php
@@ -231,6 +231,12 @@ public function testGetEnvBase64()
         });
 
         $this->assertSame('hello', $result);
+
+        $result = $processor->getEnv('base64', 'foo', function ($name) { return '/+0='; });
+        $this->assertSame("\xFF\xED", $result);
+
+        $result = $processor->getEnv('base64', 'foo', function ($name) { return '_-0='; });
+        $this->assertSame("\xFF\xED", $result);
     }
 
     public function testGetEnvTrim()

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`if ('base64' === $prefix) {`
`176`		`- return base64_decode($env);`
	`176`	`+ return base64_decode(strtr($env, '-_', '+/'));`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`if ('json' === $prefix) {`