#2620 Now tracking user ips that access the site - I can then fight b…

…ack against abusers of the site.

app/Exceptions/Handler.php

@@ -51,7 +51,7 @@ public function report(Throwable $e): void
 
             if ($e instanceof TooManyRequestsHttpException) {
                 $user = Auth::user();
-                $handlerLogging->tooManyRequests(request()?->ip() ?? 'unknown IP', $user?->id, $user?->name, $e);
+                $handlerLogging->tooManyRequests(request()?->ip() ?? 'unknown IP', request()?->path(), $user?->id, $user?->name, $e);
             }
         }
 

app/Exceptions/Logging/HandlerLogging.php

@@ -7,7 +7,7 @@
 
 class HandlerLogging extends RollbarStructuredLogging implements HandlerLoggingInterface
 {
-    public function tooManyRequests(string $ip, ?int $userId, ?string $username, Throwable $throwable): void
+    public function tooManyRequests(string $ip, string $uri, ?int $userId, ?string $username, Throwable $throwable): void
     {
         $this->error(__METHOD__, get_defined_vars());
     }

app/Exceptions/Logging/HandlerLoggingInterface.php

@@ -4,5 +4,5 @@
 
 interface HandlerLoggingInterface
 {
-    public function tooManyRequests(string $ip, ?int $userId, ?string $username, \Throwable $throwable): void;
+    public function tooManyRequests(string $ip, string $uri, ?int $userId, ?string $username, \Throwable $throwable): void;
 }

app/Http/Kernel.php

@@ -10,6 +10,7 @@
 use App\Http\Middleware\OnlyAjax;
 use App\Http\Middleware\ReadOnlyMode;
 use App\Http\Middleware\RedirectIfAuthenticated;
+use App\Http\Middleware\TracksUserIpAddress;
 use App\Http\Middleware\TrimStrings;
 use App\Http\Middleware\VerifyCsrfToken;
 use App\Http\Middleware\ViewCacheBuster;
@@ -89,5 +90,6 @@ class Kernel extends HttpKernel
         'debugbarmessagelogger'     => DebugBarMessageLogger::class,
         'debug_info_context_logger' => DebugInfoContextLogger::class,
         'read_only_mode'            => ReadOnlyMode::class,
+        'track_ip'                  => TracksUserIpAddress::class,
     ];
 }

app/Http/Middleware/TracksUserIpAddress.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Models\User;
+use App\Models\UserIpAddress;
+use Auth;
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Symfony\Component\HttpFoundation\Response;
+
+class TracksUserIpAddress
+{
+    /**
+     * Handle an incoming request.
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        // Maybe this should be handled differently? Idk how heavy these queries will be
+        if (!$request->ajax() && Auth::check()) {
+            /** @var User $user */
+            $user = Auth::user();
+            UserIpAddress::upsert(
+                [
+                    'user_id'    => $user->id,
+                    'ip_address' => $request->ip(),
+                    'count'      => 1, // Default value for new rows
+                    'updated_at' => now(), // Example of tracking when a row is updated
+                ],
+                ['user_id', 'ip_address'],
+                ['count' => DB::raw('count + 1'), 'updated_at'] // Update these columns if a conflict occurs
+            );
+        }
+
+        return $next($request);
+    }
+}

app/Models/Team.php

@@ -12,6 +12,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 
@@ -23,6 +24,9 @@
  * @property string                   $invite_code
  * @property string                   $default_role
  *
+ * @property Carbon $updated_at
+ * @property Carbon $created_at
+ *
  * @property Collection<TeamUser>     $teamUsers
  * @property Collection<User>         $members
  * @property Collection<DungeonRoute> $dungeonroutes
@@ -32,13 +36,12 @@
 class Team extends Model
 {
     use HasIconFile;
+    use GeneratesPublicKey;
 
     protected $visible = ['name', 'description', 'public_key'];
 
     protected $fillable = ['default_role'];
 
-    use GeneratesPublicKey;
-
     /**
      * https://stackoverflow.com/a/34485411/771270
      */

app/Models/UserIpAddress.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Models;
+
+use Eloquent;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Carbon;
+
+/**
+ * @property int    $id
+ * @property int    $user_id
+ * @property string $ip_address
+ * @property int    $count
+ *
+ * @property Carbon $updated_at
+ * @property Carbon $created_at
+ *
+ * @property User   $user
+ *
+ * @mixin Eloquent
+ */
+class UserIpAddress extends Model
+{
+    protected $fillable = [
+        'user_id',
+        'ip_address',
+        'count',
+        'updated_at',
+        'created_at',
+    ];
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+}

app/Models/UserReport.php

@@ -17,7 +17,8 @@
  * @property string $message
  * @property bool   $contact_ok
  * @property string $status
- * @property User   $author
+ *
+ * @property User   $user
  *
  * @mixin Eloquent
  */
@@ -27,6 +28,6 @@ class UserReport extends Model
 
     public function user(): BelongsTo
     {
-        return $this->belongsTo(User::class, 'user_id');
+        return $this->belongsTo(User::class);
     }
 }

app/Providers/AppServiceProvider.php

@@ -21,8 +21,8 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(
         CloudflareServiceInterface $cloudflareService
-    ): void
-    {
+    ): void {
+
         Model::preventLazyLoading(!app()->isProduction());
 
         /** @var User|null $user */

database/migrations/2024_11_20_151928_create_user_ip_addresses_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('user_ip_addresses', function (Blueprint $table) {
+            $table->id();
+            $table->integer('user_id');
+            $table->integer('count');
+            $table->string('ip_address');
+            $table->timestamps();
+
+            $table->index(['user_id', 'ip_address']);
+            $table->index(['ip_address']);
+            $table->unique(['user_id', 'ip_address']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('user_ip_addresses');
+    }
+};

routes/web.php

@@ -72,7 +72,7 @@
 // Webhooks
 Route::post('webhook/github', (new WebhookController())->github(...))->name('webhook.github');
 
-Route::middleware(['viewcachebuster', 'language', 'debugbarmessagelogger', 'read_only_mode', 'debug_info_context_logger'])->group(static function () {
+Route::middleware(['viewcachebuster', 'language', 'debugbarmessagelogger', 'read_only_mode', 'debug_info_context_logger', 'track_ip'])->group(static function () {
     // Catch for hard-coded /home route in RedirectsUsers.php
     Route::get('home', (new SiteController())->home(...));
     Route::get('credits', (new SiteController())->credits(...))->name('misc.credits');