OskarStark
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
Lines changed: 6 additions & 4 deletions b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
Lines changed: 6 additions & 4 deletions
diff --git a/‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
Lines changed: 26 additions & 0 deletions b/‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
Lines changed: 26 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Finder/Comparator/DateComparator.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Finder/Comparator/DateComparator.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Finder/Tests/Comparator/DateComparatorTest.php
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Finder/Tests/Comparator/DateComparatorTest.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/HtmlSanitizer/Tests/TextSanitizer/UrlSanitizerTest.php
Lines changed: 14 additions & 14 deletions b/‎src/Symfony/Component/HtmlSanitizer/Tests/TextSanitizer/UrlSanitizerTest.php
Lines changed: 14 additions & 14 deletions
diff --git a/‎src/Symfony/Component/HtmlSanitizer/TextSanitizer/UrlSanitizer.php
Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/HtmlSanitizer/TextSanitizer/UrlSanitizer.php
Lines changed: 7 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpClient/Tests/NoPrivateNetworkHttpClientTest.php
Lines changed: 21 additions & 0 deletions b/‎src/Symfony/Component/HttpClient/Tests/NoPrivateNetworkHttpClientTest.php
Lines changed: 21 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
Lines changed: 6 additions & 1 deletion b/‎src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
Lines changed: 11 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
Lines changed: 11 additions & 0 deletions
@@ -643,11 +643,13 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri
         }
 
         if ($container->hasDefinition('debug.security.firewall')) {
-            foreach ($authenticationProviders as $authenticatorId) {
-                $container->register('debug.'.$authenticatorId, TraceableAuthenticator::class)
-                    ->setDecoratedService($authenticatorId)
-                    ->setArguments([new Reference('debug.'.$authenticatorId.'.inner')])
+            foreach ($authenticationProviders as &$authenticatorId) {
+                $traceableId = 'debug.'.$authenticatorId;
+                $container
+                    ->register($traceableId, TraceableAuthenticator::class)
+                    ->setArguments([new Reference($authenticatorId)])
                 ;
+                $authenticatorId = $traceableId;
             }
         }
 
 
@@ -20,7 +20,9 @@
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\DecoratorServicePass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveReferencesToAliasesPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\ExpressionLanguage\Expression;
@@ -900,6 +902,30 @@ public function testCustomHasherWithMigrateFrom()
         ]);
     }
 
+    public function testAuthenticatorsDecoration()
+    {
+        $container = $this->getRawContainer();
+        $container->setParameter('kernel.debug', true);
+        $container->getCompilerPassConfig()->setOptimizationPasses([
+            new ResolveChildDefinitionsPass(),
+            new DecoratorServicePass(),
+            new ResolveReferencesToAliasesPass(),
+        ]);
+
+        $container->register(TestAuthenticator::class);
+        $container->loadFromExtension('security', [
+            'firewalls' => ['main' => ['custom_authenticator' => TestAuthenticator::class]],
+        ]);
+        $container->compile();
+
+        /** @var Reference[] $managerAuthenticators */
+        $managerAuthenticators = $container->getDefinition('security.authenticator.manager.main')->getArgument(0);
+        $this->assertCount(1, $managerAuthenticators);
+        $this->assertSame('debug.'.TestAuthenticator::class, (string) reset($managerAuthenticators), 'AuthenticatorManager must be injected traceable authenticators in debug mode.');
+
+        $this->assertTrue($container->hasDefinition(TestAuthenticator::class), 'Original authenticator must still exist in the container so it can be used outside of the AuthenticatorManager’s context.');
+    }
+
     protected function getRawContainer()
     {
         $container = new ContainerBuilder();
 
@@ -36,7 +36,7 @@ public function __construct(string $test)
             throw new \InvalidArgumentException(\sprintf('"%s" is not a valid date.', $matches[2]));
         }
 
-        $operator = $matches[1] ?? '==';
+        $operator = $matches[1] ?: '==';
         if ('since' === $operator || 'after' === $operator) {
             $operator = '>';
         }
 
@@ -59,6 +59,7 @@ public static function getTestData()
             ['after 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
             ['since 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],
             ['!= 2005-10-10', [strtotime('2005-10-11')], [strtotime('2005-10-10')]],
+            ['2005-10-10', [strtotime('2005-10-10')], [strtotime('2005-10-11')]],
         ];
     }
 }
@@ -358,10 +358,10 @@ public static function provideParse(): iterable
             'non-special://:@untrusted.com/x' => ['scheme' => 'non-special', 'host' => 'untrusted.com'],
             'http:foo.com' => ['scheme' => 'http', 'host' => null],
             "	   :foo.com   \n" => null,
