From: Blackeye <14815724-Blackstareye@users.noreply.gitlab.com>
Date: Sat, 31 Oct 2026 00:32:20 +0000 (+0100)
Subject: Merge branch 'allow-disallow-extensions' into 'next-release'
X-Git-Tag: 4.8.0~11
X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/commitdiff_plain/5180854ea1087330a8d472e63cfa0ba54b0666ea?hp=a1be0cf369dc2c22214cddfe9eb7c908eacdf64b
Merge branch 'allow-disallow-extensions' into 'next-release'
Add a config option to forbid certain file extensions for uploads
See merge request jirafeau/Jirafeau!39
---
diff --git a/index.php b/index.php
index d60cb18..454bc52 100644
--- a/index.php
+++ b/index.php
@@ -136,7 +136,9 @@ elseif (true === jirafeau_challenge_upload_ip($cfg, get_ip_address($cfg))) {
} elseif ($cfg['maximal_upload_size'] > 0) {
echo t('2_BIG') . ', ' . t('FILE_LIM') . " " . $cfg['maximal_upload_size'] . " MB.";
}
-?>')"/>
+?>'); control_selected_file_extension(, '.')"/>
@@ -184,6 +186,10 @@ if ($cfg['maximal_upload_size'] >= 1024) {
} else {
echo '
';
}
+if (!empty($cfg['disallowed_extensions'])) {
+ // only shown when the selected file matches, see control_selected_file_extension()
+ echo '
' . t('EXT_LIM') . ' ' . implode(', ', jirafeau_disallowed_extensions($cfg)) . '
';
+}
?>
diff --git a/lib/config.original.php b/lib/config.original.php
index 37c87eb..54be072 100644
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -170,6 +170,15 @@ $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; a leading dot is optional.
+ * 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();
+
/* 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..c468d18 100644
--- a/lib/functions.js.php
+++ b/lib/functions.js.php
@@ -346,11 +346,45 @@ function control_selected_file_size(max_size, error_str)
// display options
document.getElementById('options').style.display = 'block';
document.getElementById('send').style.display = 'block';
+ document.getElementById('send').disabled = false;
document.getElementById('error_pop').style.display = 'none';
document.getElementById('send').focus();
}
}
+// 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)
+{
+ if (disallowed_extensions.length === 0)
+ {
+ return;
+ }
+ 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');
+ if (error_pop.style.display === 'none')
+ {
+ pop_failure(error_str);
+ }
+ else
+ {
+ error_pop.innerHTML += '
' + error_str;
+ }
+ // keep the button visible but disabled so the user sees it is forbidden
+ document.getElementById('send').style.display = 'block';
+ document.getElementById('send').disabled = true;
+ document.getElementById('disallowed_extensions').style.display = 'block';
+ }
+ else
+ {
+ document.getElementById('disallowed_extensions').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..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
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 bcca4f7..39eb9d2 100644
--- a/script.php
+++ b/script.php
@@ -110,6 +110,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.';
@@ -418,6 +424,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'];