X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/08b9270797ef139d44343187cfa545a145021d83..b8fdbeedafcd3fc113a2b2c5ef8f2f814b691f4a:/lib/functions.php diff --git a/lib/functions.php b/lib/functions.php index 8bfa61b..2d59cd3 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -241,10 +241,19 @@ function jirafeau_is_extension_allowed($cfg, $filename) return true; } - $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION)); - $disallowed = array_map('strtolower', $cfg['disallowed_extensions']); + // trailing dots and whitespace are dropped on storage or by the client OS + $filename = strtolower(rtrim($filename, " \t\n\r\0\x0B.")); + + // suffix match so that compound extensions such as 'tar.gz' work too; + // 'gz' still covers 'archive.tar.gz' + foreach ($cfg['disallowed_extensions'] as $extension) { + $suffix = '.' . strtolower($extension); + if (substr($filename, -strlen($suffix)) === $suffix) { + return false; + } + } - return !in_array($extension, $disallowed); + return true; } /**