X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fglobal.php;h=2903511a7e6b7f8d64ec8c244f916bb6b6083593;hb=1f270d3ccac30fd2e794923ff9aa0e0f07f59772;hp=a263d6d047c86cf304ec8d068b3cbd2aa7891b00;hpb=9c0f17803c3f70bbababb6bd94efecd528e7f792;p=squirrelmail.git diff --git a/functions/global.php b/functions/global.php index a263d6d0..2903511a 100644 --- a/functions/global.php +++ b/functions/global.php @@ -93,9 +93,7 @@ function sqsession_register ($var, $name) { sqsession_is_active(); - $_SESSION["$name"] = $var; - - session_register("$name"); + $_SESSION[$name] = $var; } /** @@ -138,8 +136,8 @@ function sqsession_is_registered ($name) { * input we should retrieve. An example is if we have: * - * - * + * + * * and we want to know which one of the select inputs should be * returned as $startMessage (without the suffix!), this function * decides by looking for either "form_submit_1" or "form_submit_2" @@ -326,7 +324,7 @@ function sqsession_destroy() { * merging of sessions. */ - global $base_uri; + global $base_uri, $_COOKIE, $_SESSION; if (isset($_COOKIE[session_name()]) && session_name()) sqsetcookie(session_name(), '', 0, $base_uri); if (isset($_COOKIE['username']) && $_COOKIE['username']) sqsetcookie('username','',0,$base_uri); @@ -344,23 +342,30 @@ function sqsession_destroy() { * start a session up. php.net doesn't tell you that $_SESSION * (even though autoglobal), is not created unless a session is * started, unlike $_POST, $_GET and such + * Update: (see #1685031) the session ID is left over after the + * session is closed in some PHP setups; this function just becomes + * a passthru to sqsession_start(), but leaving old code in for + * edification. */ function sqsession_is_active() { - $sessid = session_id(); - if ( empty( $sessid ) ) { + //$sessid = session_id(); + //if ( empty( $sessid ) ) { sqsession_start(); - } + //} } /** * Function to start the session and store the cookie with the session_id as * HttpOnly cookie which means that the cookie isn't accessible by javascript * (IE6 only) + * Note that as sqsession_is_active() no longer discriminates as to when + * it calls this function, session_start() has to have E_NOTICE suppression + * (thus the @ sign). */ function sqsession_start() { global $base_uri; - session_start(); + @session_start(); $session_id = session_id(); // session_starts sets the sessionid cookie buth without the httponly var @@ -380,7 +385,7 @@ function sqsession_start() { * @param boolean $bHttpOnly Disallow JS to access the cookie (IE6 only) * @return void */ -function sqsetcookie($sName,$sValue="deleted",$iExpire=0,$sPath="",$sDomain="",$bSecure=false,$bHttpOnly=true) { +function sqsetcookie($sName,$sValue='deleted',$iExpire=0,$sPath="",$sDomain="",$bSecure=false,$bHttpOnly=true) { // if we have a secure connection then limit the cookies to https only. if ($sName && isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']) { $bSecure = true; @@ -396,18 +401,18 @@ function sqsetcookie($sName,$sValue="deleted",$iExpire=0,$sPath="",$sDomain="",$ // broken we use the header function for php 5.2 as well. We might change that later. //setcookie($sName,$sValue,(int) $iExpire,$sPath,$sDomain,$bSecure,$bHttpOnly); } else { - if (!empty($Domain)) { + if (!empty($sDomain)) { // Fix the domain to accept domains with and without 'www.'. - if (strtolower(substr($Domain, 0, 4)) == 'www.') $Domain = substr($Domain, 4); - $Domain = '.' . $Domain; + if (strtolower(substr($sDomain, 0, 4)) == 'www.') $sDomain = substr($sDomain, 4); + $sDomain = '.' . $sDomain; // Remove port information. - $Port = strpos($Domain, ':'); - if ($Port !== false) $Domain = substr($Domain, 0, $Port); + $Port = strpos($sDomain, ':'); + if ($Port !== false) $sDomain = substr($sDomain, 0, $Port); } if (!$sValue) $sValue = 'deleted'; header('Set-Cookie: ' . rawurlencode($sName) . '=' . rawurlencode($sValue) - . (empty($iExpires) ? '' : '; expires=' . gmdate('D, d-M-Y H:i:s', $iExpires) . ' GMT') + . (empty($iExpire) ? '' : '; expires=' . gmdate('D, d-M-Y H:i:s', $iExpire) . ' GMT') . (empty($sPath) ? '' : '; path=' . $sPath) . (empty($sDomain) ? '' : '; domain=' . $sDomain) . (!$bSecure ? '' : '; secure') @@ -503,8 +508,11 @@ FIXME: do we WANT to throw an error or a notice or... or return FALSE? * * @param string $directory_path The path (relative or absolute) * to the desired directory. - * @param string $extension The file extension filter (optional; - * default is to return all files (dirs). + * @param mixed $extension The file extension filter - either + * an array of desired extension(s), + * or a comma-separated list of same + * (optional; default is to return + * all files (dirs). * @param boolean $return_filenames_only When TRUE, only file/dir names * are returned, otherwise the * $directory_path string is @@ -529,22 +537,36 @@ FIXME: do we WANT to throw an error or a notice or... or return FALSE? * files or all directories * (optional; default do not * split up return array). - * + * @param boolean $only_sm When TRUE, a security check will + * limit directory access to only + * paths within the SquirrelMail + * installation currently being used + * (optional; default TRUE) * * @return array The requested file/directory list(s). * * @since 1.5.2 * */ -function list_files($directory_path, $extension='', $return_filenames_only=TRUE, +function list_files($directory_path, $extensions='', $return_filenames_only=TRUE, $include_directories=TRUE, $directories_only=FALSE, - $separate_files_and_directories=FALSE) { + $separate_files_and_directories=FALSE, $only_sm=TRUE) { $files = array(); $directories = array(); -//FIXME: do we want to place security restrictions here like only allowing -// directories under SM_PATH? + + // make sure requested path is under SM_PATH if needed + // + if ($only_sm) { + if (strpos(realpath($directory_path), realpath(SM_PATH)) !== 0) { + //plain_error_message(_("Illegal filesystem access was requested")); + echo _("Illegal filesystem access was requested"); + exit; + } + } + + // validate given directory // if (empty($directory_path) @@ -554,7 +576,18 @@ function list_files($directory_path, $extension='', $return_filenames_only=TRUE, } - if (!empty($extension)) $extension = '.' . trim($extension, '.'); + // ensure extensions is an array and is properly formatted + // + if (!empty($extensions)) { + if (!is_array($extensions)) + $extensions = explode(',', $extensions); + $temp_extensions = array(); + foreach ($extensions as $ext) + $temp_extensions[] = '.' . trim(trim($ext), '.'); + $extensions = $temp_extensions; + } else $extensions = array(); + + $directory_path = rtrim($directory_path, '/'); @@ -564,9 +597,10 @@ function list_files($directory_path, $extension='', $return_filenames_only=TRUE, if ($file == '.' || $file == '..') continue; - if (!empty($extension) - && strrpos($file, $extension) !== (strlen($file) - strlen($extension))) - continue; + if (!empty($extensions)) + foreach ($extensions as $ext) + if (strrpos($file, $ext) !== (strlen($file) - strlen($ext))) + continue 2; // only use is_dir() if we really need to (be as efficient as possible) // @@ -642,3 +676,323 @@ function sm_print_r() { } +/** + * SquirrelMail wrapper for popen()/proc_open() + * + * This emulates popen() by using proc_open() if at all + * possible (reverts seamlessly to popen() if proc_open() + * is not supported in current PHP installation). + * + * This is intended for use with the related sq_pclose(), + * sq_get_pipe_stdout() and sq_get_pipe_stderr() functions, + * the latter of which add an easy interface for retrieving + * output from a child process that was opened with traditional + * popen() syntax (in write mode), while not breaking under + * earlier versions of PHP. + * + * @param string $command The command identifying what to + * execute in the child process. + * @param string $mode The desired mode for the + * unidirectional pipe that is returned; + * either 'r' for read or 'w' for write. + * + * @return resource A handle on the desired read or write pipe + * to the child process, or FALSE if the + * process cannot be created. + * + * @since 1.5.2 + * + */ +function sq_popen($command, $mode) { + + $mode = strtolower($mode{0}); + + + if (!function_exists('proc_open')) + return popen($command, $mode); + + + // set up our process store if not done already + // + global $processes; + if (empty($processes)) + $processes = array(); + + + // define read, write and error pipes + // + $descriptors = array(0 => array('pipe', 'r'), + 1 => array('pipe', 'w'), + 2 => array('pipe', 'w')); + + + // start the child process + // + $proc = proc_open($command, $descriptors, $pipes); + if (!is_resource($proc)) + return FALSE; + + + // when in read mode, we'll return a handle to the child's write pipe + // + if ($mode == 'r') + $return_value = $pipes[1]; + else if ($mode == 'w') + $return_value = $pipes[0]; + else + die('sq_popen() expects $mode to be "r" or "w"'); + + + // store the handle to the process and its pipes + // internally, keyed by whatever handle we'll be + // returning + // + $processes[$return_value] = array($proc, $pipes); + + + return $return_value; + +} + + +/** + * Get STDERR output from a child process + * + * This is designed to be used with processes that were + * opened with sq_popen(), and will return any output + * that may be available from STDERR of the child process + * at the current time. + * + * If a value is given for $timeout_seconds, this function + * will wait that long for output in case there is none + * right now. + * + * In PHP environments that do not support proc_open(), + * an empty string will always be returned. + * + * @param resource $handle The handle to the child process, + * as returned from sq_popen(). + * @param int $timeout_seconds The number of seconds to wait + * for output if there is none + * available immediately (OPTIONAL; + * default is not to wait) + * @param boolean $quiet When TRUE, errors are silently + * ignored (OPTIONAL; default is TRUE). + * + * @return string Any STDERR output that may have been found. + * + * @since 1.5.2 + * + */ +function sq_get_pipe_stderr($handle, $timeout_seconds=0, $quiet=TRUE) { + + // yes, we are testing for proc_OPEN + // because we need to know how the + // handle was actually OPENED + // + if (!function_exists('proc_open')) + return ''; + + + // get our process out of the process store + // + global $processes; + if (!is_array($processes) || !isset($processes[$handle])) { + if (!quiet) { + plain_error_message(_("Failed to find corresponding open process handle")); + } + return ''; + } + $proc = $processes[$handle]; + + + // get all we can from stderr, don't wait longer + // than our timeout for input + // + $contents = ''; + $read = array($proc[1][2]); + $write = NULL; + $except = NULL; + if (stream_select($read, $write, $except, $timeout_seconds)) + while (!feof($proc[1][2])) $contents .= fread($proc[1][2], 8192); + return $contents; + +} + + +/** + * Get STDOUT output from a child process + * + * This is designed to be used with processes that were + * opened with sq_popen(), and will return any output + * that may be available from STDOUT of the child process + * at the current time. + * + * If a value is given for $timeout_seconds, this function + * will wait that long for output in case there is none + * right now. + * + * In PHP environments that do not support proc_open(), + * an empty string will always be returned. + * + * @param resource $handle The handle to the child process, + * as returned from sq_popen(). + * @param int $timeout_seconds The number of seconds to wait + * for output if there is none + * available immediately (OPTIONAL; + * default is not to wait) + * @param boolean $quiet When TRUE, errors are silently + * ignored (OPTIONAL; default is TRUE). + * + * @return string Any STDOUT output that may have been found. + * + * @since 1.5.2 + * + */ +function sq_get_pipe_stdout($handle, $timeout_seconds=0, $quiet=TRUE) { + + // yes, we are testing for proc_OPEN + // because we need to know how the + // handle was actually OPENED + // + if (!function_exists('proc_open')) + return ''; + + + // get our process out of the process store + // + global $processes; + if (!is_array($processes) || !isset($processes[$handle])) { + if (!quiet) { + plain_error_message(_("Failed to find corresponding open process handle")); + } + return ''; + } + $proc = $processes[$handle]; + + + // get all we can from stdout, don't wait longer + // than our timeout for input + // + $contents = ''; + $read = array($proc[1][1]); + $write = NULL; + $except = NULL; + if (stream_select($read, $write, $except, $timeout_seconds)) + while (!feof($proc[1][1])) $contents .= fread($proc[1][1], 8192); + return $contents; + +} + + +/** + * SquirrelMail wrapper for pclose()/proc_close() + * + * This is designed to be used with processes that were + * opened with sq_popen(), and will correctly close + * all pipes/handles that were opened as well as the + * child process itself. + * + * @param resource $handle The handle to the child process, + * as returned from sq_popen(). + * @param boolean $quiet When TRUE, errors are silently + * ignored (OPTIONAL; default is TRUE). + * + * @return int The termination status of the child process. + * + * @since 1.5.2 + * + */ +function sq_pclose($handle, $quiet=TRUE) { + + // yes, we are testing for proc_OPEN + // because we need to know how the + // handle was actually OPENED + // + if (!function_exists('proc_open')) + return pclose($handle); + + + // get our process out of the process store + // + global $processes; + if (!is_array($processes) || !isset($processes[$handle])) { + if (!quiet) { + plain_error_message(_("Failed to find corresponding open process handle")); + } + return 127; + } + $proc = $processes[$handle]; + unset($processes[$handle]); + + + // close all pipes + // + fclose($proc[1][0]); + fclose($proc[1][1]); + fclose($proc[1][2]); + + + // close process + // + return proc_close($proc[0]); + +} + + +/** + * Sanitize a value using htmlspecialchars() or similar, but also + * recursively run htmlspecialchars() (or similar) on array keys + * and values. + * + * If $value is not a string or an array with strings in it, + * the value is returned as is. + * + * @param mixed $value The value to be sanitized. + * @param mixed $quote_style Either boolean or an integer. If it + * is an integer, it must be the PHP + * constant indicating if/how to escape + * quotes: ENT_QUOTES, ENT_COMPAT, or + * ENT_NOQUOTES. If it is a boolean value, + * it must be TRUE and thus indicates + * that the only sanitizing to be done + * herein is to replace single and double + * quotes with ' and ", no other + * changes are made to $value. If it is + * boolean and FALSE, behavior reverts + * to same as if the value was ENT_QUOTES + * (OPTIONAL; default is ENT_QUOTES). + * + * @return mixed The sanitized value. + * + * @since 1.5.2 + * + **/ +function sq_htmlspecialchars($value, $quote_style=ENT_QUOTES) { + + if ($quote_style === FALSE) $quote_style = ENT_QUOTES; + + // array? go recursive... + // + if (is_array($value)) { + $return_array = array(); + foreach ($value as $key => $val) { + $return_array[sq_htmlspecialchars($key, $quote_style)] + = sq_htmlspecialchars($val, $quote_style); + } + return $return_array; + + // sanitize strings only + // + } else if (is_string($value)) { + if ($quote_style === TRUE) + return str_replace(array('\'', '"'), array(''', '"'), $value); + else + return htmlspecialchars($value, $quote_style); + } + + // anything else gets returned with no changes + // + return $value; + +}