From 8670b416714e3df07f8ec4efbc7dfd54ea57dfb5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 17 Nov 2023 11:56:14 +0100
Subject: [PATCH] fix: do not allow to enter local ip addresses

---
 config/sentry.php                                   | 2 +-
 config/version.php                                  | 2 +-
 resources/views/livewire/server/form.blade.php      | 2 +-
 resources/views/livewire/server/new/by-ip.blade.php | 2 +-
 versions.json                                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index b66785b50..f3c3f9e6c 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.139',
+    'release' => '4.0.0-beta.140',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 085941feb..23436c488 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.139';
+return '4.0.0-beta.140';
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index c36d34cbc..f1292417f 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -42,7 +42,7 @@
                     label="Is it part of a Swarm cluster?" /> --}}
             </div>
             <div class="flex flex-col w-full gap-2 lg:flex-row">
-                <x-forms.input id="server.ip" label="IP Address/Domain"
+                <x-forms.input id="server.ip" pattern="^(?!10\.(\d{1,3}\.){2}\d{1,3}|172\.(1[6-9]|2[0-9]|3[0-1])\.(\d{1,3}\.){1}\d{1,3}|192\.168\.(\d{1,3}\.){1}\d{1,3}|(?:[Ff][Cc00]|[Ff][Dd])[0-9a-fA-F]{2}:|fe80:).*$" label="IP Address/Domain"
                     helper="An IP Address (127.0.0.1) or domain (example.com)." required />
                 <div class="flex gap-2">
                     <x-forms.input id="server.user" label="User" required />
diff --git a/resources/views/livewire/server/new/by-ip.blade.php b/resources/views/livewire/server/new/by-ip.blade.php
index 7dfb3a5b0..01ef6ec27 100644
--- a/resources/views/livewire/server/new/by-ip.blade.php
+++ b/resources/views/livewire/server/new/by-ip.blade.php
@@ -10,7 +10,7 @@
                 <x-forms.input id="description" label="Description" />
             </div>
             <div class="flex gap-2">
-                <x-forms.input id="ip" label="IP Address/Domain" required
+                <x-forms.input pattern="^(?!10\.(\d{1,3}\.){2}\d{1,3}|172\.(1[6-9]|2[0-9]|3[0-1])\.(\d{1,3}\.){1}\d{1,3}|192\.168\.(\d{1,3}\.){1}\d{1,3}|(?:[Ff][Cc00]|[Ff][Dd])[0-9a-fA-F]{2}:|fe80:).*$" id="ip" label="IP Address/Domain" required
                     helper="An IP Address (127.0.0.1) or domain (example.com)." />
                 <x-forms.input id="user" label  ="User" required />
                 <x-forms.input type="number" id="port" label="Port" required />
diff --git a/versions.json b/versions.json
index 2dc7c1e54..bf5d5ed96 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.139"
+            "version": "4.0.0-beta.140"
         }
     }
 }