Firewall rules wip, server show improved

app/Enums/FirewallRuleStatus.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Enums;
+
+enum FirewallRuleStatus: string
+{
+    case NOT_APPLIED = 'not-applied';
+    case APPLIED = 'applied';
+    case FAILED = 'failed';
+}

app/Http/Controllers/ServerController.php

@@ -83,7 +83,7 @@ class ServerController extends Controller
             'region' => $request->location,
             'os' => $request->image,
             'plan' => $request->server_type,
-            'user' => '',
+            'user' => 'keystone',
         ]);
 
         dispatch(new WaitForServerToConnect(
@@ -103,7 +103,7 @@ class ServerController extends Controller
         $server = $organisation->servers()->findOrFail($request->route('server'));
 
         return inertia('servers/Show', [
-            'server' => $server->load('services'),
+            'server' => $server->load('services.slices'),
         ]);
     }
 }

app/Jobs/Services/RunStep.php

@@ -30,9 +30,7 @@ class RunStep implements ShouldQueue
 
         $server = $this->step->deployment->target->server;
 
-        $ssh = Ssh::create('root', $server->ipv4)
+        $ssh = $server->sshClient()
-            ->usePrivateKey(storage_path('app/private/ssh/id_ed25519'))
-            ->disableStrictHostKeyChecking()
             ->onOutput(function ($output) {
                 $this->step->update([
                     'logs' => $this->step->logs . "\n" . trim($output),

app/Models/FirewallRule.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Models;
+
+use App\Enums\FirewallRuleStatus;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class FirewallRule extends Model
+{
+    protected $guarded = [];
+
+    public static function boot(): void
+    {
+        parent::boot();
+
+        static::created(function (self $firewallRule) {
+            $firewallRule->execute();
+        });
+    }
+
+    protected function casts(): array
+    {
+        return [
+            'status' => FirewallRuleStatus::class,
+        ];
+    }
+
+    public function server(): BelongsTo
+    {
+        return $this->belongsTo(Server::class);
+    }
+
+    public function execute(): void
+    {
+        $ssh = $this->server->sshClient();
+
+        $command = "ufw";
+
+        if ($this->type === 'allow') {
+            $command .= " allow";
+        } elseif ($this->type === 'deny') {
+            $command .= " deny";
+        }
+
+        if ($this->from) {
+            $command .= " from {$this->from}";
+            $command .= " to any port";
+        }
+
+        $command .= " {$this->ports}";
+
+        $result = $ssh->execute($command);
+
+        if (! $result->isSuccessful()) {
+            $this->update([
+                'status' => FirewallRuleStatus::FAILED,
+            ]);
+            return;
+        }
+        $this->update([
+            'status' => FirewallRuleStatus::APPLIED,
+        ]);
+    }
+}

app/Models/Server.php

@@ -7,6 +7,7 @@ use App\Enums\ServerStatus;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Spatie\Ssh\Ssh;
 
 class Server extends Model
 {
@@ -29,4 +30,16 @@ class Server extends Model
     {
         return $this->hasMany(Service::class);
     }
+
+    public function firewallRules(): HasMany
+    {
+        return $this->hasMany(FirewallRule::class);
+    }
+
+    public function sshClient(string $user = 'root'): Ssh
+    {
+        return Ssh::create($user, $this->ipv4)
+            ->usePrivateKey(storage_path('app/private/ssh/id_ed25519'))
+            ->disableStrictHostKeyChecking();
+    }
 }

database/migrations/2025_03_31_170943_create_firewall_rules_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use App\Enums\FirewallRuleStatus;
+use App\Models\Server;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('firewall_rules', function (Blueprint $table) {
+            $table->id();
+            $table->string('status')->default(FirewallRuleStatus::NOT_APPLIED->value);
+            $table->foreignIdfor(Server::class);
+            $table->string('type');
+            $table->string('ports');
+            $table->string('from')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('firewall_rules');
+    }
+};

package-lock.json

@@ -1,5 +1,5 @@
 {
-    "name": "vue-starter-kit",
+    "name": "keystone",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
@@ -16,7 +16,7 @@
                 "lucide": "^0.468.0",
                 "lucide-vue-next": "^0.468.0",
                 "radix-vue": "^1.9.11",
-                "tailwind-merge": "^2.5.5",
+                "tailwind-merge": "^2.6.0",
                 "tailwindcss": "^3.4.1",
                 "tailwindcss-animate": "^1.0.7",
                 "typescript": "^5.2.2",

package.json

@@ -34,7 +34,7 @@
         "lucide": "^0.468.0",
         "lucide-vue-next": "^0.468.0",
         "radix-vue": "^1.9.11",
-        "tailwind-merge": "^2.5.5",
+        "tailwind-merge": "^2.6.0",
         "tailwindcss": "^3.4.1",
         "tailwindcss-animate": "^1.0.7",
         "typescript": "^5.2.2",

resources/js/components/ui/badge/Badge.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import type { HTMLAttributes } from 'vue'
+import { cn } from '@/lib/utils'
+import { type BadgeVariants, badgeVariants } from '.'
+
+const props = defineProps<{
+  variant?: BadgeVariants['variant']
+  class?: HTMLAttributes['class']
+}>()
+</script>
+
+<template>
+  <div :class="cn(badgeVariants({ variant }), props.class)">
+    <slot />
+  </div>
+</template>

resources/js/components/ui/badge/index.ts

@@ -0,0 +1,27 @@
+import { cva, type VariantProps } from 'class-variance-authority'
+
+export { default as Badge } from './Badge.vue'
+
+export const badgeVariants = cva(
+  'inline-flex items-center rounded-full border px-2 py-0.25 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',
+  {
+    variants: {
+      variant: {
+        default:
+          'border-transparent bg-primary text-primary-foreground hover:bg-primary/80',
+        secondary:
+          'border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80',
+        destructive:
+          'border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80',
+        success: 
+            'border-transparent bg-green-200 text-green-800 hover:bg-green-200/80',
+        outline: 'text-foreground',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+    },
+  },
+)
+
+export type BadgeVariants = VariantProps<typeof badgeVariants>

resources/js/pages/servers/Show.vue

@@ -1,6 +1,9 @@
 <script setup lang="ts">
+import { Badge } from '@/components/ui/badge';
+import { Card, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import AppLayout from '@/layouts/AppLayout.vue';
 import { Head } from '@inertiajs/vue3';
+import { DatabaseIcon, Layers2Icon } from 'lucide-vue-next';
 
 const props = defineProps({
     server: {
@@ -31,7 +34,32 @@ const props = defineProps({
         ]"
     >
         <div class="flex h-full flex-1 flex-col gap-4 rounded-xl p-4">
-            {{ server }}
+            <div class="flex items-center gap-3">
+                <h2 class="text-3xl font-bold tracking-tight">{{ server.name }}</h2>
+                <div>
+                    <Badge :variant="server.status === 'active' ? 'success' : 'secondary'">{{ server.status }}</Badge>
+                </div>
+                <div class="leading-none opacity-40">{{ server.ipv4 }} &bull; {{ server.ipv6 }}</div>
+            </div>
+
+            <div>
+                <h3 class="text-2xl font-semibold tracking-tight mb-3">Services</h3>
+                <div class="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
+                    <Card v-for="service in server.services" :key="service.id">
+                        <CardHeader>
+                            <div class="flex items-center gap-2">
+                                <DatabaseIcon v-if="service.category === 'database'" class="size-5 opacity-50" />
+                                <CardTitle>{{ service.name }}</CardTitle>
+                                <Badge :variant="service.status === 'active' ? 'success' : 'secondary'">{{ service.status.replace('-', ' ') }}</Badge>
+                            </div>
+                            <CardDescription>
+                                <span class="capitalize">{{ service.type }}</span> {{ service.version }} &bull;
+                                <Layers2Icon class="inline-block size-4" /> {{ service.slices?.length }} slices
+                            </CardDescription>
+                        </CardHeader>
+                    </Card>
+                </div>
+            </div>
 
             <div v-if="$page.props.flash?.server_credentials" class="p-5">
                 <div class="mb-4 text-sm font-medium text-gray-900 dark:text-white">
@@ -39,6 +67,8 @@ const props = defineProps({
                     {{ $page.props.flash.server_credentials }}
                 </div>
             </div>
+
+            <!-- {{ server }} -->
         </div>
     </AppLayout>
 </template>