From: ThePeGaSuS <25697531+TehPeGaSuS@users.noreply.github.com>
Date: Mon, 7 Sep 2026 11:02:50 +0000 (+0200)
Subject: Add disallowed_extensions config with server and client validation
X-Git-Tag: 4.8.0~11^2~9
X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/commitdiff_plain/08b9270797ef139d44343187cfa545a145021d83?ds=inline
Add disallowed_extensions config with server and client validation
Add $cfg['disallowed_extensions'] as a single-purpose blacklist field
(supersedes MR !39's allowed/forbidden approach per maintainer
feedback). Server-side validation runs in both the direct-upload and
async-init branches of script.php, covering browser and CLI/curl
uploads alike. Client-side JS mirrors the existing file-size check,
warning the user and hiding the send button before they submit an
upload with a disallowed extension, and the disallowed list is shown
next to the file-size hint on the upload form.
Co-Authored-By: Claude Sonnet 5
' . t('EXT_LIM') . ' ' . implode(', ', $cfg['disallowed_extensions']) . '
'; +} ?> diff --git a/lib/config.original.php b/lib/config.original.php index 37c87eb..2be4e52 100644 --- a/lib/config.original.php +++ b/lib/config.original.php @@ -170,6 +170,13 @@ $cfg['one_time_download_preselected'] = false; */ $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'); + */ +$cfg['disallowed_extensions'] = array(); + /* Proxy IP * If the installation is behind some reverse proxies, it is possible to set * the allowed proxy IP. diff --git a/lib/functions.js.php b/lib/functions.js.php index cafecaf..b178f4f 100644 --- a/lib/functions.js.php +++ b/lib/functions.js.php @@ -351,6 +351,19 @@ function control_selected_file_size(max_size, error_str) } } +// UX-only: script.php enforces disallowed_extensions independently, this +// 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; + f_ext = f_name.includes('.') ? f_name.split('.').pop().toLowerCase() : ''; + if (disallowed_extensions.includes(f_ext)) + { + pop_failure(error_str); + document.getElementById('send').style.display = 'none'; + } +} + function XHRErrorHandler(e) { var text = "${e.type}: ${e.loaded} bytes transferred" diff --git a/lib/functions.php b/lib/functions.php index 6c8d56d..8bfa61b 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -229,6 +229,24 @@ function jirafeau_ini_to_bytes($value) return $bytes; } +/** + * 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) +{ + if (empty($cfg['disallowed_extensions'])) { + return true; + } + + $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION)); + $disallowed = array_map('strtolower', $cfg['disallowed_extensions']); + + return !in_array($extension, $disallowed); +} + /** * gets the maximum upload size according to php.ini * @returns the maximum upload size in bytes diff --git a/lib/locales/en.json b/lib/locales/en.json index f17bf9a..dfef8d5 100644 --- a/lib/locales/en.json +++ b/lib/locales/en.json @@ -38,6 +38,8 @@ "UP_PSW": "Upload password", "2_BIG": "The file is too big", "FILE_LIM": "File size limited to", + "EXT_NOT_ALLOWED": "This file extension is not allowed", + "EXT_LIM": "Disallowed file extensions:", "FILE_DIR_W": "The file directory is not writable.", "LINK_DIR_W": "The link directory is not writable.", "ASYNC_DIR_W": "The async directory is not writable.", diff --git a/script.php b/script.php index 2fc297f..671aeef 100644 --- a/script.php +++ b/script.php @@ -108,6 +108,12 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) exit; } + // Check file extension + if (!jirafeau_is_extension_allowed($cfg, $_FILES['file']['name'])) { + echo 'Error 27: This file extension is not allowed.'; + exit; + } + // Check if one time download is enabled if (!$cfg['one_time_download'] && isset($_POST['one_time_download'])) { echo 'Error 26: One time download is disabled.'; @@ -416,6 +422,12 @@ elseif (isset($_GET['init_async'])) { exit; } + // Check file extension + if (!jirafeau_is_extension_allowed($cfg, $_POST['filename'])) { + echo 'Error 28: This file extension is not allowed.'; + exit; + } + $type = ''; if (isset($_POST['type'])) { $type = $_POST['type'];