fix: #138 use dird to get the real ip of end-users

ptah-sh · Aug 25, 2024 · 6ca2ccc · 6ca2ccc
1 parent 524aaf9
commit 6ca2ccc
Show file tree

Hide file tree

Showing 11 changed files with 171 additions and 0 deletions.
diff --git a/api-nodes/Http/Controllers/EventController.php b/api-nodes/Http/Controllers/EventController.php
@@ -4,7 +4,12 @@
 
 use ApiNodes\Models\AgentStartedEventData;
 use App\Models\Node;
+use App\Models\NodeTaskGroup;
+use App\Models\NodeTaskGroupType;
+use App\Models\NodeTasks\UpdateDirdConfig\UpdateDirdConfigMeta;
+use App\Models\NodeTaskType;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 class EventController
 {
@@ -20,6 +25,40 @@ public function started(Node $node, AgentStartedEventData $data)
                 $swarm->data->joinTokens = $data->swarm->joinTokens;
                 $swarm->data->managerNodes = $data->swarm->managerNodes;
 
+                $nodeAddresses = $swarm->nodes->pluck('data.address')->toArray();
+                $dockerServices = collect($swarm->services)
+                    ->filter(function ($service) {
+                        return Str::contains($service->docker_name, 'caddy');
+                    })
+                    ->pluck('docker_name')
+                    ->toArray();
+
+                $swarm->nodes->each(function (Node $node) use ($swarm, $nodeAddresses, $dockerServices) {
+                    $taskGroup = NodeTaskGroup::create([
+                        'type' => NodeTaskGroupType::UpdateDirdConfig,
+                        'swarm_id' => $swarm->id,
+                        'team_id' => $node->team_id,
+                        'node_id' => $node->id,
+                        'invoker_id' => $swarm->team->user_id,
+                    ]);
+
+                    $meta = new UpdateDirdConfigMeta(
+                        nodeAddresses: $nodeAddresses,
+                        dockerServices: $dockerServices,
+                        nodePorts: ['tcp/80', 'tcp/443']
+                    );
+
+                    $taskGroup->tasks()->create([
+                        'type' => NodeTaskType::UpdateDirdConfig,
+                        'meta' => $meta,
+                        'payload' => [
+                            'NodeAddresses' => $nodeAddresses,
+                            'DockerServices' => $dockerServices,
+                            'NodePorts' => ['tcp/80', 'tcp/443'],
+                        ],
+                    ]);
+                });
+
                 $swarm->save();
             }
         });

diff --git a/app/Events/NodeTasks/UpdateDirdConfig/UpdateDirdConfigCompleted.php b/app/Events/NodeTasks/UpdateDirdConfig/UpdateDirdConfigCompleted.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Events\NodeTasks\UpdateDirdConfig;
+
+use App\Events\NodeTasks\BaseTaskEvent;
+
+class UpdateDirdConfigCompleted extends BaseTaskEvent {}
diff --git a/app/Events/NodeTasks/UpdateDirdConfig/UpdateDirdConfigFailed.php b/app/Events/NodeTasks/UpdateDirdConfig/UpdateDirdConfigFailed.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Events\NodeTasks\UpdateDirdConfig;
+
+use App\Events\NodeTasks\BaseTaskEvent;
+
+class UpdateDirdConfigFailed extends BaseTaskEvent {}
diff --git a/app/Models/NodeData.php b/app/Models/NodeData.php
@@ -14,5 +14,6 @@ public function __construct(
         public DockerData $docker,
         public HostData $host,
         public NodeRole $role,
+        public string $address,
     ) {}
 }
diff --git a/app/Models/NodeTaskGroupType.php b/app/Models/NodeTaskGroupType.php
@@ -13,4 +13,5 @@ enum NodeTaskGroupType: int
     case UpdateS3Storages = 6;
     case CreateBackup = 7;
     case JoinSwarm = 8;
+    case UpdateDirdConfig = 9;
 }
diff --git a/app/Models/NodeTaskType.php b/app/Models/NodeTaskType.php
@@ -36,6 +36,8 @@
 use App\Events\NodeTasks\ServiceExec\ServiceExecFailed;
 use App\Events\NodeTasks\UpdateAgentSymlink\UpdateAgentSymlinkCompleted;
 use App\Events\NodeTasks\UpdateAgentSymlink\UpdateAgentSymlinkFailed;
+use App\Events\NodeTasks\UpdateDirdConfig\UpdateDirdConfigCompleted;
+use App\Events\NodeTasks\UpdateDirdConfig\UpdateDirdConfigFailed;
 use App\Events\NodeTasks\UpdateNode\UpdateCurrentNodeCompleted;
 use App\Events\NodeTasks\UpdateNode\UpdateCurrentNodeFailed;
 use App\Events\NodeTasks\UpdateService\UpdateServiceCompleted;
@@ -78,6 +80,8 @@
 use App\Models\NodeTasks\UpdateAgentSymlink\UpdateAgentSymlinkResult;
 use App\Models\NodeTasks\UpdateCurrentNode\UpdateCurrentNodeMeta;
 use App\Models\NodeTasks\UpdateCurrentNode\UpdateCurrentNodeResult;
