From eceaae17da44dfd24eaec661f19f9faf2851ab3d Mon Sep 17 00:00:00 2001 From: Julien Nahum Date: Thu, 25 Jan 2024 04:43:27 +0100 Subject: [PATCH] Better custom domain logging --- app/Http/Middleware/CustomDomainRestriction.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Http/Middleware/CustomDomainRestriction.php b/app/Http/Middleware/CustomDomainRestriction.php index ecfb24c..7faff34 100644 --- a/app/Http/Middleware/CustomDomainRestriction.php +++ b/app/Http/Middleware/CustomDomainRestriction.php @@ -24,7 +24,7 @@ class CustomDomainRestriction $customDomain = $request->header(self::CUSTOM_DOMAIN_HEADER); if (!preg_match(CustomDomainRequest::CUSTOM_DOMAINS_REGEX, $customDomain)) { - \Log::warning('Invalid domain', [ + \Log::info('[CUSTOM_DOMAIN]: Invalid domain', [ 'domain' => $customDomain, 'ip' => $request->ip(), ]); @@ -43,7 +43,7 @@ class CustomDomainRestriction // Check if domain is known if (!$workspace = Workspace::whereJsonContains('custom_domains',$customDomain)->first()) { - \Log::warning('Unknown domain', [ + \Log::info('[CUSTOM_DOMAIN]: Unknown domain', [ 'domain' => $customDomain, 'ip' => $request->ip(), ]); @@ -54,6 +54,11 @@ class CustomDomainRestriction ], 420); } + \Log::info('[CUSTOM_DOMAIN]: Applying scopes', [ + 'domain' => $customDomain, + 'ip' => $request->ip(), + 'workspace' => $workspace->id, + ]); Workspace::addGlobalScope('domain-restricted', function (Builder $builder) use ($workspace) { $builder->where('workspaces.id', $workspace->id); });