fixed slack notifications

Author: denisdulici

src/Config/firewall.php

@@ -7,9 +7,9 @@
     'whitelist' => [env('FIREWALL_WHITELIST', '')],
 
     'models' => [
-        'user' => '\App\User',
-        // 'log' => '\App\YourLogModel',
-        // 'ip'  => '\App\YourIpModel',
+        'user' => '\App\Models\User',
+        // 'log' => '\App\Models\YourLogModel',
+        // 'ip' => '\App\Models\YourIpModel',
     ],
 
     'responses' => [
@@ -29,14 +29,15 @@
             'enabled' => env('FIREWALL_EMAIL_ENABLED', false),
             'name' => env('FIREWALL_EMAIL_NAME', 'Laravel Firewall'),
             'from' => env('FIREWALL_EMAIL_FROM', '[email protected]'),
-            'to' => [env('FIREWALL_EMAIL_TO', '[email protected]')],
+            'to' => env('FIREWALL_EMAIL_TO', '[email protected]'),
         ],
 
         'slack' => [
             'enabled' => env('FIREWALL_SLACK_ENABLED', false),
-            'from' => env('FIREWALL_SLACK_FROM', 'Laravel Firewall'),
-            'to' => env('FIREWALL_SLACK_TO', '#my-channel'),
             'emoji' => env('FIREWALL_SLACK_EMOJI', ':fire:'),
+            'from' => env('FIREWALL_SLACK_FROM', 'Laravel Firewall'),
+            'to' => env('FIREWALL_SLACK_TO'), // webhook url
+            'channel' => env('FIREWALL_SLACK_CHANNEL', null), // set null to use the default channel of webhook
         ],
 
     ],

src/Listeners/NotifyUsers.php

@@ -4,6 +4,10 @@
 
 use Akaunting\Firewall\Events\AttackDetected as Event;
 use Akaunting\Firewall\Notifications\AttackDetected as Notification;
+use Exception;
+use GuzzleHttp\Exception\RequestException;
+use Illuminate\Notifications\Notifiable;
+use Throwable;
 
 class NotifyUsers
 {
@@ -16,22 +20,34 @@ class NotifyUsers
      */
     public function handle(Event $event)
     {
-        $model = config('firewall.models.user');
+        $notifiable = $this->getNotifiableClass();
 
-        if (!class_exists($model)) {
-            return;
+        try {
+            $notifiable->notify(new Notification($event->log));
+        } catch (Exception | RequestException | Throwable $e) {
+            report($e);
         }
+    }
 
-        $emails = config('firewall.notifications.mail.to');
+    protected function getNotifiableClass()
+    {
+        return new class() {
+            use Notifiable;
 
-        foreach ($emails as $email) {
-            $user = $model::where('email', $email)->first();
+            public function routeNotificationForMail()
+            {
+                return config('firewall.notifications.mail.to');
+            }
 
-            if (empty($user)) {
-                continue;
+            public function routeNotificationForSlack()
+            {
+                return config('firewall.notifications.slack.to');
             }
 
-            $user->notify(new Notification($event->log));
-        }
+            public function getKey()
+            {
+                return 1;
+            }
+        };
     }
 }

src/Notifications/AttackDetected.php

@@ -48,7 +48,7 @@ public function via($notifiable)
         $channels = [];
 
         foreach ($this->notifications as $channel => $settings) {
-            if (!$settings['enabled']) {
+            if (empty($settings['enabled'])) {
                 continue;
             }
 
@@ -69,7 +69,7 @@ public function toMail($notifiable)
         $domain = request()->getHttpHost();
 
         $subject = trans('firewall::notifications.mail.subject', [
-            'domain' => $domain
+            'domain' => $domain,
         ]);
 
         $message = trans('firewall::notifications.mail.message', [
@@ -100,7 +100,7 @@ public function toSlack($notifiable)
         return (new SlackMessage)
             ->error()
             ->from($this->notifications['slack']['from'], $this->notifications['slack']['emoji'])
-            ->to($this->notifications['slack']['to'])
+            ->to($this->notifications['slack']['channel'])
             ->content($message)
             ->attachment(function ($attachment) {
                 $attachment->fields([