fix: #72 assign correct team when the service is accessed via api

ptah-sh · Jul 11, 2024 · 0e7cfe4 · 0e7cfe4
1 parent 05bc449
commit 0e7cfe4
Show file tree

Hide file tree

Showing 14 changed files with 90 additions and 9 deletions.
diff --git a/app/Http/Controllers/NodeController.php b/app/Http/Controllers/NodeController.php
@@ -36,7 +36,9 @@ public function create()
      */
     public function store(StoreNodeRequest $request)
     {
-        $node = Node::create($request->validated());
+        $node = Node::make($request->validated());
+        $node->team_id = auth()->user()->current_team_id;
+        $node->save();
 
         return to_route('nodes.show', ['node' => $node->id]);
     }

diff --git a/app/Http/Controllers/ServiceController.php b/app/Http/Controllers/ServiceController.php
@@ -62,6 +62,7 @@ public function store(StoreServiceRequest $request)
         $deploymentData = DeploymentData::validateAndCreate($request->get('deploymentData'));
 
         $service = Service::make($request->validated());
+        $service->team_id = auth()->user()->current_team_id;
         DB::transaction(function () use ($service, $deploymentData) {
             $service->save();
 

diff --git a/app/Http/Controllers/SwarmController.php b/app/Http/Controllers/SwarmController.php
@@ -140,12 +140,11 @@ public function updateDockerRegistries(Swarm $swarm, Request $request)
                     'type' => NodeTaskGroupType::UpdateDockerRegistries,
                     'swarm_id' => $swarm->id,
                     'invoker_id' => auth()->user()->id,
+                    'team_id' => auth()->user()->current_team_id,
                 ]);
 
                 $taskGroup->tasks()->createMany($tasks);
             }
         });
-
-//        return back();
     }
 }
diff --git a/app/Http/Controllers/SwarmTaskController.php b/app/Http/Controllers/SwarmTaskController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\NodeTask\InitClusterFormRequest;
+use App\Models\Deployment;
 use App\Models\DeploymentData;
 use App\Models\DeploymentData\LaunchMode;
 use App\Models\DeploymentData\ReleaseCommand;
@@ -14,6 +15,7 @@
 use App\Models\NodeTasks\InitSwarm\InitSwarmMeta;
 use App\Models\NodeTasks\UpdateCurrentNode\UpdateCurrentNodeMeta;
 use App\Models\NodeTaskType;
+use App\Models\Service;
 use App\Models\Swarm;
 use App\Models\SwarmData;
 use Illuminate\Support\Facades\DB;
