From 32a75cb14010c26af42a758644d1bca9077c5f89 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Fri, 3 Mar 2023 10:29:39 +1100
Subject: [PATCH] Added database recording

---
 app/Http/Controllers/VersionController.php    | 38 ++++++++++++++----
 app/Models/Site.php                           | 17 ++++++++
 app/Models/SiteVersion.php                    | 15 +++++++
 app/Models/User.php                           | 33 ----------------
 .../2023_03_02_230700_visitor_tables.php      | 39 +++++++++++++++++++
 5 files changed, 101 insertions(+), 41 deletions(-)
 create mode 100644 app/Models/Site.php
 create mode 100644 app/Models/SiteVersion.php
 delete mode 100644 app/Models/User.php
 create mode 100644 database/migrations/2023_03_02_230700_visitor_tables.php

diff --git a/app/Http/Controllers/VersionController.php b/app/Http/Controllers/VersionController.php
index 0c86ee7..dbfa225 100644
--- a/app/Http/Controllers/VersionController.php
+++ b/app/Http/Controllers/VersionController.php
@@ -7,6 +7,9 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 
+use App\Models\Site;
+use App\Models\SiteVersion;
+
 class VersionController extends Controller
 {
 	const CACHE_TIME = 10;							// Time to cache version
@@ -21,6 +24,14 @@ class VersionController extends Controller
 		// v1.2.3-xxx-abcdef01
 		Log::info(sprintf('Connection from [%s] reporting version [%s]',$this->getUserIpAddr(),$version));
 
+		$so = Site::firstOrCreate([
+			'ip_address'=>$this->getUserIpAddr()
+		]);
+
+		$vo = new SiteVersion;
+		$vo->version = $version;
+		$so->versions()->save($vo);
+
 		$matches = [];
 		if (preg_match(self::VERSION_REGEX,$version,$matches)) {
 			// If xxx is "dev" we are a development version
@@ -45,10 +56,12 @@ class VersionController extends Controller
 						$repository = sprintf('v%s-rel-%s',$matches[1],$current->short_id);
 
 						// Find the tag associated with version $matches[1] and see if it is more recent than $matches[4]
-						return ($matches[4] === $current->short_id) ? ['current'=>$repository] : ['upgrade'=>sprintf('v%s-%s-%s',$matches[1],$matches[3],$current->short_id)];
+						$response = ($matches[4] === $current->short_id) ? ['current'=>$repository] : ['upgrade'=>sprintf('v%s-%s-%s',$matches[1],$matches[3],$current->short_id)];
 
 					} else
-						return ['unknown'=>'vn.n.n-dev-hhhhhhhh'];
+						$response = ['unknown'=>'vn.n.n-dev-hhhhhhhh'];
+
+					break;
 
 				case 'rel':
 					$current = Cache::remember('dev',self::CACHE_TIME,function() {
@@ -72,19 +85,26 @@ class VersionController extends Controller
 
 						// If $matches[1] is smaller, "upgrade available"
 						if ($matches[1] < $current->name)
-							return ['upgrade'=>$repository];
+							$response = ['upgrade'=>$repository];
 
 						// If $matches[1] is the same, validate that $matches[4] is current and the same and if not, error
 						elseif ($matches[1] === $current->name)
-							return ($matches[4] === $current->commit->short_id) ? ['current'=>$repository] : ['mismatch'=>$repository];
+							$response = ($matches[4] === $current->commit->short_id) ? ['current'=>$repository] : ['mismatch'=>$repository];
 
 						// if $matches[1] is higher, abort
 						else
-							return ['unknown'=>$repository];
+							$response = ['unknown'=>$repository];
 
 					} else
-						return ['unknown'=>'vn.n.n-rel-hhhhhhhh'];
+						$response = ['unknown'=>'vn.n.n-rel-hhhhhhhh'];
+
+					break;
 			}
+
+			$vo->response = $response;
+			$vo->save();
+
+			return $response;
 		}
 
 		// Return the current version
@@ -95,8 +115,10 @@ class VersionController extends Controller
 	{
 		if (isset($_SERVER['HTTP_CLIENT_IP']))
 			$ipaddress = $_SERVER['HTTP_CLIENT_IP'];
-		else if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
-			$ipaddress = $_SERVER['HTTP_X_FORWARDED_FOR'];
+		else if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+			$ips = preg_split('/,\s*/',$_SERVER['HTTP_X_FORWARDED_FOR']);
+			$ipaddress = $ips[0];
+		}
 		else if(isset($_SERVER['HTTP_X_FORWARDED']))
 			$ipaddress = $_SERVER['HTTP_X_FORWARDED'];
 		else if(isset($_SERVER['HTTP_FORWARDED_FOR']))
diff --git a/app/Models/Site.php b/app/Models/Site.php
new file mode 100644
index 0000000..608d156
--- /dev/null
+++ b/app/Models/Site.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Site extends Model
+{
+	protected $fillable = ['ip_address'];
+
+	/* RELATIONS */
+
+	public function versions()
+	{
+		return $this->hasMany(SiteVersion::class);
+	}
+}
diff --git a/app/Models/SiteVersion.php b/app/Models/SiteVersion.php
new file mode 100644
index 0000000..97b4d62
--- /dev/null
+++ b/app/Models/SiteVersion.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SiteVersion extends Model
+{
+	/* RELATIONS */
+
+	public function sites()
+	{
+		return $this->belongsTo(Site::class);
+	}
+}
diff --git a/app/Models/User.php b/app/Models/User.php
deleted file mode 100644
index db7646f..0000000
--- a/app/Models/User.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Auth\Authenticatable;
-use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
-use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Laravel\Lumen\Auth\Authorizable;
-
-class User extends Model implements AuthenticatableContract, AuthorizableContract
-{
-    use Authenticatable, Authorizable, HasFactory;
-
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var string[]
-     */
-    protected $fillable = [
-        'name', 'email',
-    ];
-
-    /**
-     * The attributes excluded from the model's JSON form.
-     *
-     * @var string[]
-     */
-    protected $hidden = [
-        'password',
-    ];
-}
diff --git a/database/migrations/2023_03_02_230700_visitor_tables.php b/database/migrations/2023_03_02_230700_visitor_tables.php
new file mode 100644
index 0000000..3e9363b
--- /dev/null
+++ b/database/migrations/2023_03_02_230700_visitor_tables.php
@@ -0,0 +1,39 @@
+<?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('sites', function (Blueprint $table) {
+			$table->id();
+			$table->timestamps();
+			$table->ipAddress('ip_address');
+		});
+
+		Schema::create('site_versions', function (Blueprint $table) {
+			$table->id();
+			$table->timestamps();
+			$table->string('version');
+			$table->json('response')->nullable();
+
+			$table->bigInteger('site_id');
+			$table->foreign('site_id')->references('id')->on('sites');
+		});
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('site_versions');
+		Schema::dropIfExists('sites');
+    }
+};