-            ' foo.com  ' => ['scheme' => null, 'host' => null],
+            ' foo.com  ' => null,
             'a:	 foo.com' => null,
-            'http://f:21/ b ? d # e ' => ['scheme' => 'http', 'host' => 'f'],
-            'lolscheme:x x#x x' => ['scheme' => 'lolscheme', 'host' => null],
+            'http://f:21/ b ? d # e ' => null,
+            'lolscheme:x x#x x' => null,
             'http://f:/c' => ['scheme' => 'http', 'host' => 'f'],
             'http://f:0/c' => ['scheme' => 'http', 'host' => 'f'],
             'http://f:00000000000000/c' => ['scheme' => 'http', 'host' => 'f'],
@@ -434,7 +434,7 @@ public static function provideParse(): iterable
             'javascript:example.com/' => ['scheme' => 'javascript', 'host' => null],
             'mailto:example.com/' => ['scheme' => 'mailto', 'host' => null],
             '/a/b/c' => ['scheme' => null, 'host' => null],
-            '/a/ /c' => ['scheme' => null, 'host' => null],
+            '/a/ /c' => null,
             '/a%2fc' => ['scheme' => null, 'host' => null],
             '/a/%2f/c' => ['scheme' => null, 'host' => null],
             '#β' => ['scheme' => null, 'host' => null],
@@ -495,10 +495,10 @@ public static function provideParse(): iterable
             'http://example.com/你好你好' => ['scheme' => 'http', 'host' => 'example.com'],
             'http://example.com/‥/foo' => ['scheme' => 'http', 'host' => 'example.com'],
             "http://example.com/\u{feff}/foo" => ['scheme' => 'http', 'host' => 'example.com'],
-            "http://example.com\u{002f}\u{202e}\u{002f}\u{0066}\u{006f}\u{006f}\u{002f}\u{202d}\u{002f}\u{0062}\u{0061}\u{0072}\u{0027}\u{0020}" => ['scheme' => 'http', 'host' => 'example.com'],
+            "http://example.com\u{002f}\u{202e}\u{002f}\u{0066}\u{006f}\u{006f}\u{002f}\u{202d}\u{002f}\u{0062}\u{0061}\u{0072}\u{0027}\u{0020}" => null,
             'http://www.google.com/foo?bar=baz#' => ['scheme' => 'http', 'host' => 'www.google.com'],
-            'http://www.google.com/foo?bar=baz# »' => ['scheme' => 'http', 'host' => 'www.google.com'],
-            'data:test# »' => ['scheme' => 'data', 'host' => null],
+            'http://www.google.com/foo?bar=baz# »' => null,
+            'data:test# »' => null,
             'http://www.google.com' => ['scheme' => 'http', 'host' => 'www.google.com'],
             'http://192.0x00A80001' => ['scheme' => 'http', 'host' => '192.0x00A80001'],
             'http://www/foo%2Ehtml' => ['scheme' => 'http', 'host' => 'www'],
