mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-22 18:19:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: allow ';' (semicolon) character in Docker variables

Browse Source
This commit is contained in:
Eric Schultz
2016-08-22 06:44:07 -05:00
parent bdbe2d7721
commit c100570505
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.docker.manager/include/Exec.php
+28 -30
View File
@@ -12,37 +12,35 @@
?>
<?
if ( isset( $_GET['cmd'] )) {
$commands = urldecode(($_GET['cmd']));
$descriptorspec = array(
0 => array("pipe", "r"), // stdin is a pipe that the child will read from
1 => array("pipe", "w"), // stdout is a pipe that the child will write to
2 => array("pipe", "w") // stderr is a pipe that the child will write to
);
$command = urldecode(($_GET['cmd']));
$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
2 => ["pipe", "w"] // stderr is a pipe that the child will write to
];
foreach (explode(';', $commands) as $command){
$parts = explode(" ", $command);
$command = escapeshellcmd(realpath($_SERVER['DOCUMENT_ROOT'].array_shift($parts)));
if (!$command) continue;
$command .= " ".implode(" ", $parts); // should add 'escapeshellarg' here, but this requires changes in all the original arguments
$id = mt_rand();
$output = array();
echo "<p class=\"logLine\" id=\"logBody\"></p>";
echo "<script>addLog('<fieldset style=\"margin-top:1px;\" class=\"CMD\"><legend>Command:</legend>";
echo "root@localhost:# {$command}<br>";
echo "<span id=\"wait{$id}\">Please wait </span>";
echo "<p class=\"logLine\" id=\"logBody\"></p></fieldset>');</script>";
echo "<script>show_Wait({$id});</script>";
$proc = proc_open($command." 2>&1", $descriptorspec, $pipes, '/', array());
while ($out = fgets( $pipes[1] )) {
$out = preg_replace("%[\t\n\x0B\f\r]+%", '', $out );
@flush();
echo "<script>addLog(\"" . htmlentities($out) . "\");</script>\n";
@flush();
}
$retval = proc_close($proc);
echo "<script>stop_Wait($id);</script>\n";
$out = $retval ? "The command failed." : "The command finished successfully!";
echo "<script>addLog('<br><b>".$out. "</b>');</script>";
$parts = explode(" ", $command);
$command = escapeshellcmd(realpath($_SERVER['DOCUMENT_ROOT'].array_shift($parts)));
if (!$command) return;
$command .= " ".implode(" ", $parts); // should add 'escapeshellarg' here, but this requires changes in all the original arguments
$id = mt_rand();
echo "<p class=\"logLine\" id=\"logBody\"></p>";
echo "<script>addLog('<fieldset style=\"margin-top:1px;\" class=\"CMD\"><legend>Command:</legend>";
echo "root@localhost:# ".addslashes($command)."<br>";
echo "<span id=\"wait{$id}\">Please wait </span>";
echo "<p class=\"logLine\" id=\"logBody\"></p></fieldset>');</script>";
echo "<script>show_Wait({$id});</script>";
@flush();
$proc = proc_open($command." 2>&1", $descriptorspec, $pipes, '/', array());
while ($out = fgets( $pipes[1] )) {
$out = preg_replace("%[\t\n\x0B\f\r]+%", '', $out );
@flush();
echo "<script>addLog(\"" . htmlentities($out) . "\");</script>\n";
@flush();
}
$retval = proc_close($proc);
echo "<script>stop_Wait($id);</script>\n";
$out = $retval ? "The command failed." : "The command finished successfully!";
echo "<script>addLog('<br><b>".$out. "</b>');</script>";
}
?>