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.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(terminal): preserve PATH for SSH proxy commands (#11638)
Andras Bacsaibf874029d81a
diff --git a/config/constants.php b/config/constants.phpindex bdcd5d7c9d..1e6d40b7b6 100644--- a/config/constants.php+++ b/config/constants.php@@ -4,7 +4,7 @@ return ['coolify' => ['version' => env('COOLIFY_VERSION') ?: '4.3.18','helper_version' => '1.0.16',- 'realtime_version' => '1.0.18',+ 'realtime_version' => '1.0.19','railpack_version' => '0.23.0','self_hosted' => env('SELF_HOSTED', true),'autoupdate' => env('AUTOUPDATE'),diff --git a/docker-compose.prod.yml b/docker-compose.prod.ymlindex ebf12379d5..d611fc69f7 100644--- a/docker-compose.prod.yml+++ b/docker-compose.prod.yml@@ -62,7 +62,7 @@ services:retries: 10timeout: 2ssoketi:- image: '${REGISTRY_URL:-docker.io}/coollabsio/coolify-realtime:1.0.18'+ image: '${REGISTRY_URL:-docker.io}/coollabsio/coolify-realtime:1.0.19'ports:- "${SOKETI_PORT:-6001}:6001"- "6002:6002"diff --git a/docker-compose.windows.yml b/docker-compose.windows.ymlindex cc266e5562..6a52a0126a 100644--- a/docker-compose.windows.yml+++ b/docker-compose.windows.yml@@ -97,7 +97,7 @@ services:retries: 10timeout: 2ssoketi:- image: 'ghcr.io/coollabsio/coolify-realtime:1.0.18'+ image: 'ghcr.io/coollabsio/coolify-realtime:1.0.19'pull_policy: alwayscontainer_name: coolify-realtimerestart: alwaysdiff --git a/docker/coolify-realtime/terminal-server.js b/docker/coolify-realtime/terminal-server.jsindex b72574c8d0..09f5bd5e12 100755--- a/docker/coolify-realtime/terminal-server.js+++ b/docker/coolify-realtime/terminal-server.js@@ -8,6 +8,7 @@ import {extractSshArgs,extractTargetHost,extractTimeout,+ getTerminalProcessEnv,getTerminalSessionTimeout,isAuthorizedTargetHost,sanitizeSshArgs,@@ -401,7 +402,7 @@ async function handleCommand(ws, command, userId) {cols: 80,rows: 30,cwd: process.env.HOME,- env: {},+ env: getTerminalProcessEnv(),};// NOTE: - Initiates a process within the Terminal containerdiff --git a/docker/coolify-realtime/terminal-utils.js b/docker/coolify-realtime/terminal-utils.jsindex 4e86dc1f73..0d13dc18f1 100644--- a/docker/coolify-realtime/terminal-utils.js+++ b/docker/coolify-realtime/terminal-utils.js@@ -1,5 +1,13 @@export const MAX_TERMINAL_SESSION_TIMEOUT_SECONDS = 8 * 60 * 60;+const DEFAULT_TERMINAL_PATH = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';++export function getTerminalProcessEnv(environment = process.env) {+ return {+ PATH: environment.PATH || DEFAULT_TERMINAL_PATH,+ };+}+export function getTerminalSessionTimeout() {return MAX_TERMINAL_SESSION_TIMEOUT_SECONDS;}diff --git a/docker/coolify-realtime/terminal-utils.test.js b/docker/coolify-realtime/terminal-utils.test.jsindex 5ca0be8304..21625eece4 100644--- a/docker/coolify-realtime/terminal-utils.test.js+++ b/docker/coolify-realtime/terminal-utils.test.js@@ -4,6 +4,7 @@ import {MAX_TERMINAL_SESSION_TIMEOUT_SECONDS,extractSshArgs,extractTargetHost,+ getTerminalProcessEnv,getTerminalSessionTimeout,isAuthorizedTargetHost,normalizeHostForAuthorization,@@ -11,6 +12,32 @@ import {validateSshArgs,} from './terminal-utils.js';+test('getTerminalProcessEnv preserves the PATH needed by SSH proxy commands', () => {+ assert.deepEqual(getTerminalProcessEnv({+ PATH: '/usr/local/bin:/usr/bin:/bin',+ APP_KEY: 'must-not-be-inherited',+ }), {+ PATH: '/usr/local/bin:/usr/bin:/bin',+ });+});++test('getTerminalProcessEnv uses the default PATH when PATH is absent', () => {+ assert.deepEqual(getTerminalProcessEnv({+ APP_KEY: 'must-not-be-inherited',+ }), {+ PATH: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',+ });+});++test('getTerminalProcessEnv uses the default PATH when PATH is empty', () => {+ assert.deepEqual(getTerminalProcessEnv({+ PATH: '',+ APP_KEY: 'must-not-be-inherited',+ }), {+ PATH: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',+ });+});+test('extractTargetHost normalizes quoted IPv4 hosts from generated ssh commands', () => {const sshArgs = extractSshArgs("timeout 3600 ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -o ServerAliveInterval=20 -o ConnectTimeout=10 'root'@'10.0.0.5' 'bash -se' << \\\\$abc\necho hi\nabc"