Merge branch 'next' into useless-variable-assignments

2024-10-28 13:32:34 +01:00
parent 5e11f159e0 ec22162384
commit 7c2d3c47eb
320 changed files with 9153 additions and 3569 deletions
--- a/bootstrap/helpers/databases.php
+++ b/bootstrap/helpers/databases.php
@@ -1,5 +1,6 @@
 <?php

+use App\Models\EnvironmentVariable;
 use App\Models\Server;
 use App\Models\StandaloneClickhouse;
 use App\Models\StandaloneDocker;
@@ -48,7 +49,7 @@ function create_standalone_redis($environment_id, $destination_uuid, ?array $oth
    }
    $database = new StandaloneRedis;
    $database->name = generate_database_name('redis');
-    $database->redis_password = \Illuminate\Support\Str::password(length: 64, symbols: false);
+    $redis_password = \Illuminate\Support\Str::password(length: 64, symbols: false);
    $database->environment_id = $environment_id;
    $database->destination_id = $destination->id;
    $database->destination_type = $destination->getMorphClass();
@@ -57,6 +58,20 @@ function create_standalone_redis($environment_id, $destination_uuid, ?array $oth
    }
    $database->save();

+    EnvironmentVariable::create([
+        'key' => 'REDIS_PASSWORD',
+        'value' => $redis_password,
+        'standalone_redis_id' => $database->id,
+        'is_shared' => false,
+    ]);
+
+    EnvironmentVariable::create([
+        'key' => 'REDIS_USERNAME',
+        'value' => 'default',
+        'standalone_redis_id' => $database->id,
+        'is_shared' => false,
+    ]);
+
    return $database;
 }

--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -164,6 +164,7 @@ function generate_default_proxy_configuration(Server $server)
                    'ports' => [
                        '80:80',
                        '443:443',
+                        '443:443/udp',
                        '8080:8080',
                    ],
                    'healthcheck' => [
@@ -187,6 +188,7 @@ function generate_default_proxy_configuration(Server $server)
                        '--entryPoints.http.http2.maxConcurrentStreams=50',
                        '--entrypoints.https.http.encodequerysemicolons=true',
                        '--entryPoints.https.http2.maxConcurrentStreams=50',
+                        '--entrypoints.https.http3',
                        '--providers.docker.exposedbydefault=false',
                        '--providers.file.directory=/traefik/dynamic/',
                        '--providers.file.watch=true',
@@ -239,9 +241,11 @@ function generate_default_proxy_configuration(Server $server)
                    'ports' => [
                        '80:80',
                        '443:443',
+                        '443:443/udp',
                    ],
                    'labels' => [
                        'coolify.managed=true',
+                        'coolify.proxy=true',
                    ],
                    'volumes' => [
                        '/var/run/docker.sock:/var/run/docker.sock:ro',
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -39,6 +39,7 @@ use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Process;
+use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Validator;
@@ -126,7 +127,7 @@ function refreshSession(?Team $team = null): void
 }
 function handleError(?Throwable $error = null, ?Livewire\Component $livewire = null, ?string $customErrorMessage = null)
 {
-    ray($error);
+    loggy($error);
    if ($error instanceof TooManyRequestsException) {
        if (isset($livewire)) {
            return $livewire->dispatch('error', "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.");
@@ -142,6 +143,10 @@ function handleError(?Throwable $error = null, ?Livewire\Component $livewire = n
        return 'Duplicate entry found. Please use a different name.';
    }

+    if ($error instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
+        abort(404);
+    }
+
    if ($error instanceof Throwable) {
        $message = $error->getMessage();
    } else {
@@ -164,14 +169,11 @@ function get_route_parameters(): array
 function get_latest_sentinel_version(): string
 {
    try {
-        $response = Http::get('https://cdn.coollabs.io/sentinel/versions.json');
+        $response = Http::get('https://cdn.coollabs.io/coolify/versions.json');
        $versions = $response->json();

-        return data_get($versions, 'sentinel.version');
+        return data_get($versions, 'coolify.sentinel.version');
    } catch (\Throwable $e) {
-        //throw $e;
-        ray($e->getMessage());
-
        return '0.0.0';
    }
 }
@@ -643,7 +645,7 @@ function queryResourcesByUuid(string $uuid)

    return $resource;
 }
-function generatTagDeployWebhook($tag_name)
+function generateTagDeployWebhook($tag_name)
 {
    $baseUrl = base_url();
    $api = Url::fromString($baseUrl).'/api/v1';
@@ -1338,13 +1340,6 @@ function isAnyDeploymentInprogress()
    exit(0);
 }

-function generateSentinelToken()
-{
-    $token = Str::random(64);
-
-    return $token;
-}
-
 function isBase64Encoded($strValue)
 {
    return base64_encode(base64_decode($strValue, true)) === $strValue;
@@ -3569,6 +3564,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                ]);
            } else {
                if ($value->startsWith('$')) {
+                    $isRequired = false;
                    if ($value->contains(':-')) {
                        $value = replaceVariables($value);
                        $key = $value->before(':');
@@ -3583,11 +3579,13 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int

                        $key = $value->before(':');
                        $value = $value->after(':?');
+                        $isRequired = true;
                    } elseif ($value->contains('?')) {
                        $value = replaceVariables($value);

                        $key = $value->before('?');
                        $value = $value->after('?');
+                        $isRequired = true;
                    }
                    if ($originalValue->value() === $value->value()) {
                        // This means the variable does not have a default value, so it needs to be created in Coolify
@@ -3598,6 +3596,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                        ], [
                            'is_build_time' => false,
                            'is_preview' => false,
+                            'is_required' => $isRequired,
                        ]);
                        // Add the variable to the environment so it will be shown in the deployable compose file
                        $environment[$parsedKeyValue->value()] = $resource->environment_variables()->where('key', $parsedKeyValue)->where($nameOfId, $resource->id)->first()->value;
@@ -3611,6 +3610,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                        'value' => $value,
                        'is_build_time' => false,
                        'is_preview' => false,
+                        'is_required' => $isRequired,
                    ]);
                }

