X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/39ff6f56cbd8157556111441c987f2dd3258090a..refs/merge-requests/39/head:/lib/functions.php diff --git a/lib/functions.php b/lib/functions.php index 948a436..7f03b5f 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -229,6 +229,58 @@ function jirafeau_ini_to_bytes($value) return $bytes; } +/** + * returns the configured disallowed extensions, lower-cased and without + * a leading dot + * @param $cfg jirafeau config + * @returns array of normalized extensions + */ +function jirafeau_disallowed_extensions($cfg) +{ + if (empty($cfg['disallowed_extensions'])) { + return array(); + } + + // tolerate a leading dot in the config, e.g. '.jpg' instead of 'jpg' + $extensions = array(); + foreach ($cfg['disallowed_extensions'] as $extension) { + $extension = ltrim(strtolower(trim($extension)), '.'); + if ($extension !== '') { + $extensions[] = $extension; + } + } + + return $extensions; +} + +/** + * checks if a file name's extension is allowed to be uploaded + * @param $cfg jirafeau config + * @param $filename the name of the file being uploaded + * @returns true if the extension is allowed + */ +function jirafeau_is_extension_allowed($cfg, $filename) +{ + $extensions = jirafeau_disallowed_extensions($cfg); + if (empty($extensions)) { + return true; + } + + // trailing dots and whitespace are dropped on storage or by the client OS + $filename = strtolower(rtrim($filename, " \t\n\r\0\v.")); + + // suffix match so that compound extensions such as 'tar.gz' work too; + // 'gz' still covers 'archive.tar.gz' + foreach ($extensions as $extension) { + $suffix = '.' . $extension; + if (substr($filename, -strlen($suffix)) === $suffix) { + return false; + } + } + + return true; +} + /** * gets the maximum upload size according to php.ini * @returns the maximum upload size in bytes @@ -947,6 +999,7 @@ function jirafeau_admin_bug_report($cfg) $out .= "- version: " . JIRAFEAU_VERSION . "
"; $jirafeau_options = [ 'debug', + 'debug_enforce_classic_upload', 'file_hash', 'litespeed_workaround', 'store_uploader_ip',