Merge pull request #297 from Squidly271/patch-1

Plug Security Hole In Docker Template PostArgs
This commit is contained in:
tom mortensen
2018-03-16 22:26:07 -07:00
committed by GitHub

View File

@@ -422,6 +422,7 @@ function xmlToCommand($xml, $create_paths=false) {
$Devices[] = escapeshellarg($hostConfig);
}
}
$postArgs = explode(";",$xml['PostArgs']);
$cmd = sprintf($docroot.'/plugins/dynamix.docker.manager/scripts/docker create %s %s %s %s %s %s %s %s %s %s %s',
$cmdName,
$cmdNetwork,
@@ -433,7 +434,7 @@ function xmlToCommand($xml, $create_paths=false) {
implode(' --device=', $Devices),
$xml['ExtraParams'],
escapeshellarg($xml['Repository']),
$xml['PostArgs']);
$postArgs[0]);
$cmd = trim(preg_replace('/\s+/', ' ', $cmd));
return [$cmd, $xml['Name'], $xml['Repository']];
@@ -441,7 +442,7 @@ function xmlToCommand($xml, $create_paths=false) {
function execCommand($command) {
// $command should have all its args already properly run through 'escapeshellarg'
$descriptorspec = [
0 => ["pipe", "r"], // stdin is a pipe that the child will read from
1 => ["pipe", "w"], // stdout is a pipe that the child will write to