From af24c402ecb9e9e981031f9be0a496d8890132ea Mon Sep 17 00:00:00 2001 From: Marc Ole Bulling Date: Fri, 14 Jan 2022 15:55:57 +0100 Subject: [PATCH] Check if variable is set, more accurate error description --- middleware/ReverseProxyAuthMiddleware.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/middleware/ReverseProxyAuthMiddleware.php b/middleware/ReverseProxyAuthMiddleware.php index 42799c94..97776dc3 100644 --- a/middleware/ReverseProxyAuthMiddleware.php +++ b/middleware/ReverseProxyAuthMiddleware.php @@ -24,12 +24,19 @@ class ReverseProxyAuthMiddleware extends AuthMiddleware if (GROCY_REVERSE_PROXY_AUTH_USE_ENV) { + if (!isset($_SERVER[GROCY_REVERSE_PROXY_AUTH_HEADER])) + { + // Variable is not set + throw new \Exception('ReverseProxyAuthMiddleware: ' . GROCY_REVERSE_PROXY_AUTH_HEADER . ' env variable is missing, could not be found in $_SERVER array.'); + } + $username = $_SERVER[GROCY_REVERSE_PROXY_AUTH_HEADER]; if (strlen($username) === 0) { - // Invalid configuration of Proxy - throw new \Exception('ReverseProxyAuthMiddleware: ' . GROCY_REVERSE_PROXY_AUTH_HEADER . ' header is missing or invalid'); + // Variable is empty + throw new \Exception('ReverseProxyAuthMiddleware: ' . GROCY_REVERSE_PROXY_AUTH_HEADER . ' env variable is invalid'); } + } else { $username = $request->getHeader(GROCY_REVERSE_PROXY_AUTH_HEADER); if (count($username) !== 1)