X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fshell%2FCommand.php;h=1816c5aed175b37072754fe8c20f935fa107d792;hp=cefe57376213915cf02374adea674ed4843ca4be;hb=c3bbadcc8315eb3ff26bf07243a4989f8ec260be;hpb=63752d25bfc28159f5f9b6a2e9a6a6d784959fd0 diff --git a/includes/shell/Command.php b/includes/shell/Command.php index cefe573762..1816c5aed1 100644 --- a/includes/shell/Command.php +++ b/includes/shell/Command.php @@ -63,7 +63,7 @@ class Command { private $everExecuted = false; /** @var string|false */ - private $cGroup = false; + private $cgroup = false; /** * Constructor. Don't call directly, instead use Shell::command() @@ -83,12 +83,14 @@ class Command { */ public function __destruct() { if ( !$this->everExecuted ) { + $context = [ 'command' => $this->command ]; $message = __CLASS__ . " was instantiated, but execute() was never called."; if ( $this->method ) { - $message .= " Calling method: {$this->method}."; + $message .= ' Calling method: {method}.'; + $context['method'] = $this->method; } - $message .= " Command: {$this->command}"; - trigger_error( $message, E_USER_NOTICE ); + $message .= ' Command: {command}'; + $this->logger->warning( $message, $context ); } } @@ -131,10 +133,16 @@ class Command { /** * Sets execution limits * - * @param array $limits Optional array with limits(filesize, memory, time, walltime). + * @param array $limits Associative array of limits. Keys (all optional): + * filesize (for ulimit -f), memory, time, walltime. * @return $this */ public function limits( array $limits ) { + if ( !isset( $limits['walltime'] ) && isset( $limits['time'] ) ) { + // Emulate the behavior of old wfShellExec() where walltime fell back on time + // if the latter was overridden and the former wasn't + $limits['walltime'] = $limits['time']; + } $this->limits = $limits + $this->limits; return $this; @@ -180,29 +188,22 @@ class Command { /** * Sets cgroup for this command * - * @param string|false $cgroup + * @param string|false $cgroup Absolute file path to the cgroup, or false to not use a cgroup * @return $this */ public function cgroup( $cgroup ) { - $this->cGroup = $cgroup; + $this->cgroup = $cgroup; return $this; } /** - * Executes command. Afterwards, getExitCode() and getOutput() can be used to access execution - * results. + * String together all the options and build the final command + * to execute * - * @return Result - * @throws Exception - * @throws ProcOpenError - * @throws ShellDisabledError + * @return array [ command, whether to use log pipe ] */ - public function execute() { - $this->everExecuted = true; - - $profileMethod = $this->method ?: wfGetCaller(); - + protected function buildFinalCommand() { $envcmd = ''; foreach ( $this->env as $k => $v ) { if ( wfIsWindows() ) { @@ -221,37 +222,54 @@ class Command { } } + $useLogPipe = false; $cmd = $envcmd . trim( $this->command ); - $useLogPipe = false; if ( is_executable( '/bin/bash' ) ) { $time = intval( $this->limits['time'] ); $wallTime = intval( $this->limits['walltime'] ); - // for b/c, wall time falls back to time - $wallTime = min( $time, $wallTime ); $mem = intval( $this->limits['memory'] ); $filesize = intval( $this->limits['filesize'] ); if ( $time > 0 || $mem > 0 || $filesize > 0 || $wallTime > 0 ) { $cmd = '/bin/bash ' . escapeshellarg( __DIR__ . '/limit.sh' ) . ' ' . - escapeshellarg( $cmd ) . ' ' . - escapeshellarg( - "MW_INCLUDE_STDERR=" . ( $this->useStderr ? '1' : '' ) . ';' . - "MW_CPU_LIMIT=$time; " . - 'MW_CGROUP=' . escapeshellarg( $this->cGroup ) . '; ' . - "MW_MEM_LIMIT=$mem; " . - "MW_FILE_SIZE_LIMIT=$filesize; " . - "MW_WALL_CLOCK_LIMIT=$wallTime; " . - "MW_USE_LOG_PIPE=yes" - ); + escapeshellarg( $cmd ) . ' ' . + escapeshellarg( + "MW_INCLUDE_STDERR=" . ( $this->useStderr ? '1' : '' ) . ';' . + "MW_CPU_LIMIT=$time; " . + 'MW_CGROUP=' . escapeshellarg( $this->cgroup ) . '; ' . + "MW_MEM_LIMIT=$mem; " . + "MW_FILE_SIZE_LIMIT=$filesize; " . + "MW_WALL_CLOCK_LIMIT=$wallTime; " . + "MW_USE_LOG_PIPE=yes" + ); $useLogPipe = true; - } elseif ( $this->useStderr ) { - $cmd .= ' 2>&1'; } - } elseif ( $this->useStderr ) { + } + if ( !$useLogPipe && $this->useStderr ) { $cmd .= ' 2>&1'; } - wfDebug( __METHOD__ . ": $cmd\n" ); + + return [ $cmd, $useLogPipe ]; + } + + /** + * Executes command. Afterwards, getExitCode() and getOutput() can be used to access execution + * results. + * + * @return Result + * @throws Exception + * @throws ProcOpenError + * @throws ShellDisabledError + */ + public function execute() { + $this->everExecuted = true; + + $profileMethod = $this->method ?: wfGetCaller(); + + list( $cmd, $useLogPipe ) = $this->buildFinalCommand(); + + $this->logger->debug( __METHOD__ . ": $cmd" ); // Don't try to execute commands that exceed Linux's MAX_ARG_STRLEN. // Other platforms may be more accomodating, but we don't want to be @@ -259,13 +277,13 @@ class Command { // input. See T129506. if ( strlen( $cmd ) > SHELL_MAX_ARG_STRLEN ) { throw new Exception( __METHOD__ . - '(): total length of $cmd must not exceed SHELL_MAX_ARG_STRLEN' ); + '(): total length of $cmd must not exceed SHELL_MAX_ARG_STRLEN' ); } $desc = [ 0 => [ 'file', 'php://stdin', 'r' ], 1 => [ 'pipe', 'w' ], - 2 => [ 'file', 'php://stderr', 'w' ], + 2 => [ 'pipe', 'w' ], ]; if ( $useLogPipe ) { $desc[3] = [ 'pipe', 'w' ]; @@ -278,6 +296,7 @@ class Command { throw new ProcOpenError(); } $outBuffer = $logBuffer = ''; + $errBuffer = null; $emptyArray = []; $status = false; $logMsg = false; @@ -313,12 +332,20 @@ class Command { $readyPipes = $pipes; - // Clear last error + // clear get_last_error without actually raising an error + // from http://php.net/manual/en/function.error-get-last.php#113518 + // TODO replace with clear_last_error when requirements are bumped to PHP7 + set_error_handler( function () { + }, 0 ); // @codingStandardsIgnoreStart Generic.PHP.NoSilencedErrors.Discouraged @trigger_error( '' ); + // @codingStandardsIgnoreEnd + restore_error_handler(); + + // @codingStandardsIgnoreStart Generic.PHP.NoSilencedErrors.Discouraged $numReadyPipes = @stream_select( $readyPipes, $emptyArray, $emptyArray, $timeout ); + // @codingStandardsIgnoreEnd if ( $numReadyPipes === false ) { - // @codingStandardsIgnoreEnd $error = error_get_last(); if ( strncmp( $error['message'], $eintrMessage, strlen( $eintrMessage ) ) == 0 ) { continue; @@ -344,6 +371,9 @@ class Command { } elseif ( $fd == 1 ) { // From stdout $outBuffer .= $block; + } elseif ( $fd == 2 ) { + // From stderr + $errBuffer .= $block; } elseif ( $fd == 3 ) { // From log FD $logBuffer .= $block; @@ -394,6 +424,6 @@ class Command { $this->logger->warning( "$logMsg: {command}", [ 'command' => $cmd ] ); } - return new Result( $retval, $outBuffer ); + return new Result( $retval, $outBuffer, $errBuffer ); } }