chore: scope auth to executor

app/controllers.php

@@ -65,6 +65,7 @@ function logError(Log $log, Throwable $error, string $action, Logger $logger = n
 
 
 Http::get('/v1/runtimes/:runtimeId/logs')
+    ->groups(['api'])
     ->desc("Get live stream of logs of a runtime")
     ->param('runtimeId', '', new Text(64), 'Runtime unique ID.')
     ->param('timeout', '600', new Text(16), 'Maximum logs timeout.', true)
@@ -83,6 +84,7 @@ function logError(Log $log, Throwable $error, string $action, Logger $logger = n
     });
 
 Http::post('/v1/runtimes')
+    ->groups(['api'])
     ->desc("Create a new runtime server")
     ->param('runtimeId', '', new Text(64), 'Unique runtime ID.')
     ->param('image', '', new Text(128), 'Base image name of the runtime.')
@@ -137,6 +139,7 @@ function logError(Log $log, Throwable $error, string $action, Logger $logger = n
     });
 
 Http::get('/v1/runtimes')
+    ->groups(['api'])
     ->desc("List currently active runtimes")
     ->inject('runner')
     ->inject('response')
@@ -145,6 +148,7 @@ function logError(Log $log, Throwable $error, string $action, Logger $logger = n
     });
 
 Http::get('/v1/runtimes/:runtimeId')
+    ->groups(['api'])
     ->desc("Get a runtime by its ID")
     ->param('runtimeId', '', new Text(64), 'Runtime unique ID.')
     ->inject('runner')
@@ -157,6 +161,7 @@ function logError(Log $log, Throwable $error, string $action, Logger $logger = n
     });
 
 Http::delete('/v1/runtimes/:runtimeId')
+    ->groups(['api'])
     ->desc('Delete a runtime')
     ->param('runtimeId', '', new Text(64), 'Runtime unique ID.')
     ->inject('response')
@@ -168,6 +173,7 @@ function logError(Log $log, Throwable $error, string $action, Logger $logger = n
     });
 
 Http::post('/v1/runtimes/:runtimeId/executions')
+    ->groups(['api'])
     ->alias('/v1/runtimes/:runtimeId/execution')
     ->desc('Create an execution')
     // Execution-related
@@ -323,6 +329,7 @@ function (
     );
 
 Http::get('/v1/health')
+    ->groups(['api'])
     ->desc("Get health status of host machine and runtimes.")
     ->inject('runner')
     ->inject('response')
@@ -397,6 +404,7 @@ function (
     });
 
 Http::init()
+    ->groups(['api'])
     ->inject('request')
     ->action(function (Request $request) {
         $secretKey = \explode(' ', $request->getHeader('authorization', ''))[1] ?? '';

composer.json

@@ -1,52 +1,48 @@
 {
-    "name": "open-runtimes/executor",
-    "description": "Serverless runtimes executor for container based environments ⚡️",
-    "type": "project",
-    "license": "MIT",
-    "autoload": {
-        "psr-4": {
-            "OpenRuntimes\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests"
-        }
-    },
-    "scripts": {
-        "lint": "./vendor/bin/pint --test --config pint.json",
-        "format": "./vendor/bin/pint --config pint.json",
-        "check": "./vendor/bin/phpstan analyse --level 8 -c phpstan.neon app src tests",
-        "test": [
-            "Composer\\Config::disableProcessTimeout",
-            "./vendor/bin/phpunit --configuration phpunit.xml --debug"
-        ]
-    },
-    "require": {
-        "php": ">=8.3.0",
-        "ext-curl": "*",
-        "ext-json": "*",
-        "ext-swoole": "*",
-        "utopia-php/framework": "0.34.*",
-        "utopia-php/logger": "0.6.*",
-        "utopia-php/cli": "0.16.*",
-        "utopia-php/storage": "0.18.*",
-        "utopia-php/dsn": "0.1.*",
-        "utopia-php/registry": "0.5.*",
-        "utopia-php/preloader": "0.2.*",
-        "utopia-php/system": "0.9.*",
-        "utopia-php/orchestration": "0.14.*",
-        "appwrite/php-runtimes": "0.17.*"
-    },
-    "require-dev": {
-        "swoole/ide-helper": "4.8.5",
-        "phpunit/phpunit": "^9.3",
-        "laravel/pint": "1.2.*",
-        "phpstan/phpstan": "1.8.*"
-    },
-    "config": {
-        "platform": {
-            "php": "8.3"
-        }
+  "name": "open-runtimes/executor",
+  "description": "Serverless runtimes executor for container based environments ⚡️",
+  "type": "project",
+  "license": "MIT",
+  "autoload": {
+    "psr-4": {
+      "OpenRuntimes\\": "src/",
+      "Tests\\": "tests"
     }
+  },
+  "scripts": {
+    "lint": "./vendor/bin/pint --test --config pint.json",
+    "format": "./vendor/bin/pint --config pint.json",
+    "check": "./vendor/bin/phpstan analyse --level 8 -c phpstan.neon app src tests",
+    "test": [
+      "Composer\\Config::disableProcessTimeout",
+      "./vendor/bin/phpunit --configuration phpunit.xml --debug"
+    ]
+  },
+  "require": {
+    "php": ">=8.3.0",
+    "ext-curl": "*",
+    "ext-json": "*",
+    "ext-swoole": "*",
+    "utopia-php/framework": "0.34.*",
+    "utopia-php/logger": "0.6.*",
+    "utopia-php/cli": "0.16.*",
+    "utopia-php/storage": "0.18.*",
+    "utopia-php/dsn": "0.1.*",
+    "utopia-php/registry": "0.5.*",
+    "utopia-php/preloader": "0.2.*",
+    "utopia-php/system": "0.9.*",
+    "utopia-php/orchestration": "0.14.*",
+    "appwrite/php-runtimes": "0.17.*"
+  },
+  "require-dev": {
+    "swoole/ide-helper": "4.8.5",
+    "phpunit/phpunit": "^9.3",
+    "laravel/pint": "1.2.*",
+    "phpstan/phpstan": "1.8.*"
+  },
+  "config": {
+    "platform": {
+      "php": "8.3"
+    }
+  }
 }

src/Executor/BodyMultipart.php

@@ -10,7 +10,7 @@ class BodyMultipart
     private array $parts = [];
     private string $boundary = "";
 
-    public function __construct(string $boundary = null)
+    public function __construct(?string $boundary = null)
     {
         if (is_null($boundary)) {
             $this->boundary = self::generateBoundary();
@@ -130,13 +130,20 @@ public function exportBody(): string
         foreach ($this->parts as $key => $value) {
             $query .= $eol . 'Content-Disposition: form-data; name="' . $key . '"';
 
-            if (\is_array($value)) {
-                $query .= $eol . 'Content-Type: application/json';
-                $value = \json_encode($value);
+            if ($value instanceof \CURLFile) {
+                $filename = $value->getPostFilename() ?: \basename($value->getFilename());
+                $mime     = $value->getMimeType() ?: 'application/octet-stream';
+
+                $query .= '; filename="' . $filename . '"' . $eol;
+                $query .= 'Content-Type: ' . $mime . $eol . $eol;
+                $query .= \file_get_contents($value->getFilename()) . $eol;
+            } elseif (\is_array($value)) {
+                $query .= $eol . 'Content-Type: application/json' . $eol . $eol;
+                $query .= \json_encode($value) . $eol;
+            } else {
+                $query .= $eol . $eol . $value . $eol;
             }
 
-            $query .= $eol . $eol;
-            $query .= $value . $eol;
             $query .= '--' . $this->boundary;
         }