From: TehPeGaSuS <25697531+TehPeGaSuS@users.noreply.github.com> Date: Mon, 19 Oct 2026 19:04:17 +0000 (+0200) Subject: Match compound extensions such as tar.gz in disallowed_extensions X-Git-Tag: 4.8.0~11^2~4 X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/commitdiff_plain/b8fdbeedafcd3fc113a2b2c5ef8f2f814b691f4a?ds=inline Match compound extensions such as tar.gz in disallowed_extensions --- diff --git a/lib/config.original.php b/lib/config.original.php index 2be4e52..e140067 100644 --- a/lib/config.original.php +++ b/lib/config.original.php @@ -173,7 +173,9 @@ $cfg['maximal_upload_size'] = 0; /* Forbid specific file extensions from being uploaded. * Leave empty to allow every extension. * Extensions are matched case-insensitively and without the leading dot. - * $cfg['disallowed_extensions'] = array('exe', 'bat', 'sh', 'php'); + * Compound extensions such as 'tar.gz' are supported. Note that 'gz' + * also covers 'tar.gz', while 'tar.gz' leaves plain '.gz' files allowed. + * $cfg['disallowed_extensions'] = array('exe', 'bat', 'sh', 'php', 'tar.gz'); */ $cfg['disallowed_extensions'] = array(); diff --git a/lib/functions.js.php b/lib/functions.js.php index efa82e5..65febf1 100644 --- a/lib/functions.js.php +++ b/lib/functions.js.php @@ -356,9 +356,9 @@ function control_selected_file_size(max_size, error_str) // just warns the user before they submit a doomed upload. function control_selected_file_extension(disallowed_extensions, error_str) { - f_name = document.getElementById('file_select').files[0].name.replace(/[\s.]+$/, ''); - f_ext = f_name.includes('.') ? f_name.split('.').pop().toLowerCase() : ''; - if (disallowed_extensions.includes(f_ext)) + f_name = document.getElementById('file_select').files[0].name.replace(/[\s.]+$/, '').toLowerCase(); + // suffix match so that compound extensions such as 'tar.gz' work too + if (disallowed_extensions.some(function (ext) { return f_name.endsWith('.' + ext); })) { // control_selected_file_size runs first: keep its error, if any, and add ours var error_pop = document.getElementById('error_pop'); diff --git a/lib/functions.php b/lib/functions.php index 6090248..2d59cd3 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -242,11 +242,18 @@ function jirafeau_is_extension_allowed($cfg, $filename) } // trailing dots and whitespace are dropped on storage or by the client OS - $filename = rtrim($filename, " \t\n\r\0\x0B."); - $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION)); - $disallowed = array_map('strtolower', $cfg['disallowed_extensions']); + $filename = strtolower(rtrim($filename, " \t\n\r\0\x0B.")); - return !in_array($extension, $disallowed); + // 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 true; } /**