X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FUtils.php;h=b8579b4864f174503e9c5dae4c1351999a487a2a;hb=1e57f90200c14d0143cd17529cbc0e7dc29f8061;hp=a1e97b356c6ed85e418f7515d0697bd3b949c729;hpb=7bd3542b1b030070fa3412a2769f9632bd4e6d1b;p=github%2Fshaarli%2FShaarli.git diff --git a/application/Utils.php b/application/Utils.php index a1e97b35..b8579b48 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -48,7 +48,7 @@ function endsWith($haystack, $needle, $case=true) */ function nl2br_escaped($html) { - return str_replace('>','>',str_replace('<','<',nl2br($html))); + return str_replace('>', '>', str_replace('<', '<', nl2br($html))); } /** @@ -84,4 +84,67 @@ function checkDateFormat($format, $string) $date = DateTime::createFromFormat($format, $string); return $date && $date->format($string) == $string; } -?> + +/** + * Generate a header location from HTTP_REFERER. + * Make sure the referer is Shaarli itself and prevent redirection loop. + * + * @param string $referer - HTTP_REFERER. + * @param string $host - Server HOST. + * @param array $loopTerms - Contains list of term to prevent redirection loop. + * + * @return string $referer - final referer. + */ +function generateLocation($referer, $host, $loopTerms = array()) +{ + $finalReferer = '?'; + + // No referer if it contains any value in $loopCriteria. + foreach ($loopTerms as $value) { + if (strpos($referer, $value) !== false) { + return $finalReferer; + } + } + + // Remove port from HTTP_HOST + if ($pos = strpos($host, ':')) { + $host = substr($host, 0, $pos); + } + + $refererHost = parse_url($referer, PHP_URL_HOST); + if (!empty($referer) && (strpos($refererHost, $host) !== false || startsWith('?', $refererHost))) { + $finalReferer = $referer; + } + + return $finalReferer; +} + +/** + * Validate session ID to prevent Full Path Disclosure. + * + * See #298. + * The session ID's format depends on the hash algorithm set in PHP settings + * + * @param string $sessionId Session ID + * + * @return true if valid, false otherwise. + * + * @see http://php.net/manual/en/function.hash-algos.php + * @see http://php.net/manual/en/session.configuration.php + */ +function is_session_id_valid($sessionId) +{ + if (empty($sessionId)) { + return false; + } + + if (!$sessionId) { + return false; + } + + if (!preg_match('/^[a-zA-Z0-9,-]{2,128}$/', $sessionId)) { + return false; + } + + return true; +}