Merge branch '3.x' into add-ubuntu-26-suppor

Author: saeedvaziry

app/Services/Firewall/AbstractFirewall.php

@@ -14,7 +14,7 @@ protected function createBasicFirewallRules(): void
                 'type' => 'allow',
                 'name' => 'SSH',
                 'protocol' => 'tcp',
-                'port' => 22,
+                'port' => $this->service->server->port ?? 22,
                 'source' => null,
                 'mask' => null,
                 'status' => FirewallRuleStatus::READY,

app/Services/Firewall/Ufw.php

@@ -30,7 +30,9 @@ public function install(): void
         $this->createBasicFirewallRules();
 
         $this->service->server->ssh()->exec(
-            view('ssh.services.firewall.ufw.install-ufw'),
+            view('ssh.services.firewall.ufw.install-ufw', [
+                'sshPort' => $this->service->server->port ?? 22,
+            ]),
             'install-ufw'
         );
         event('service.installed', $this->service);

config/app.php

@@ -255,7 +255,7 @@
         // 'ExampleClass' => App\Example\ExampleClass::class,
     ])->toArray(),
 
-    'version' => '3.21.3',
+    'version' => '3.22.0',
 
     'demo' => env('APP_DEMO', false),
 

resources/views/ssh/services/firewall/ufw/install-ufw.blade.php

@@ -6,7 +6,7 @@
     echo 'VITO_SSH_ERROR' && exit 1
 fi
 
-if ! sudo ufw allow from 0.0.0.0/0 to any proto tcp port 22; then
+if ! sudo ufw allow from 0.0.0.0/0 to any proto tcp port {{ $sshPort }}; then
     echo 'VITO_SSH_ERROR' && exit 1
 fi
 

resources/views/ssh/storage/dropbox/upload.blade.php

@@ -3,4 +3,4 @@
 --header 'Dropbox-API-Arg: {"path":"{{ $dest }}"}' \
 --header 'Content-Type: text/plain; charset=dropbox-cors-hack' \
 --header 'Authorization: Bearer {{ $token }}' \
---data-binary '@{{ $src }}'
+--data-binary '{{ "@" . $src }}'

tests/Unit/SSH/Services/Firewall/UfwInstallTest.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Tests\Unit\SSH\Services\Firewall;
+
+use App\Facades\SSH;
+use App\Services\Firewall\Ufw;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class UfwInstallTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_install_seeds_ssh_rule_with_custom_server_port(): void
+    {
+        SSH::fake();
+
+        $this->server->update(['port' => 22022]);
+
+        /** @var Ufw $ufw */
+        $ufw = $this->server->services()
+            ->where('type', Ufw::type())
+            ->firstOrFail()
+            ->handler();
+
+        $ufw->install();
+
+        $this->assertDatabaseHas('firewall_rules', [
+            'server_id' => $this->server->id,
+            'name' => 'SSH',
+            'port' => 22022,
+        ]);
+
+        $this->assertDatabaseMissing('firewall_rules', [
+            'server_id' => $this->server->id,
+            'name' => 'SSH',
+            'port' => 22,
+        ]);
+    }
+
+    public function test_install_seeds_ssh_rule_with_default_port_when_unchanged(): void
+    {
+        SSH::fake();
+
+        $this->server->update(['port' => 22]);
+
+        /** @var Ufw $ufw */
+        $ufw = $this->server->services()
+            ->where('type', Ufw::type())
+            ->firstOrFail()
+            ->handler();
+
+        $ufw->install();
+
+        $this->assertDatabaseHas('firewall_rules', [
+            'server_id' => $this->server->id,
+            'name' => 'SSH',
+            'port' => 22,
+        ]);
+    }
+
+    public function test_install_seeds_http_and_https_rules_unchanged(): void
+    {
+        SSH::fake();
+
+        $this->server->update(['port' => 22022]);
+
+        /** @var Ufw $ufw */
+        $ufw = $this->server->services()
+            ->where('type', Ufw::type())
+            ->firstOrFail()
+            ->handler();
+
+        $ufw->install();
+
+        $this->assertDatabaseHas('firewall_rules', [
+            'server_id' => $this->server->id,
+            'name' => 'HTTP',
+            'port' => 80,
+        ]);
+        $this->assertDatabaseHas('firewall_rules', [
+            'server_id' => $this->server->id,
+            'name' => 'HTTPS',
+            'port' => 443,
+        ]);
+    }
+}