@@ -706,11 +706,11 @@ public static function provideParse(): iterable
             'test-a-colon-slash-slash-b.html' => ['scheme' => null, 'host' => null],
             'http://example.org/test?a#bc' => ['scheme' => '
8000
http', 'host' => 'example.org'],
             'http:\\/\\/f:b\\/c' => ['scheme' => 'http', 'host' => null],
-            'http:\\/\\/f: \\/c' => ['scheme' => 'http', 'host' => null],
+            'http:\\/\\/f: \\/c' => null,
             'http:\\/\\/f:fifty-two\\/c' => ['scheme' => 'http', 'host' => null],
             'http:\\/\\/f:999999\\/c' => ['scheme' => 'http', 'host' => null],
             'non-special:\\/\\/f:999999\\/c' => ['scheme' => 'non-special', 'host' => null],
-            'http:\\/\\/f: 21 \\/ b ? d # e ' => ['scheme' => 'http', 'host' => null],
+            'http:\\/\\/f: 21 \\/ b ? d # e ' => null,
             'http:\\/\\/[1::2]:3:4' => ['scheme' => 'http', 'host' => null],
             'http:\\/\\/2001::1' => ['scheme' => 'http', 'host' => null],
             'http:\\/\\/2001::1]' => ['scheme' => 'http', 'host' => null],
@@ -734,8 +734,8 @@ public static function provideParse(): iterable
             'http:@:www.example.com' => ['scheme' => 'http', 'host' => null],
             'http:\\/@:www.example.com' => ['scheme' => 'http', 'host' => null],
             'http:\\/\\/@:www.example.com' => ['scheme' => 'http', 'host' => null],
-            'http:\\/\\/example example.com' => ['scheme' => 'http', 'host' => null],
-            'http:\\/\\/Goo%20 goo%7C|.com' => ['scheme' => 'http', 'host' => null],
+            'http:\\/\\/example example.com' => null,
+            'http:\\/\\/Goo%20 goo%7C|.com' => null,
             'http:\\/\\/[:]' => ['scheme' => 'http', 'host' => null],
             'http:\\/\\/GOO\\u00a0\\u3000goo.com' => ['scheme' => 'http', 'host' => null],
@@ -752,8 +752,8 @@ public static function provideParse(): iterable
             'http:\\/\\/hello%00' => ['scheme' => 'http', 'host' => null],
             'http:\\/\\/192.168.0.257' => ['scheme' => 'http', 'host' => null],
             'http:\\/\\/%3g%78%63%30%2e%30%32%35%30%2E.01' => ['scheme' => 'http', 'host' => null],
-            'http:\\/\\/192.168.0.1 hello' => ['scheme' => 'http', 'host' => null],
-            'https:\\/\\/x x:12' => ['scheme' => 'https', 'host' => null],
+            'http:\\/\\/192.168.0.1 hello' => null,
+            'https:\\/\\/x x:12' => null,
             'http:\\/\\/[www.google.com]\\/' => ['scheme' => 'http', 'host' => null],
             'http:\\/\\/[google.com]' => ['scheme' => 'http', 'host' => null],
             'http:\\/\\/[::1.2.3.4x]' => ['scheme' => 'http', 'host' => null],
@@ -763,7 +763,7 @@ public static function provideParse(): iterable
             '..\\/i' => ['scheme' => null, 'host' => null],
             '\\/i' => ['scheme' => null, 'host' => null],
             'sc:\\/\\/\\u0000\\/' => ['scheme' => 'sc', 'host' => null],
-            'sc:\\/\\/ \\/' => ['scheme' => 'sc', 'host' => null],
+            'sc:\\/\\/ \\/' => null,
             'sc:\\/\\/@\\/' => ['scheme' => 'sc', 'host' => null],
             'sc:\\/\\/te@s:t@\\/' => ['scheme' => 'sc', 'host' => null],
             'sc:\\/\\/:\\/' => ['scheme' => 'sc', 'host' => null],
 
@@ -94,7 +94,13 @@ public static function parse(string $url): ?array
         }
 
         try {
-            return UriString::parse($url);
+            $parsedUrl = UriString::parse($url);
+
+            if (preg_match('/\s/', $url)) {
+                return null;
+            }
+
+            return $parsedUrl;
         } catch (SyntaxError) {
             return null;
         }
 
@@ -138,7 +138,7 @@ public function request(string $method, string $url, array $options = []): Respo
                     $filterContentHeaders = static function ($h) {
                         return 0 !== stripos($h, 'Content-Length:') && 0 !== stripos($h, 'Content-Type:') && 0 !== stripos($h, 'Transfer-Encoding:');
                     };
-                    $options['header'] = array_filter($options['header'], $filterContentHeaders);
+                    $options['headers'] = array_filter($options['headers'], $filterContentHeaders);
                     $redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], $filterContentHeaders);
                     $redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);
                 }
 
@@ -175,6 +
8000
175,27 @@ public function testNonCallableOnProgressCallback()
         $client->request('GET', $url, ['on_progress' => $customCallback]);
     }
 
