From a1a39a19ff0ae92c83cac0771e5ca03de87d76d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Wed, 23 Feb 2022 10:36:42 +0000 Subject: [PATCH 1/2] Fix variable name --- app/controllers/general.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index c031b52d88..2a46993897 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -543,8 +543,8 @@ App::get('/.well-known/acme-challenge') $filePath = '/.well-known/acme-challenge' . $token; $base = \realpath(APP_STORAGE_CERTIFICATES); - $path = \str_replace('/.well-known/acme-challenge/', '', $request->getURI()); - $absolute = \realpath($base.'/.well-known/acme-challenge/'.$filePath); + $path = \str_replace('/.well-known/acme-challenge/', '', $filePath); + $absolute = \realpath($base.'/.well-known/acme-challenge/'.$path); if (!$base) { throw new Exception('Storage error', 500); From 113174519979f28c7037d7d5b1d69e6f07c084da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Wed, 23 Feb 2022 11:30:39 +0000 Subject: [PATCH 2/2] Improved code quality --- app/controllers/general.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 2a46993897..ea7b1303b8 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -540,11 +540,8 @@ App::get('/.well-known/acme-challenge') throw new Exception('Invalid challenge token.', 400); } - $filePath = '/.well-known/acme-challenge' . $token; - $base = \realpath(APP_STORAGE_CERTIFICATES); - $path = \str_replace('/.well-known/acme-challenge/', '', $filePath); - $absolute = \realpath($base.'/.well-known/acme-challenge/'.$path); + $absolute = \realpath($base.'/.well-known/acme-challenge/'.$token); if (!$base) { throw new Exception('Storage error', 500);