@@ -25,6 +27,7 @@ public function initCluster(InitClusterFormRequest $request)
         DB::transaction(function () use ($request) {
             $swarm = Swarm::create([
                 'name' => $request->name,
+                'team_id' => auth()->user()->current_team_id,
                 'data' => SwarmData::validateAndCreate([
                     'registriesRev' => 0,
                     'registries' => [],
@@ -38,6 +41,7 @@ public function initCluster(InitClusterFormRequest $request)
 
             $network = Network::create([
                 'swarm_id' => $swarm->id,
+                'team_id' => auth()->user()->current_team_id,
                 'name' => dockerize_name('ptah-net'),
             ]);
 
@@ -46,6 +50,7 @@ public function initCluster(InitClusterFormRequest $request)
                 'swarm_id' => $swarm->id,
                 'node_id' => $request->node_id,
                 'invoker_id' => auth()->user()->id,
+                'team_id' => auth()->user()->current_team_id,
             ]);
 
             $tasks = [
@@ -108,9 +113,11 @@ public function initCluster(InitClusterFormRequest $request)
 
             $caddyService = $swarm->services()->create([
                 'name' => 'caddy',
+                'team_id' => auth()->user()->current_team_id,
             ]);
 
             $deployment = $caddyService->deployments()->create([
+                'team_id' => auth()->user()->current_team_id,
                 'data' => DeploymentData::validateAndCreate([
                     'networkName' => $network->docker_name,
                     'internalDomain' => 'caddy.ptah.local',
@@ -173,10 +180,13 @@ public function initCluster(InitClusterFormRequest $request)
                             'replicas' => 1,
                             'caddy' => [],
                             'fastcgiVars' => null,
+                            'redirectRules' => [],
                         ],
                     ],
                 ]),
             ]);
+            $deployment->team_id = auth()->user()->current_team_id;
+            $deployment->save();
 
             foreach ($deployment->asNodeTasks() as $task) {
                 $tasks[] = $task;

diff --git a/app/Models/Deployment.php b/app/Models/Deployment.php
@@ -23,6 +23,8 @@ class Deployment extends Model
     use HasOwningTeam;
 
     protected $fillable = [
+        'service_id',
+        'team_id',
         'task_group_id',
         'data',
     ];
@@ -124,6 +126,7 @@ public function asNodeTasks(): array
                                     'response' => [
                                         'set' => [
                                             'X-Powered-By' => ['https://ptah.sh'],
+                                            'X-Ptah-Rule-Id' => [$caddy->id],
                                         ],
                                     ],
                                 ],
@@ -158,6 +161,7 @@ public function asNodeTasks(): array
                                     'status_code' => (string) $redirectRule->statusCode,
                                     'headers' => [
                                         'X-Powered-By' => ['https://ptah.sh'],
+                                        'X-Ptah-Rule-Id' => [$redirectRule->id],
                                         'Location' => ["{http.request.scheme}://{$redirectRule->domainTo}{$pathTo}"],
                                     ],
                                 ]

diff --git a/app/Models/DeploymentData/Caddy.php b/app/Models/DeploymentData/Caddy.php
@@ -10,6 +10,7 @@
 class Caddy extends Data
 {
     public function __construct(
+        public string $id,
         #[In(['http', 'fastcgi'])]
         public string $targetProtocol,
         #[Between(1, 65535)]

diff --git a/app/Models/Network.php b/app/Models/Network.php
@@ -14,6 +14,7 @@ class Network extends Model
     protected $fillable = [
         'swarm_id',
         'name',
+        'team_id',
     ];
 
     protected static function booted(): void

diff --git a/app/Models/Node.php b/app/Models/Node.php
@@ -21,13 +21,14 @@ class Node extends Model
 
     protected $fillable = [
         'name',
+        'team_id',
     ];
 
     protected $appends = [
         'online',
     ];
 
-    protected static function booted()
+    protected static function booted(): void
     {
         self::creating(function (Node $node) {
             $node->agent_token = Str::random(42);
@@ -75,6 +76,7 @@ public function upgradeAgent($targetVersion): void
             'node_id' => $this->id,
             'type' => NodeTaskGroupType::SelfUpgrade,
             'invoker_id' => auth()->user()->id,
+            'team_id' => auth()->user()->current_team_id,
         ]);
 
         $taskGroup->tasks()->createMany([

diff --git a/app/Models/NodeTask.php b/app/Models/NodeTask.php
@@ -35,6 +35,13 @@ class NodeTask extends Model
         'formatted_result',
     ];
 
+    protected static function booted(): void
+    {
+        self::creating(function (NodeTask $nodeTask) {
+            $nodeTask->team_id = $nodeTask->taskGroup->team_id;
+        });
+    }
+
     public function taskGroup(): BelongsTo
     {
         return $this->belongsTo(NodeTaskGroup::class);

diff --git a/app/Models/NodeTaskGroup.php b/app/Models/NodeTaskGroup.php
@@ -25,6 +25,7 @@ class NodeTaskGroup extends Model
         'swarm_id',
         'node_id',
         'invoker_id',
+        'team_id',
     ];
 
     public function swarm(): BelongsTo
@@ -75,6 +76,7 @@ public function retry(Node|null $node): void
         $taskGroup->forceFill(collect($this->attributes)->only([
             'swarm_id',
             'invoker_id',
+            'team_id',
         ])->toArray());
         $taskGroup->save();
 

diff --git a/app/Models/Service.php b/app/Models/Service.php
@@ -24,6 +24,7 @@ class Service extends Model
     protected $fillable = [
         'name',
         'swarm_id',
+        'team_id',
     ];
 
     protected static function booted()
@@ -87,11 +88,13 @@ public function deploy(DeploymentData $deploymentData): Deployment
 
         $taskGroup = NodeTaskGroup::create([
             'swarm_id' => $this->swarm_id,
+            'team_id' => $this->team_id,
             'invoker_id' => auth()->id(),
             'type' => $this->deployments()->exists() ? NodeTaskGroupType::UpdateService : NodeTaskGroupType::CreateService,
         ]);
 
         $deployment = $this->deployments()->create([
+            'team_id' => $this->team_id,
             'data' => $deploymentData,
         ]);
 

diff --git a/app/Models/Swarm.php b/app/Models/Swarm.php
@@ -15,7 +15,8 @@ class Swarm extends Model
 
     protected $fillable = [
         'name',
-        'data'
+        'data',
+        'team_id',
     ];
 
     protected $casts = [

diff --git a/app/Traits/HasOwningTeam.php b/app/Traits/HasOwningTeam.php
@@ -10,10 +10,6 @@ trait HasOwningTeam
     protected static function bootHasOwningTeam(): void
     {
         static::addGlobalScope(new TeamScope());
-
-        static::creating(function ($model) {
-            $model->team_id = auth()->user()->currentTeam->id;
-        });
     }
 
     public function team()

diff --git a/database/migrations/2024_07_11_094004_update_deployments_add_caddy_id.php b/database/migrations/2024_07_11_094004_update_deployments_add_caddy_id.php
@@ -0,0 +1,52 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DB::update("
+            UPDATE deployments
+            SET data = jsonb_set(
+              data,
+              '{processes}',
+              (
+                SELECT jsonb_agg(
+                  jsonb_set(
+                    process,
+                    '{caddy}',
+                    COALESCE(
+                      (
+                        SELECT jsonb_agg(
+                          caddy_item || jsonb_build_object(
+                            'id', 
+                            concat('caddy-', substr(md5(random()::text), 1, 11))
+                          )
+                        )
+                        FROM jsonb_array_elements(process->'caddy') AS caddy_item
+                      ),
+                      '[]'::jsonb
+                    )
+                  )
+                )
+                FROM jsonb_array_elements(data->'processes') AS process
+              )
+            );
+        ");
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,8 @@ class Swarm extends Model @@
         protected $fillable = [
             'name',
-            'data'
+            'data',
+            'team_id',
         ];
         protected $casts = [
@@ Expand Down @@