+use App\Models\NodeTasks\UpdateDirdConfig\UpdateDirdConfigMeta;
+use App\Models\NodeTasks\UpdateDirdConfig\UpdateDirdConfigResult;
 use App\Models\NodeTasks\UpdateService\UpdateServiceMeta;
 use App\Models\NodeTasks\UpdateService\UpdateServiceResult;
 use App\Models\NodeTasks\UploadS3File\UploadS3FileMeta;
@@ -106,6 +110,7 @@ enum NodeTaskType: int
     case ServiceExec = 17;
     case UploadS3File = 18;
     case JoinSwarm = 19;
+    case UpdateDirdConfig = 20;
 
     public function meta(): string
     {
@@ -130,6 +135,7 @@ public function meta(): string
             self::ServiceExec => ServiceExecMeta::class,
             self::UploadS3File => UploadS3FileMeta::class,
             self::JoinSwarm => JoinSwarmMeta::class,
+            self::UpdateDirdConfig => UpdateDirdConfigMeta::class,
         };
     }
 
@@ -156,6 +162,7 @@ public function result(): string
             self::ServiceExec => ServiceExecResult::class,
             self::UploadS3File => UploadS3FileResult::class,
             self::JoinSwarm => JoinSwarmResult::class,
+            self::UpdateDirdConfig => UpdateDirdConfigResult::class,
         };
     }
 
@@ -182,6 +189,7 @@ public function completed(): string
             self::ServiceExec => ServiceExecCompleted::class,
             self::UploadS3File => UploadS3FileCompleted::class,
             self::JoinSwarm => JoinSwarmCompleted::class,
+            self::UpdateDirdConfig => UpdateDirdConfigCompleted::class,
         };
     }
 
@@ -208,6 +216,7 @@ public function failed(): string
             self::ServiceExec => ServiceExecFailed::class,
             self::UploadS3File => UploadS3FileFailed::class,
             self::JoinSwarm => JoinSwarmFailed::class,
+            self::UpdateDirdConfig => UpdateDirdConfigFailed::class,
         };
     }
 }
diff --git a/app/Models/NodeTasks/UpdateDirdConfig/UpdateDirdConfigMeta.php b/app/Models/NodeTasks/UpdateDirdConfig/UpdateDirdConfigMeta.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models\NodeTasks\UpdateDirdConfig;
+
+use App\Models\NodeTasks\AbstractTaskMeta;
+
+class UpdateDirdConfigMeta extends AbstractTaskMeta
+{
+    public function __construct(
+        public array $nodeAddresses,
+        public array $dockerServices,
+        public array $nodePorts,
+    ) {}
+
+    public function formattedHtml(): string
+    {
+        return 'Update DIRD Config';
+    }
+}
diff --git a/app/Models/NodeTasks/UpdateDirdConfig/UpdateDirdConfigResult.php b/app/Models/NodeTasks/UpdateDirdConfig/UpdateDirdConfigResult.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models\NodeTasks\UpdateDirdConfig;
+
+use App\Models\NodeTasks\AbstractTaskResult;
+
+class UpdateDirdConfigResult extends AbstractTaskResult
+{
+    public function __construct(
+    ) {
+        //
+    }
+
+    public function formattedHtml(): string
+    {
+        return 'Success.';
+    }
+}
diff --git a/app/Models/NodeTasks/UpdateDirdConfiguration/UpdateDirdConfigurationMeta.php b/app/Models/NodeTasks/UpdateDirdConfiguration/UpdateDirdConfigurationMeta.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Models\NodeTasks\UpdateDirdConfiguration;
+
+use App\Models\NodeTasks\AbstractTaskMeta;
+
+class UpdateDirdConfigurationMeta extends AbstractTaskMeta
+{
+    public function __construct(
+        public array $nodeAddresses,
+        public array $dockerServices,
+        public array $nodePorts,
+    ) {
+        //
+    }
+
+    public function formattedHtml(): string
+    {
+        return 'Update DIRD Configuration';
+    }
+}
diff --git a/app/Models/NodeTasks/UpdateDirdConfiguration/UpdateDirdConfigurationResult.php b/app/Models/NodeTasks/UpdateDirdConfiguration/UpdateDirdConfigurationResult.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models\NodeTasks\UpdateDirdConfiguration;
+
+use App\Models\NodeTasks\AbstractTaskResult;
+
+class UpdateDirdConfigurationResult extends AbstractTaskResult
+{
+    public function __construct(
+    ) {
+        //
+    }
+
+    public function formattedHtml(): string
+    {
+        return 'Success.';
+    }
+}
diff --git a/database/migrations/2024_08_25_130825_update_node_data_address.php b/database/migrations/2024_08_25_130825_update_node_data_address.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class UpdateNodeDataAddress extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::statement("
+            UPDATE nodes
+            SET data = data || '{\"address\": \"10.0.0.2\"}'::jsonb
+            WHERE (data->>'address') IS NULL OR (data->>'address') = ''
+        ");
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        DB::statement("
+            UPDATE nodes
+            SET data = data - 'address'
+            WHERE data ? 'address'
+        ");
+    }
+}