Commit28ae62d

authored and

committed

[Security] Fix str_contains type mismatch in ChannelListener

1 parent11e76c9 commit28ae62dCopy full SHA for 28ae62d

File tree

+28

-1

lines changed

src/Symfony/Component/Security/Http
- Firewall
  - ChannelListener.php
- Tests/Firewall
  - ChannelListenerTest.php

+28

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function supports(Request $request): ?bool`
`51`	`51`	`if (null !==$this->logger) {`
`52`	`52`	`if ('https' ===$request->headers->get('X-Forwarded-Proto')) {`
`53`	`53`	`$this->logger->info('Redirecting to HTTPS. ("X-Forwarded-Proto" header is set to "https" - did you set "trusted_proxies" correctly?)');`
`54`		`- }elseif (str_contains($request->headers->get('Forwarded'),'proto=https')) {`
	`54`	`+ }elseif (str_contains($request->headers->get('Forwarded',''),'proto=https')) {`
`55`	`55`	`$this->logger->info('Redirecting to HTTPS. ("Forwarded" header is set to "proto=https" - did you set "trusted_proxies" correctly?)');`
`56`	`56`	`}else {`
`57`	`57`	`$this->logger->info('Redirecting to HTTPS.');`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`namespaceSymfony\Component\Security\Http\Tests\Firewall;`
`13`	`13`
`14`	`14`	`usePHPUnit\Framework\TestCase;`
	`15`	`+usePsr\Log\NullLogger;`
	`16`	`+useSymfony\Component\HttpFoundation\HeaderBag;`
`15`	`17`	`useSymfony\Component\HttpFoundation\Request;`
`16`	`18`	`useSymfony\Component\HttpFoundation\Response;`
`17`	`19`	`useSymfony\Component\HttpKernel\Event\RequestEvent;`
`@@ -153,4 +155,29 @@ public function testHandleWithSecuredRequestAndHttpChannel()`
`153`	`155`
`154`	`156`	`$this->assertSame($response,$event->getResponse());`
`155`	`157`	`}`
	`158`	`+`
	`159`	`+publicfunctiontestSupportsWithoutHeaders()`
	`160`	`+ {`
	`161`	`+$request =$this->createMock(Request::class);`
	`162`	`+$request`
	`163`	`+ ->expects($this->any())`
	`164`	`+ ->method('isSecure')`
	`165`	`+ ->willReturn(false)`
	`166`	`+ ;`
	`167`	`+$request->headers =newHeaderBag();`
	`168`	`+`
	`169`	`+$accessMap =$this->createMock(AccessMapInterface::class);`
	`170`	`+$accessMap`
	`171`	`+ ->expects($this->any())`
	`172`	`+ ->method('getPatterns')`
	`173`	`+ ->with($this->equalTo($request))`
	`174`	`+ ->willReturn([[],'https'])`
	`175`	`+ ;`
	`176`	`+`
	`177`	`+$entryPoint =$this->createMock(AuthenticationEntryPointInterface::class);`
	`178`	`+`
	`179`	`+$listener =newChannelListener($accessMap,$entryPoint,newNullLogger());`
	`180`	`+`
	`181`	`+$this->assertTrue($listener->supports($request));`
	`182`	`+ }`
`156`	`183`	`}`

Comments

(0)