From 0a5d2b669289e929f413eb10408aa1233bbfb046 Mon Sep 17 00:00:00 2001 From: andy-scboy <61877937+andy-scboy@users.noreply.github.com> Date: Fri, 6 Mar 2020 18:06:59 +0300 Subject: [PATCH 1/2] Update Router.php Adding headers in new server versions --- Router.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Router.php b/Router.php index e3d86b1..79002ef 100644 --- a/Router.php +++ b/Router.php @@ -246,7 +246,8 @@ public static function fetch_from_array(&$array, $index=null, $default = null) private static function getAuthorizationHeader() { // convert all headers to lowercase: $headers = array(); - foreach($_SERVER as $key => $value) { + $header_variables = array_merge($_SERVER, getallheaders()); + foreach($header_variables as $key => $value) { $headers[strtolower($key)] = $value; } @@ -310,4 +311,4 @@ public static function displayError ($message, $status = 500) { // set_error_handler("ProcessWire\Router::handleError"); // set_exception_handler('ProcessWire\Router::handleException'); -// register_shutdown_function('ProcessWire\Router::handleFatalError'); \ No newline at end of file +// register_shutdown_function('ProcessWire\Router::handleFatalError'); From 0e9bb91aa79bb197e06b012f92607e5311d1f511 Mon Sep 17 00:00:00 2001 From: andy-scboy <61877937+andy-scboy@users.noreply.github.com> Date: Fri, 6 Mar 2020 18:09:36 +0300 Subject: [PATCH 2/2] Update Router.php Correct code exception when token is broken. --- Router.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Router.php b/Router.php index 79002ef..8eef534 100644 --- a/Router.php +++ b/Router.php @@ -128,7 +128,7 @@ public static function handle($class, $method, $vars, $routeParams) } catch (\Throwable $e) { - throw new \Exception($e->getMessage()); + self::displayError('Signature verification failed', 400); } }