Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

Merge remote-tracking branch 'origin/next' into audit-policies

Andras Bacsai9dca7ca3512d
diff --cc app/Livewire/Boarding/Index.php
index b16f1abde5,2d0ae939d0..d57c069526
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@@ -8,7 -8,7 +8,8 @@@ use App\Models\Project
use App\Models\Server;
use App\Models\Team;
use App\Services\ConfigurationRepository;
+ use App\Support\ValidationPatterns;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Support\Collection;
use Livewire\Attributes\Url;
use Livewire\Component;
@@@ -281,19 -292,8 +299,14 @@@ class Index extends Componen
public function saveServer()
{
- $this->validate([
- 'remoteServerName' => 'required|string',
- 'remoteServerHost' => 'required|string',
- 'remoteServerPort' => 'required|integer',
- 'remoteServerUser' => 'required|string',
- ]);
+ $this->validate();
+ try {
+ $this->authorize('create', Server::class);
+ } catch (\Throwable $e) {
+ return handleError($e, $this);
+ }
+
$this->privateKey = formatPrivateKey($this->privateKey);
$foundServer = Server::whereIp($this->remoteServerHost)->first();
if ($foundServer) {
diff --cc app/Livewire/Project/Shared/EnvironmentVariable/All.php
index f5f0f32e6e,a19837e169..3a5145023c
--- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
@@@ -88,23 -111,27 +111,41 @@@ class All extends Componen
$query->orderBy('order');
}
- return $query->get();
+ return $this->nullLockedValues($query->get());
}
+ private function searchTerm(): string
+ {
+ return trim($this->search);
+ }
+
+ public function getHasEnvironmentVariablesProperty(): bool
+ {
+ return $this->environmentVariables->isNotEmpty() ||
+ $this->environmentVariablesPreview->isNotEmpty() ||
+ $this->hardcodedEnvironmentVariables->isNotEmpty() ||
+ $this->hardcodedEnvironmentVariablesPreview->isNotEmpty();
+ }
+
+ private function nullLockedValues($envs)
+ {
+ $isMember = auth()->user()?->isMember();
+
+ $envs->each(function ($env) use ($isMember) {
+ if ($env->is_shown_once || $isMember) {
+ $env->value = null;
+ $env->real_value = null;
+ }
+ });
+
+ return $envs;
+ }
+
+ public function getIsSearchActiveProperty(): bool
+ {
+ return $this->searchTerm() !== '';
+ }
+
public function getHardcodedEnvironmentVariablesProperty()
{
return $this->getHardcodedVariables(false);
diff --cc bootstrap/helpers/remoteProcess.php
index 60427377b8,3a516378f8..0f3a7c4dd3
--- a/bootstrap/helpers/remoteProcess.php
+++ b/bootstrap/helpers/remoteProcess.php
@@@ -200,12 -200,8 +200,13 @@@ function decode_remote_command_output(?
}
$application = Application::find(data_get($application_deployment_queue, 'application_id'));
$is_debug_enabled = data_get($application, 'settings.is_debug_enabled');
+ $serverTimezone = getServerTimezone(data_get($application, 'destination.server'));
+ // Members should never see debug logs, even if an admin enabled debug mode
+ if ($is_debug_enabled && auth()->check() && auth()->user()->isMember()) {
+ $is_debug_enabled = false;
+ }
+
$logs = data_get($application_deployment_queue, 'logs');
if (empty($logs)) {
return collect([]);
diff --cc database/migrations/2026_05_29_000000_encrypt_application_deployment_configuration_columns.php
index 0000000000,123fd226dd..95500cfef5
mode 000000,100644..100644
--- a/database/migrations/2026_05_29_000000_encrypt_application_deployment_configuration_columns.php
+++ b/database/migrations/2026_05_29_000000_encrypt_application_deployment_configuration_columns.php
@@@ -1,0 -1,23 +1,31 @@@
+ <?php
+
+ use Illuminate\Database\Migrations\Migration;
+ use Illuminate\Support\Facades\DB;
+
+ return new class extends Migration
+ {
+ /**
+ * The configuration snapshot/diff now store an encrypted blob (not valid
+ * JSON), so the columns must hold arbitrary text instead of json.
+ */
+ public function up(): void
+ {
++ if (DB::getDriverName() === 'sqlite') {
++ return;
++ }
++
+ DB::statement('ALTER TABLE application_deployment_queues ALTER COLUMN configuration_snapshot TYPE text USING configuration_snapshot::text');
+ DB::statement('ALTER TABLE application_deployment_queues ALTER COLUMN configuration_diff TYPE text USING configuration_diff::text');
+ }
+
+ public function down(): void
+ {
++ if (DB::getDriverName() === 'sqlite') {
++ return;
++ }
++
+ DB::statement('ALTER TABLE application_deployment_queues ALTER COLUMN configuration_snapshot TYPE json USING configuration_snapshot::json');
+ DB::statement('ALTER TABLE application_deployment_queues ALTER COLUMN configuration_diff TYPE json USING configuration_diff::json');
+ }
+ };