From 43c52daf6be0f7382056e2053ab502e549f891ee Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 10 Mar 2022 17:59:30 +0100 Subject: [PATCH] Clean up debug page. --- app/Http/Controllers/DebugController.php | 77 ++++++++++++------------ resources/views/debug.twig | 17 +++--- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 39b87ed9b6..2ae54b1501 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -120,50 +120,52 @@ class DebugController extends Controller */ public function index(Request $request) { - $search = ['~', '#']; - $replace = ['\~', '# ']; - - $now = Carbon::now()->format('Y-m-d H:i:s e'); - $installationIdConfig = app('fireflyconfig')->get('installation_id', ''); - $installationId = $installationIdConfig ? $installationIdConfig->data : ''; - $phpVersion = str_replace($search, $replace, PHP_VERSION); - $phpOs = str_replace($search, $replace, PHP_OS); - $interface = PHP_SAPI; - $drivers = implode(', ', DB::availableDrivers()); - $currentDriver = DB::getDriverName(); - $userAgent = $request->header('user-agent'); - $trustedProxies = config('firefly.trusted_proxies'); - $displayErrors = ini_get('display_errors'); - $errorReporting = $this->errorReporting((int)ini_get('error_reporting')); - $appEnv = config('app.env'); - $appDebug = var_export(config('app.debug'), true); - $logChannel = config('logging.default'); - $appLogLevel = config('logging.level'); - $cacheDriver = config('cache.default'); - $loginProvider = config('auth.providers.users.driver'); - $bcscale = bcscale(); - $layout = env('FIREFLY_III_LAYOUT'); - $tz = env('TZ'); - $buildNr = '(unknown)'; - $buildDate = '(unknown)'; - + // basic scope information: + $now = Carbon::now()->format('Y-m-d H:i:s e'); + $buildNr = '(unknown)'; + $buildDate = '(unknown)'; + $expectedDBversion = config('firefly.db_version'); + $foundDBversion = FireflyConfig::get('db_version', 1)->data; if (file_exists('/var/www/counter-main.txt')) { $buildNr = trim(file_get_contents('/var/www/counter-main.txt')); } if (file_exists('/var/www/build-date-main.txt')) { $buildDate = trim(file_get_contents('/var/www/build-date-main.txt')); } + $phpVersion = PHP_VERSION; + $phpOs = PHP_OS; + + // system information + $tz = env('TZ'); + $appEnv = config('app.env'); + $appDebug = var_export(config('app.debug'), true); + $cacheDriver = config('cache.default'); + $logChannel = config('logging.default'); + $appLogLevel = config('logging.level'); + $displayErrors = ini_get('display_errors'); + $errorReporting = $this->errorReporting((int) ini_get('error_reporting')); + $interface = PHP_SAPI; + $defaultLanguage = (string) config('firefly.default_language'); + $defaultLocale = (string) config('firefly.default_locale'); + $bcscale = bcscale(); + $drivers = implode(', ', DB::availableDrivers()); + $currentDriver = DB::getDriverName(); + $trustedProxies = config('firefly.trusted_proxies'); + + // user info + $loginProvider = config('auth.providers.users.driver'); + $userGuard = config('auth.defaults.guard'); + $remoteHeader = $userGuard === 'remote_user_guard' ? config('auth.guard_header') : 'N/A'; + $remoteMailHeader = $userGuard === 'remote_user_guard' ? config('auth.guard_email') : 'N/A'; + $userLanguage = app('steam')->getLanguage(); + $userLocale = app('steam')->getLocale(); + $userAgent = $request->header('user-agent'); + // expected + found DB version: - $expectedDBversion = config('firefly.db_version'); - $foundDBversion = FireflyConfig::get('db_version', 1)->data; // some new vars. - $defaultLanguage = (string)config('firefly.default_language'); - $defaultLocale = (string)config('firefly.default_locale'); - $userLanguage = app('steam')->getLanguage(); - $userLocale = app('steam')->getLocale(); - $isDocker = env('IS_DOCKER', false); + $isDocker = env('IS_DOCKER', false); // set languages, see what happens: $original = setlocale(LC_ALL, 0); @@ -211,17 +213,18 @@ class DebugController extends Controller 'logChannel', 'tz', 'appLogLevel', + 'remoteHeader', + 'remoteMailHeader', 'now', 'drivers', 'currentDriver', + 'userGuard', 'loginProvider', 'buildNr', 'buildDate', 'bcscale', - 'layout', 'userAgent', 'displayErrors', - 'installationId', 'errorReporting', 'phpOs', 'interface', @@ -260,7 +263,7 @@ class DebugController extends Controller $return = ' '; /** @var Route $route */ foreach ($set as $route) { - $name = (string)$route->getName(); + $name = (string) $route->getName(); if (in_array('GET', $route->methods(), true)) { $found = false; foreach ($ignore as $string) { diff --git a/resources/views/debug.twig b/resources/views/debug.twig index fb091fdbae..5d49f1415e 100644 --- a/resources/views/debug.twig +++ b/resources/views/debug.twig @@ -17,15 +17,13 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION | --- | --- | | Firefly III | {{ FF_VERSION }} | | Firefly III API | {{ config('firefly.api_version') }} | -| Build | {{ buildNr}}, {{ buildDate }} | -| PHP | {{ phpVersion }} | -| Host | {{ phpOs }} | +| Build | {{ buildNr }}, {{ buildDate }} | +| DB version | {{ foundDBversion }} (exp. {{ expectedDBversion}}) | +| PHP | `{{ phpVersion }}` | +| Host | `{{ phpOs }}` | | System info | Value | | --- | --- | -| Installation ID | {{ installationId }} | -| Using docker? | {% if isDocker %}true{% else %}false{% endif %} | -| Layout | {{ layout }} | | System TZ | {{ tz }} | | Browser TZ | [BrowserTZ] | | App environment | {{ appEnv }} | @@ -40,12 +38,13 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION | BCscale | {{ bcscale }} | | DB drivers | {{ drivers }} | | Current driver | {{ currentDriver }} | -| DB version | {{ foundDBversion }} (exp. {{ expectedDBversion}}) | -| Login provider | {{ loginProvider }} | -| Trusted proxies (.env) | {{ trustedProxies }} | +| Trusted proxies (.env) | `{{ trustedProxies }}` | | User info | Value | | --- | --- | +| Login provider | {{ loginProvider }} | +| User guard | {{ userGuard }} | +| Headers | {{ remoteHeader }}, {{ remoteMailHeader }} | | Session start | {{ session('start') }} | | Session end | {{ session('end') }} | | Session first | {{ session('first') }} |