@@ -3787,7 +3787,6 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
                    service_name: $serviceName,
                    image: $image,
                    predefinedPort: $predefinedPort
-
                ));
            }
        }
@@ -3896,6 +3895,8 @@ function isAssociativeArray($array)
 */
 function add_coolify_default_environment_variables(StandaloneRedis|StandalonePostgresql|StandaloneMongodb|StandaloneMysql|StandaloneMariadb|StandaloneKeydb|StandaloneDragonfly|StandaloneClickhouse|Application|Service $resource, Collection &$where_to_add, ?Collection $where_to_check = null)
 {
+    // Currently disabled
+    return;
    if ($resource instanceof Service) {
        $ip = $resource->server->ip;
    } else {
@@ -3983,13 +3984,14 @@ function instanceSettings()
    return InstanceSettings::get();
 }

-function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id) {
+function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id)
+{

    $server = Server::find($server_id)->where('team_id', $team_id)->first();
-    if (!$server) {
+    if (! $server) {
        return;
    }
-    $uuid = new Cuid2();
+    $uuid = new Cuid2;
    $cloneCommand = "git clone --no-checkout -b $branch $repository .";
    $workdir = rtrim($base_directory, '/');
    $fileList = collect([".$workdir/coolify.json"]);
@@ -4007,6 +4009,60 @@ function loadConfigFromGit(string $repository, string $branch, string $base_dire
    try {
        return instant_remote_process($commands, $server);
    } catch (\Exception $e) {
-       // continue
+        // continue
    }
 }
+
+function loggy($message = null, array $context = [])
+{
+    if (! isDev()) {
+        return;
+    }
+    if (function_exists('ray') && config('app.debug')) {
+        ray($message, $context);
+    }
+    if (is_null($message)) {
+        return app('log');
+    }
+
+    return app('log')->debug($message, $context);
+}
+function sslipDomainWarning(string $domains)
+{
+    $domains = str($domains)->trim()->explode(',');
+    $showSslipHttpsWarning = false;
+    $domains->each(function ($domain) use (&$showSslipHttpsWarning) {
+        if (str($domain)->contains('https') && str($domain)->contains('sslip')) {
+            $showSslipHttpsWarning = true;
+        }
+    });
+
+    return $showSslipHttpsWarning;
+}
+
+function isEmailRateLimited(string $limiterKey, int $decaySeconds = 3600, ?callable $callbackOnSuccess = null): bool
+{
+    if (isDev()) {
+        $decaySeconds = 120;
+    }
+    $rateLimited = false;
+    $executed = RateLimiter::attempt(
+        $limiterKey,
+        $maxAttempts = 0,
+        function () use (&$rateLimited, &$limiterKey, $callbackOnSuccess) {
+            isDev() && loggy('Rate limit not reached for '.$limiterKey);
+            $rateLimited = false;
+
+            if ($callbackOnSuccess) {
+                $callbackOnSuccess();
+            }
+        },
+        $decaySeconds,
+    );
+    if (! $executed) {
+        isDev() && loggy('Rate limit reached for '.$limiterKey.'. Rate limiter will be disabled for '.$decaySeconds.' seconds.');
+        $rateLimited = true;
+    }
+
+    return $rateLimited;
+}