+    public function testHeadersArePassedOnRedirect()
+    {
+        $ipAddr = '104.26.14.6';
+        $url = sprintf('http://%s/', $ipAddr);
+        $content = 'foo';
+
+        $callback = function ($method, $url, $options) use ($content): MockResponse {
+            $this->assertArrayHasKey('headers', $options);
+            $this->assertNotContains('content-type: application/json', $options['headers']);
+            $this->assertContains('foo: bar', $options['headers']);
+            return new MockResponse($content);
+        };
+        $responses = [
+            new MockResponse('', ['http_code' => 302, 'redirect_url' => 'http://104.26.14.7']),
+            $callback,
+        ];
+        $client = new NoPrivateNetworkHttpClient(new MockHttpClient($responses));
+        $response = $client->request('POST', $url, ['headers' => ['foo' => 'bar', 'content-type' => 'application/js
8000
on']]);
+        $this->assertEquals($content, $response->getContent());
+    }
+
     private function getMockHttpClient(string $ipAddr, string $content)
     {
         return new MockHttpClient(new MockResponse($content, ['primary_ip' => $ipAddr]));
 
@@ -189,7 +189,12 @@ public function prepare(Request $request): static
         }
 
         if (!$this->headers->has('Content-Type')) {
-            $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream');
+            $mimeType = null;
+            if (!$this->tempFileObject) {
+                $mimeType = $this->file->getMimeType();
+            }
+
         }
 
         parent::prepare($request);
 
@@ -468,4 +468,15 @@ public function testSetChunkSizeTooSmall()
 
         $response->setChunkSize(0);
     }
+
+    public function testCreateFromTemporaryFileWithoutMimeType()
+    {
+        $file = new \SplTempFileObject();
+        $file->fwrite('foo,bar');
+
+        $response = new BinaryFileResponse($file);
+        $response->prepare(new Request());
+
+        $this->assertSame('application/octet-stream', $response->headers->get('Content-Type'));
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -643,11 +643,13 @@ private function createAuthenticationListeners(ContainerBuilder $container, stri`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`if ($container->hasDefinition('debug.security.firewall')) {`
`646`		`- foreach ($authenticationProviders as $authenticatorId) {`
`647`		`- $container->register('debug.'.$authenticatorId, TraceableAuthenticator::class)`
`648`		`- ->setDecoratedService($authenticatorId)`
`649`		`- ->setArguments([new Reference('debug.'.$authenticatorId.'.inner')])`
	`646`	`+ foreach ($authenticationProviders as &$authenticatorId) {`
	`647`	`+ $traceableId = 'debug.'.$authenticatorId;`
	`648`	`+ $container`
	`649`	`+ ->register($traceableId, TraceableAuthenticator::class)`
	`650`	`+ ->setArguments([new Reference($authenticatorId)])`
`650`	`651`	`;`
	`652`	`+ $authenticatorId = $traceableId;`
`651`	`653`	`}`
`652`	`654`	`}`
`653`	`655`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(string $test)`
`36`	`36`	`throw new \InvalidArgumentException(\sprintf('"%s" is not a valid date.', $matches[2]));`
`37`	`37`	`}`
`38`	`38`
`39`		`- $operator = $matches[1] ?? '==';`
	`39`	`+ $operator = $matches[1] ?: '==';`
`40`	`40`	`if ('since' === $operator \|\| 'after' === $operator) {`
`41`	`41`	`$operator = '>';`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public static function getTestData()`
`59`	`59`	`['after 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],`
`60`	`60`	`['since 2005-10-10', [strtotime('2005-10-15')], [strtotime('2005-10-09')]],`
`61`	`61`	`['!= 2005-10-10', [strtotime('2005-10-11')], [strtotime('2005-10-10')]],`
	`62`	`+ ['2005-10-10', [strtotime('2005-10-10')], [strtotime('2005-10-11')]],`
`62`	`63`	`];`
`63`	`64`	`}`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,13 @@ public static function parse(string $url): ?array`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`try {`
`97`		`- return UriString::parse($url);`
	`97`	`+ $parsedUrl = UriString::parse($url);`
	`98`	`+`
	`99`	`+ if (preg_match('/\s/', $url)) {`
	`100`	`+ return null;`
	`101`	`+ }`
	`102`	`+`
	`103`	`+ return $parsedUrl;`
`98`	`104`	`} catch (SyntaxError) {`
`99`	`105`	`return null;`
`100`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function request(string $method, string $url, array $options = []): Respo`
`138`	`138`	`$filterContentHeaders = static function ($h) {`
`139`	`139`	`return 0 !== stripos($h, 'Content-Length:') && 0 !== stripos($h, 'Content-Type:') && 0 !== stripos($h, 'Transfer-Encoding:');`
`140`	`140`	`};`
`141`		`- $options['header'] = array_filter($options['header'], $filterContentHeaders);`
	`141`	`+ $options['headers'] = array_filter($options['headers'], $filterContentHeaders);`
`142`	`142`	`$redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], $filterContentHeaders);`
`143`	`143`	`$redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,12 @@ public function prepare(Request $request): static`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`if (!$this->headers->has('Content-Type')) {`
`192`		`- $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream');`
	`192`	`+ $mimeType = null;`
	`193`	`+ if (!$this->tempFileObject) {`
	`194`	`+ $mimeType = $this->file->getMimeType();`
	`195`	`+ }`
	`196`	`+`
	`197`	`+ $this->headers->set('Content-Type', $mimeType ?: 'application/octet-stream');`
`193`	`198`	`}`
`194`	`199`
`195`	`200`	`parent::prepare($request);`