dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3647 from derpoho/next

Browse Source 
fixes coollabsio#3645, incorrect adding of sudo if non-root user
This commit is contained in:
Andras Bacsai
2024-10-01 10:00:48 +02:00
committed by GitHub
parent cec0d7d1f7 39d2fdc08b
commit 2e10d670be
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bootstrap/helpers/shared.php
View File

@@ -1184,12 +1184,24 @@ function check_domain_usage(ServiceApplication|Application|null $resource = null
function parseCommandsByLineForSudo(Collection $commands, Server $server): array function parseCommandsByLineForSudo(Collection $commands, Server $server): array
{ {
$commands = $commands->map(function ($line) { $commands = $commands->map(function ($line) {
if (! str($line)->startsWith('cd') && ! str($line)->startsWith('command') && ! str($line)->startsWith('echo') && ! str($line)->startsWith('true')) { if (! str(trim($line))->startsWith([
'cd',
'command',
'echo',
'true',
'if',
'fi',
])) {
return "sudo $line"; return "sudo $line";
} }
if (str(trim($line))->startsWith('if')) {
return str_replace('if', 'if sudo', $line);
}
return $line; return $line;
}); });
$commands = $commands->map(function ($line) use ($server) { $commands = $commands->map(function ($line) use ($server) {
if (Str::startsWith($line, 'sudo mkdir -p')) { if (Str::startsWith($line, 'sudo mkdir -p')) {
return "$line && sudo chown -R $server->user:$server->user ".Str::after($line, 'sudo mkdir -p').' && sudo chmod -R o-rwx '.Str::after($line, 'sudo mkdir -p'); return "$line && sudo chown -R $server->user:$server->user ".Str::after($line, 'sudo mkdir -p').' && sudo chmod -R o-rwx '.Str::after($line, 'sudo mkdir -p');
@@ -1197,6 +1209,7 @@ function parseCommandsByLineForSudo(Collection $commands, Server $server): array
return $line; return $line;
}); });
$commands = $commands->map(function ($line) { $commands = $commands->map(function ($line) {
$line = str($line); $line = str($line);
if (str($line)->contains('$(')) { if (str($line)->contains('$(')) {