X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/57bf76a0e1d766bc90afcb8a748c5e25e7aa6f08..504922ffbecd42eed01dfb9da6bbf2c7aae9a094:/lib/cmd.php?ds=sidebyside diff --git a/lib/cmd.php b/lib/cmd.php index 9efe5653..5a12f99a 100644 --- a/lib/cmd.php +++ b/lib/cmd.php @@ -1,5 +1,6 @@ getMessage(), $oSql->userinfo); - } - - return $oSql; -} - function info($sMsg) { echo date('Y-m-d H:i:s == ').$sMsg."\n"; @@ -155,36 +147,43 @@ function repeatWarnings() function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreErrors = false) { // Convert database DSN to psql parameters - $aDSNInfo = DB::parseDSN(CONST_Database_DSN); + $aDSNInfo = \Nominatim\DB::parseDSN(getSetting('DATABASE_DSN')); if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; - $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database']; + + $oCmd = new \Nominatim\Shell('psql'); + $oCmd->addParams('--port', $aDSNInfo['port']); + $oCmd->addParams('--dbname', $aDSNInfo['database']); if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { - $sCMD .= ' -h ' . $aDSNInfo['hostspec']; + $oCmd->addParams('--host', $aDSNInfo['hostspec']); } if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { - $sCMD .= ' -U ' . $aDSNInfo['username']; + $oCmd->addParams('--username', $aDSNInfo['username']); } - $aProcEnv = null; - if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { - $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); + if (isset($aDSNInfo['password'])) { + $oCmd->addEnvPair('PGPASSWORD', $aDSNInfo['password']); } if (!$bVerbose) { - $sCMD .= ' -q'; + $oCmd->addParams('--quiet'); } if ($bfatal && !$bIgnoreErrors) { - $sCMD .= ' -v ON_ERROR_STOP=1'; + $oCmd->addParams('-v', 'ON_ERROR_STOP=1'); } + $aDescriptors = array( 0 => array('pipe', 'r'), 1 => STDOUT, 2 => STDERR ); $ahPipes = null; - $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes, null, $aProcEnv); + $hProcess = @proc_open($oCmd->escapedCmd(), $aDescriptors, $ahPipes, null, $oCmd->aEnv); if (!is_resource($hProcess)) { fail('unable to start pgsql'); } + if (!$bVerbose) { + fwrite($ahPipes[0], 'set client_min_messages to WARNING;'); + } + while (strlen($sScript)) { $iWritten = fwrite($ahPipes[0], $sScript); if ($iWritten <= 0) break; @@ -197,22 +196,29 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError } } - -function runWithEnv($sCmd, $aEnv) +function setupHTTPProxy() { - $aFDs = array( - 0 => array('pipe', 'r'), - 1 => STDOUT, - 2 => STDERR - ); - $aPipes = null; - $hProc = @proc_open($sCmd, $aFDs, $aPipes, null, $aEnv); - if (!is_resource($hProc)) { - fail('unable to run command:' . $sCmd); + if (!getSettingBool('HTTP_PROXY')) { + return; + } + + $sProxy = 'tcp://'.getSetting('HTTP_PROXY_HOST').':'.getSetting('HTTP_PROXY_PROT'); + $aHeaders = array(); + + $sLogin = getSetting('HTTP_PROXY_LOGIN'); + $sPassword = getSetting('HTTP_PROXY_PASSWORD'); + + if ($sLogin && $sPassword) { + $sAuth = base64_encode($sLogin.':'.$sPassword); + $aHeaders = array('Proxy-Authorization: Basic '.$sAuth); } - fclose($aPipes[0]); // no stdin + $aProxyHeader = array( + 'proxy' => $sProxy, + 'request_fulluri' => true, + 'header' => $aHeaders + ); - $iStat = proc_close($hProc); - return $iStat; + $aContext = array('http' => $aProxyHeader, 'https' => $aProxyHeader); + stream_context_set_default($aContext); }