Skip to content

[stable20] Use proc_open to run system commands in bridge manager #4774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Dec 16, 2020
Merged

[stable20] Use proc_open to run system commands in bridge manager #4774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 61 additions & 20 deletions lib/MatterbridgeManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,16 +663,15 @@ private function sendSystemMessage(Room $room, string $userId, string $message):
*/
private function launchMatterbridge(Room $room): int {
$binaryPath = $this->config->getAppValue('spreed', 'matterbridge_binary');
// TODO this should be in appdata
$configPath = sprintf('/tmp/bridge-%s.toml', $room->getToken());
$outputPath = sprintf('/tmp/bridge-%s.log', $room->getToken());
$cmd = sprintf('%s -conf %s', $binaryPath, $configPath);
$pid = exec(sprintf('nice -n19 %s > %s 2>&1 & echo $!', $cmd, $outputPath), $output, $ret);
$pid = (int) $pid;
if ($ret !== 0) {
$pid = 0;
$matterbridgeCmd = sprintf('%s -conf %s', $binaryPath, $configPath);
$cmd = sprintf('nice -n19 %s > %s 2>&1 & echo $!', $matterbridgeCmd, $outputPath);
$cmdResult = $this->runCommand($cmd);
if (!is_null($cmdResult) && $cmdResult['return_code'] === 0 && is_numeric($cmdResult['stdout'] ?? 0)) {
return (int) $cmdResult['stdout'];
}
return $pid;
return 0;
}

/**
Expand All @@ -681,11 +680,19 @@ private function launchMatterbridge(Room $room): int {
*/
public function killZombieBridges(bool $killAll = false): void {
// get list of running matterbridge processes
$cmd = 'ps x -o user,pid,args | grep "matterbridge" | grep -v grep | awk \'{print $2}\'';
exec($cmd, $output, $ret);
$runningPidList = [];
foreach ($output as $o) {
$runningPidList[] = (int) $o;
$cmd = 'ps x -o user,pid,args';
$cmdResult = $this->runCommand($cmd);
if ($cmdResult && $cmdResult['return_code'] === 0) {
$lines = explode("\n", $cmdResult['stdout']);
foreach ($lines as $l) {
if (preg_match('/matterbridge/i', $l)) {
$items = preg_split('/\s+/', $l);
if (count($items) > 1 && is_numeric($items[1])) {
$runningPidList[] = (int) $items[1];
}
}
}
}

if (empty($runningPidList)) {
Expand Down Expand Up @@ -729,10 +736,11 @@ public function killZombieBridges(bool $killAll = false): void {
*/
private function killPid(int $pid): bool {
// kill
exec(sprintf('kill -9 %d', $pid), $output, $ret);
$cmdResult = $this->runCommand(sprintf('kill -9 %d', $pid));

// check the process is gone
$isStillRunning = $this->isRunning($pid);
return (int) $ret === 0 && !$isStillRunning;
return !is_null($cmdResult) && $cmdResult['return_code'] === 0 && !$isStillRunning;
}

/**
Expand All @@ -743,15 +751,49 @@ private function killPid(int $pid): bool {
*/
private function isRunning(int $pid): bool {
try {
$result = shell_exec(sprintf('ps x -o user,pid,args | awk \'{print $2}\' | grep "^%d$" | wc -l', $pid));
if ((int) $result > 0) {
return true;
$cmd = 'ps x -o user,pid,args';
$cmdResult = $this->runCommand($cmd);
if ($cmdResult && $cmdResult['return_code'] === 0) {
$lines = explode("\n", $cmdResult['stdout']);
foreach ($lines as $l) {
$items = preg_split('/\s+/', $l);
if (count($items) > 1 && is_numeric($items[1])) {
$lPid = (int) $items[1];
if ($lPid === $pid) {
return true;
}
}
}
}
} catch (\Exception $e) {
}
return false;
}

/**
* Launch a command, wait until it ends and return outputs and return code
*
* @param string $cmd command string
* @return ?array outputs and return code, null if process launch failed
*/
private function runCommand(string $cmd): ?array {
$descriptorspec = [fopen('php://stdin', 'r'), ['pipe', 'w'], ['pipe', 'w']];
$process = proc_open($cmd, $descriptorspec, $pipes);
if ($process) {
$output = stream_get_contents($pipes[1]);
$errorOutput = stream_get_contents($pipes[2]);
fclose($pipes[1]);
fclose($pipes[2]);
$returnCode = proc_close($process);
return [
'stdout' => trim($output),
'stderr' => trim($errorOutput),
'return_code' => $returnCode,
];
}
return null;
}

/**
* Stop all bridges
*
Expand Down Expand Up @@ -871,12 +913,11 @@ public function getCurrentVersionFromBinary(): ?string {
}

$cmd = escapeshellcmd($binaryPath) . ' ' . escapeshellarg('-version');
@exec($cmd, $output, $returnCode);

if ($returnCode !== 0) {
$cmdResult = $this->runCommand($cmd);
if (is_null($cmdResult) || $cmdResult['return_code'] !== 0) {
return null;
}

return trim(implode("\n", $output));
return $cmdResult['stdout'] ?? null;
}
}