bug #44759 [HttpFoundation] Fix notice when HTTP_PHP_AUTH_USER passed without pass (Vitali Tsyrkin)

fabpot · fabpot · commit 4987fd1523ac · 2021-12-28T07:55:19.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpFoundation] Fix notice when HTTP_PHP_AUTH_USER passed without pass | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | No | Deprecations? | No | License | MIT There is a way to pass HTTP_XXX vars. If someone will pass HTTP_PHP_AUTH_USER var without HTTP_PHP_AUTH_PW notice will appear since there is no second isset check against $headers, there is isset only for $this->params Commits ------- a9c9912 [HttpFoundation] Fix notice when HTTP_PHP_AUTH_USER passed without pass
diff --git a/src/Symfony/Component/HttpFoundation/ServerBag.php b/src/Symfony/Component/HttpFoundation/ServerBag.php
@@ -89,7 +89,7 @@ public function getHeaders()
 
         // PHP_AUTH_USER/PHP_AUTH_PW
         if (isset($headers['PHP_AUTH_USER'])) {
-            $headers['AUTHORIZATION'] = 'Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.$headers['PHP_AUTH_PW']);
+            $headers['AUTHORIZATION'] = 'Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.($headers['PHP_AUTH_PW'] ?? ''));
         } elseif (isset($headers['PHP_AUTH_DIGEST'])) {
             $headers['AUTHORIZATION'] = $headers['PHP_AUTH_DIGEST'];
         }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ServerBagTest.php
@@ -57,6 +57,16 @@ public function testHttpPasswordIsOptional()
         ], $bag->getHeaders());
     }
 
+    public function testHttpPasswordIsOptionalWhenPassedWithHttpPrefix()
+    {
+        $bag = new ServerBag(['HTTP_PHP_AUTH_USER' => 'foo']);
+
+        $this->assertEquals([
+            'AUTHORIZATION' => 'Basic '.base64_encode('foo:'),
+            'PHP_AUTH_USER' => 'foo',
+        ], $bag->getHeaders());
+    }
+
     public function testHttpBasicAuthWithPhpCgi()
     {
         $bag = new ServerBag(['HTTP_AUTHORIZATION' => 'Basic '.base64_encode('foo:bar')]);

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function getHeaders()`
`89`	`89`
`90`	`90`	`// PHP_AUTH_USER/PHP_AUTH_PW`
`91`	`91`	`if (isset($headers['PHP_AUTH_USER'])) {`
`92`		`- $headers['AUTHORIZATION'] = 'Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.$headers['PHP_AUTH_PW']);`
	`92`	`+ $headers['AUTHORIZATION'] = 'Basic '.base64_encode($headers['PHP_AUTH_USER'].':'.($headers['PHP_AUTH_PW'] ?? ''));`
`93`	`93`	`} elseif (isset($headers['PHP_AUTH_DIGEST'])) {`
`94`	`94`	`$headers['AUTHORIZATION'] = $headers['PHP_AUTH_DIGEST'];`
`95`	`95`	`}`