From df51318fb9e02c28f0951ddbaa50c4bc6144c6a1 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 8 Jan 2026 15:55:30 -0800 Subject: [PATCH 1/4] remove throwable exception..too vague --- app/Models/Traits/Loggable.php | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/app/Models/Traits/Loggable.php b/app/Models/Traits/Loggable.php index d38ac4066f..cb0ad23d8d 100644 --- a/app/Models/Traits/Loggable.php +++ b/app/Models/Traits/Loggable.php @@ -10,7 +10,10 @@ use App\Models\Location; use App\Models\Setting; use App\Models\User; use App\Notifications\AuditNotification; +use GuzzleHttp\Exception\ClientException; use GuzzleHttp\Exception\ConnectException; +use GuzzleHttp\Exception\RequestException; +use GuzzleHttp\Exception\ServerException; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; @@ -287,23 +290,32 @@ trait Loggable if(Setting::getSettings()->webhook_selected === 'microsoft' && Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) { - $endpoint = Setting::getSettings()->webhook_endpoint; + $endpoint = Setting::getSettings()->webhook_endpoint; try { $message = AuditNotification::toMicrosoftTeams($params); $notification = new TeamsNotification($endpoint); $notification->success()->sendMessage($message[0], $message[1]); - } catch (ConnectException $e) { - Log::warning('Teams webhook connection failed', [ + } catch (ServerException $e) { + + Log::error('Teams webhook server error', [ 'endpoint' => $endpoint, + 'status' => $e->getResponse()?->getStatusCode(), 'error' => $e->getMessage(), ]); - } catch (Throwable $e) { - Log::error('Teams webhook failed unexpectedly', [ + } catch (ClientException $e) { + + Log::warning('Teams webhook client error', [ + 'endpoint' => $endpoint, + 'status' => $e->getResponse()?->getStatusCode(), + 'error' => $e->getMessage(), + ]); + } catch (RequestException $e) { + + Log::error('Teams webhook request failure', [ 'endpoint' => $endpoint, - 'exception' => get_class($e), 'error' => $e->getMessage(), ]); } From e48c40e5af0c7d16e7b04c9f0b2bc25684acf6ff Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 8 Jan 2026 15:58:15 -0800 Subject: [PATCH 2/4] remove use statements --- app/Models/Traits/Loggable.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Models/Traits/Loggable.php b/app/Models/Traits/Loggable.php index cb0ad23d8d..f2eecc93eb 100644 --- a/app/Models/Traits/Loggable.php +++ b/app/Models/Traits/Loggable.php @@ -11,14 +11,12 @@ use App\Models\Setting; use App\Models\User; use App\Notifications\AuditNotification; use GuzzleHttp\Exception\ClientException; -use GuzzleHttp\Exception\ConnectException; use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\ServerException; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use Osama\LaravelTeamsNotification\TeamsNotification; -use Throwable; trait Loggable { From b45efddd9a647a50f0d01d2b78e9e0bcc7bf6ac4 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 13 Jan 2026 08:56:12 -0800 Subject: [PATCH 3/4] readd connection and throwable --- app/Models/Traits/Loggable.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/Models/Traits/Loggable.php b/app/Models/Traits/Loggable.php index f2eecc93eb..84a24d80bf 100644 --- a/app/Models/Traits/Loggable.php +++ b/app/Models/Traits/Loggable.php @@ -11,12 +11,14 @@ use App\Models\Setting; use App\Models\User; use App\Notifications\AuditNotification; use GuzzleHttp\Exception\ClientException; +use GuzzleHttp\Exception\ConnectException; use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\ServerException; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; use Osama\LaravelTeamsNotification\TeamsNotification; +use Throwable; trait Loggable { @@ -295,6 +297,12 @@ trait Loggable $notification = new TeamsNotification($endpoint); $notification->success()->sendMessage($message[0], $message[1]); + } catch (ConnectException $e) { + Log::warning('Teams webhook connection failed', [ + 'endpoint' => $endpoint, + 'error' => $e->getMessage() + ]); + } catch (ServerException $e) { Log::error('Teams webhook server error', [ @@ -316,6 +324,12 @@ trait Loggable 'endpoint' => $endpoint, 'error' => $e->getMessage(), ]); + }catch (Throwable $e) { + Log::error('Teams webhook failed unexpectedly', [ + 'endpoint' => $endpoint, + 'exception' => get_class($e), + 'error' => $e->getMessage(), + ]); } } else { From e667cd20a80d4fc4e71dbe9b46111a6229ff732f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 14 Jan 2026 13:30:54 +0000 Subject: [PATCH 4/4] Set require_signature to default to 0 --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index c42dfd0975..b34f4d886c 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -114,7 +114,7 @@ class SettingsController extends Controller $setting->email_domain = $request->input('email_domain'); $setting->email_format = $request->input('email_format'); $setting->username_format = $request->input('username_format'); - $setting->require_accept_signature = $request->input('require_accept_signature'); + $setting->require_accept_signature = $request->input('require_accept_signature', '0'); $setting->show_assigned_assets = $request->input('show_assigned_assets', '0'); if (! config('app.lock_passwords')) { $setting->login_note = $request->input('login_note');