Skip to content
This repository was archived by the owner on Jan 15, 2024. It is now read-only.

Fix compatibility with Symfony 4.x #118

Open
DarkYodah wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix compatibility with Symfony 4.x #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e42710e
Adjust composer.json to allow symfony/cache 4.x
Nov 13, 2018
59424e0
Fix compatibility with Symfony 4.x
Nov 13, 2018
b695996
Satisfy scrutinizer
Nov 13, 2018
a027e63
Fix coverage decrease and satisfy PHPCS
Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"symfony/yaml": ">=2.8.18",
"symfony/finder": ">=2.8.18",
"symfony/property-access": ">=2.8.18",
"symfony/cache": "^3.3.0",
"symfony/cache": ">=3.3.0",
"doctrine/collections": "^1.3",
"kleijnweb/php-api-descriptions": "dev-master as 1.0.0-alpha5",
"kleijnweb/php-api-routing-bundle": "dev-master as 1.0.0-alpha2",
Expand Down
74 changes: 40 additions & 34 deletions src/EventListener/Response/Error/HttpError.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
use Psr\Log\LogLevel;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Security\Core\Exception\AuthenticationException;

Expand Down Expand Up @@ -48,6 +46,13 @@ class HttpError
*/
private $exception;

const HTTP_CODE_SEVERITY = [
Response::HTTP_UNAUTHORIZED => LogLevel::WARNING,
Response::HTTP_FORBIDDEN => LogLevel::WARNING,
Response::HTTP_NOT_FOUND => LogLevel::INFO,
Response::HTTP_METHOD_NOT_ALLOWED => LogLevel::WARNING,
];

