tiennm99/coolify
1
0
Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-08-19 00:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sudo): preserve substitutions in backup shell commands (#11329)

Browse Source
This commit is contained in:
Andras Bacsai
2026-08-17 16:23:30 +02:00
committed by GitHub
parent 282227b238
commit c314319a7e
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AGENTS.md
+1
View File
@@ -179,6 +179,7 @@ Coolify seeds **instance-owned** rows at primary key `0`. That value is a sentin
- Run `vendor/bin/pint --dirty --format agent` before finalizing changes
- Every change must have tests — write or update tests, then run them. For bug fixes, follow TDD: write a failing test first, then fix the bug (see Test Enforcement below)
- Check sibling files for conventions before creating new files
- When adding remote shell commands, account for servers using non-root SSH users: commands pass through `parseCommandsByLineForSudo()`, so test pipelines, redirects, substitutions, and `sh -c`/`bash -c` scripts with the non-root sudo parser.
## Git Workflow
bootstrap/helpers/sudo.php
+1
View File
@@ -95,6 +95,7 @@ function parseCommandsByLineForSudo(Collection $commands, Server $server): array
$isComplexPipeCommand = (
$line->contains(' | sh') ||
$line->contains(' | bash') ||
$line->contains(' sh -c ') ||
($line->contains(' | ') && ($line->contains('||') || $line->contains('&&')))
);
tests/Unit/ParseCommandsByLineForSudoTest.php
+18
View File
@@ -24,6 +24,24 @@ test('wraps complex Docker install command with pipes in bash -c', function () {
expect($result[0])->toBe("sudo bash -c 'curl https://releases.rancher.com/install-docker/27.3.sh | sh || curl https://get.docker.com | sh'");
});
test('preserves command substitutions inside database and volume backup scripts', function () {
$script = 'compressor=$(if command -v pigz; then printf pigz; else printf gzip; fi); exec $compressor';
$command = 'docker exec database pg_dumpall | docker run --rm -i helper sh -c '.escapeshellarg($script);
$volumeCommand = 'docker run --rm helper sh -c '.escapeshellarg($script).' > /data/coolify/backups/volume.tar.gz';
$result = parseCommandsByLineForSudo(collect([$command, $volumeCommand]), $this->server);
expect($result[0])
->toStartWith("sudo bash -c '")
->toContain('compressor=$(if command -v pigz; then')
->not->toContain('$(sudo if')
->not->toContain('| sudo docker run')
->and($result[1])
->toStartWith("sudo bash -c '")
->toContain('compressor=$(if command -v pigz; then')
->not->toContain('$(sudo if');
});
test('wraps complex Docker install command with multiple fallbacks', function () {
$commands = collect([
'curl --max-time 300 https://releases.rancher.com/install-docker/27.3.sh | sh || curl https://get.docker.com | sh -s -- --version 27.3',