/**
* HttpError constructor.
*
Expand All @@ -70,40 +75,41 @@ public function __construct(Request $request, \Exception $exception, LogRefBuild
return;
}

if ($exception instanceof NotFoundHttpException) {
$this->statusCode = Response::HTTP_NOT_FOUND;
$this->severity = LogLevel::INFO;
} else {
if ($exception instanceof MethodNotAllowedHttpException) {
$this->statusCode = Response::HTTP_METHOD_NOT_ALLOWED;
$this->severity = LogLevel::WARNING;
} elseif ($exception instanceof AuthenticationException) {
$this->statusCode = Response::HTTP_UNAUTHORIZED;
$this->severity = LogLevel::WARNING;
} elseif ($exception instanceof AccessDeniedException || $exception instanceof AccessDeniedHttpException) {
$this->statusCode = Response::HTTP_FORBIDDEN;
$this->severity = LogLevel::WARNING;
if ($exception instanceof HttpException) {
$this->statusCode = $exception->getStatusCode();
} elseif ($exception instanceof AuthenticationException) {
$this->statusCode = Response::HTTP_UNAUTHORIZED;
} elseif ($exception instanceof AccessDeniedException) {
$this->statusCode = Response::HTTP_FORBIDDEN;
}

if ($this->statusCode && isset(self::HTTP_CODE_SEVERITY[$this->statusCode])) {
$this->severity = self::HTTP_CODE_SEVERITY[$this->statusCode];
}

if (!$this->severity) {
if (strlen((string)$code) !== 3) {
$guessedStatusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
$this->severity = LogLevel::CRITICAL;
} else {
if (strlen((string)$code) !== 3) {
$this->statusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
$this->severity = LogLevel::CRITICAL;
} else {
$class = (int)substr((string)$code, 0, 1);
switch ($class) {
case 4:
$this->statusCode = Response::HTTP_BAD_REQUEST;
$this->severity = LogLevel::NOTICE;
break;
case 5:
$this->statusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
$this->severity = LogLevel::ERROR;
break;
default:
$this->statusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
$this->severity = LogLevel::CRITICAL;
}
$class = (int)substr((string)$code, 0, 1);
switch ($class) {
case 4:
$guessedStatusCode = Response::HTTP_BAD_REQUEST;
$this->severity = LogLevel::NOTICE;
break;
case 5:
$guessedStatusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
$this->severity = LogLevel::ERROR;
break;
default:
$guessedStatusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
$this->severity = LogLevel::CRITICAL;
}
}
if (!$this->statusCode) {
$this->statusCode = $guessedStatusCode;
}
}
$this->message = Response::$statusTexts[$this->statusCode];
}
Expand Down
10 changes: 8 additions & 2 deletions src/Security/RequestAuthorizationListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException;
use Symfony\Component\Security\Core\Exception\AuthenticationException;
use Symfony\Component\Security\Http\Firewall\ListenerInterface;

/**
Expand Down Expand Up @@ -44,8 +46,12 @@ public function handle(GetResponseEvent $event)
return;
}

if (!$this->authorizationChecker->isGranted(self::ATTRIBUTE, $event->getRequest())) {
throw new AccessDeniedException();
try {
if (!$this->authorizationChecker->isGranted(self::ATTRIBUTE, $event->getRequest())) {
throw new AccessDeniedException();
}
} catch (AuthenticationCredentialsNotFoundException $e) {
throw new AuthenticationException();
}
}
}
30 changes: 21 additions & 9 deletions tests/unit/EventListener/Response/Error/HttpErrorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Psr\Log\LogLevel;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Security\Core\Exception\AuthenticationException;

/**
Expand All @@ -38,8 +39,8 @@ public function willClassifyExceptionsWith4xxCodesAsBadRequestNotices()
{
for ($i = 0; $i < 99; $i++) {
$error = new HttpError(new Request(), new \Exception('mimimimimimi', 400 + $i), $this->logRefBuilder);
$this->assertSame($error->getSeverity(), LogLevel::NOTICE);
$this->assertSame($error->getStatusCode(), 400);
$this->assertSame(LogLevel::NOTICE, $error->getSeverity());
$this->assertSame(400, $error->getStatusCode());
$this->assertStringStartsWith('Bad Request', $error->getMessage());
}
}
Expand All @@ -51,8 +52,8 @@ public function willClassifyExceptionsWith5xxCodesAsRuntimeErrors()
{
for ($i = 0; $i < 99; $i++) {
$error = new HttpError(new Request(), new \Exception('mimimimimimi', 500 + $i), $this->logRefBuilder);
$this->assertSame($error->getSeverity(), LogLevel::ERROR);
$this->assertSame($error->getStatusCode(), 500);
$this->assertSame(LogLevel::ERROR, $error->getSeverity());
$this->assertSame(500, $error->getStatusCode());
$this->assertStringStartsWith('Internal Server Error', $error->getMessage());
}
}
Expand All @@ -65,8 +66,8 @@ public function willClassifyExceptionsWithUnexpectedCodesAsCriticalErrors()
$sample = [4096, 777, 22, 5, 0];
foreach ($sample as $code) {
$error = new HttpError(new Request(), new \Exception('mimimimimimi', $code), $this->logRefBuilder);
$this->assertSame($error->getSeverity(), LogLevel::CRITICAL);
$this->assertSame($error->getStatusCode(), 500);
$this->assertSame(LogLevel::CRITICAL, $error->getSeverity());
$this->assertSame(500, $error->getStatusCode());
$this->assertStringStartsWith('Internal Server Error', $error->getMessage());
}
}
Expand All @@ -77,7 +78,7 @@ public function willClassifyExceptionsWithUnexpectedCodesAsCriticalErrors()
public function willClassifyMethodNotAllowedHttpExceptionAsWarningsAndReturn405Status()
{
$error = new HttpError(new Request(), new MethodNotAllowedHttpException(['GET']), $this->logRefBuilder);
$this->assertSame($error->getSeverity(), LogLevel::WARNING);
$this->assertSame(LogLevel::WARNING, $error->getSeverity());
$this->assertSame($error->getStatusCode(), 405);
$this->assertStringStartsWith('Method Not Allowed', $error->getMessage());
}
Expand All @@ -88,8 +89,19 @@ public function willClassifyMethodNotAllowedHttpExceptionAsWarningsAndReturn405S
public function willClassifyAuthenticationExceptionAsWarningsAndReturn401Status()
{
$error = new HttpError(new Request(), new AuthenticationException(), $this->logRefBuilder);
$this->assertSame($error->getSeverity(), LogLevel::WARNING);
$this->assertSame($error->getStatusCode(), 401);
$this->assertSame(LogLevel::WARNING, $error->getSeverity());
$this->assertSame(401, $error->getStatusCode());
$this->assertStringStartsWith('Unauthorized', $error->getMessage());
}

/**
* @test
*/
public function willClassifyAccessDeniedExceptionAsWarningsAndReturn403Status()
{
$error = new HttpError(new Request(), new AccessDeniedException(), $this->logRefBuilder);
$this->assertSame(LogLevel::WARNING, $error->getSeverity());
$this->assertSame(403, $error->getStatusCode());
$this->assertStringStartsWith('Forbidden', $error->getMessage());
}
}