From: Patrick Canterino Date: Fri, 13 Nov 2026 18:32:45 +0000 (+0100) Subject: Merge branch 'fix_issue_51' into next-release X-Git-Tag: 4.8.0~5 X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/commitdiff_plain/b93cd7c8b3921d4d337d576de483c5f02d58c079?hp=066f356d4a09e908bb8d90e7ab8d2248287bafe8 Merge branch 'fix_issue_51' into next-release --- diff --git a/.dockerignore b/.dockerignore index 670c268..ce24959 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ +lib/config.local.php screenshots AUTHORS.md CHANGELOG.md diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 613ab9b..1a8d24e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,15 +63,6 @@ job_lint_app_81: before_script: *before_linter_script script: *linter_script <<: *linter_warning - - - -# Run tests for php:7.4 -job_lint_app_74: - image: php:7.4 - before_script: *before_linter_script - script: *linter_script - <<: *linter_warning # ================= # Deprecated ones END diff --git a/AUTHORS.md b/AUTHORS.md index 9eaa5e5..84f5110 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -23,6 +23,7 @@ This is a list of people who contributed to Jirafeau over the years. The list wa - Cem - Dan Untenzu - Dark Horse +- Davi Torres - Dennis de Best - Edwin Bos - Erik Hubers @@ -68,6 +69,7 @@ This is a list of people who contributed to Jirafeau over the years. The list wa - Mathis Mensing - Matthieu Schneider - Mattias Münster +- Max Hausch - max keiser - Michal Čihař - Milo Ivir @@ -120,4 +122,4 @@ This is a list of people who contributed to Jirafeau over the years. The list wa - Zertrin - Zoltán Faludi - Степанчук Максим -- Слободан Симић \ No newline at end of file +- Слободан Симић diff --git a/CHANGELOG.md b/CHANGELOG.md index a85065c..c463437 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,11 @@ ## Version 4.7.x (not yet released) +- Download stats are written before a one-time link is deleted. The other way around would cause write attempts to a directory that was already gone. +- The `time` parameter is now optional in `script.php` +- Few little more fixes and refactoring - ... +- Upgrade from 4.7.2: in-place upgrade ## Version 4.7.2 diff --git a/docker/README.md b/docker/README.md index d170d70..619772a 100644 --- a/docker/README.md +++ b/docker/README.md @@ -101,6 +101,7 @@ Available options: - `UPLOAD_IP`: set one or more ip allowed to upload files (separated by comma). - `UPLOAD_IP_NO_PASSWORD`: set one or more ip allowed to upload files without password (separated by comma). - `PROXY_IP`: set one or more proxy ip (separated by comma). +- `DISALLOWED_EXTENSIONS`: forbid specific file extensions from being uploaded (separated by comma). - `STORE_UPLOADER_IP`: set to 1 or 0 to enable or disable keeping sender's IP with the _link_ file. - `DOWNLOAD_PASSWORD_REQUIREMENT`: set to 'optional' (default), 'required' or 'generated' to make a password for downloading optional, required or generated - `DOWNLOAD_PASSWORD_GEN_LEN`: set length of generated download passwords diff --git a/docker/docker_config.php b/docker/docker_config.php index d814a8e..c589a13 100644 --- a/docker/docker_config.php +++ b/docker/docker_config.php @@ -201,6 +201,7 @@ function run_setup(&$cfg) env_2_cfg_string_array($cfg, 'admin_ip'); env_2_cfg_string_array($cfg, 'upload_ip_nopassword'); env_2_cfg_string_array($cfg, 'proxy_ip'); + env_2_cfg_string_array($cfg, 'disallowed_extensions'); // this is a key value based value env_2_cfg_array_from_json($cfg, 'availabilities'); env_2_cfg_bool($cfg, 'store_uploader_ip'); diff --git a/f.php b/f.php index 3523596..13fe280 100644 --- a/f.php +++ b/f.php @@ -171,9 +171,13 @@ if (!empty($link['key'])) { require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } else { - if (strpos($link['key'], '[SHA256]') == 0 && hash_equals(substr($link['key'], 8), hash('sha256', $_POST['key']))) { + $sha_hash_compare = strpos($link['key'], '[SHA256]') === 0 && hash_equals(substr($link['key'], 8), hash('sha256', $_POST['key'])); + // legacy md5 compare - before prefixing + $md5_legacy_hash_compare = hash_equals($link['key'], md5($_POST['key'])); + + if ( $sha_hash_compare ) { $password_challenged = true; - } elseif (hash_equals($link['key'], md5($_POST['key']))) { + } elseif ( $md5_legacy_hash_compare ) { $password_challenged = true; } else { sleep(2); @@ -274,12 +278,12 @@ else { } } +jirafeau_write_download_stats($link_name, get_ip_address($cfg)); + if ($link['onetime'] == 'O') { jirafeau_delete_link($link_name); } -jirafeau_write_download_stats($link_name, get_ip_address($cfg)); - exit; ?> 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 ''; +} ?>

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 7d00cee..e831087 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 @@ -996,6 +1048,7 @@ function jirafeau_admin_bug_report($cfg) $out .= "# OS details
"; $out .= "- OS: " . php_uname() . "
"; + $out .= "- Docker: " . (is_file('/.dockerenv') ? 'yes' : 'no') . "
"; $out .= "
"; $out .= "# Browser details
"; diff --git a/lib/locales/ar.json b/lib/locales/ar.json index 83227b4..8c7dd01 100644 --- a/lib/locales/ar.json +++ b/lib/locales/ar.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/be.json b/lib/locales/be.json index 4dc371c..8a90428 100644 --- a/lib/locales/be.json +++ b/lib/locales/be.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/bn_IN.json b/lib/locales/bn_IN.json index c0d7a26..c115719 100644 --- a/lib/locales/bn_IN.json +++ b/lib/locales/bn_IN.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/bo.json b/lib/locales/bo.json index 9d08b73..2e3a873 100644 --- a/lib/locales/bo.json +++ b/lib/locales/bo.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/ca.json b/lib/locales/ca.json index 2d259b9..31cc56e 100644 --- a/lib/locales/ca.json +++ b/lib/locales/ca.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/ckb.json b/lib/locales/ckb.json index bbc76bc..3778d4f 100644 --- a/lib/locales/ckb.json +++ b/lib/locales/ckb.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/cs.json b/lib/locales/cs.json index 9db9731..479c51b 100644 --- a/lib/locales/cs.json +++ b/lib/locales/cs.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/da.json b/lib/locales/da.json index af0ccb8..08daf4e 100644 --- a/lib/locales/da.json +++ b/lib/locales/da.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/de.json b/lib/locales/de.json index 8936ee1..18f487e 100644 --- a/lib/locales/de.json +++ b/lib/locales/de.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "Nicht erlaubte Dateitypen:", + "EXT_NOT_ALLOWED": "Dieser Dateityp ist nicht erlaubt", "NO": "Nein", "YES": "Ja", "ENCRYPTED": "Verschlüsselt", diff --git a/lib/locales/el.json b/lib/locales/el.json index 2676b18..e63d83f 100644 --- a/lib/locales/el.json +++ b/lib/locales/el.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", 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/lib/locales/es.json b/lib/locales/es.json index 3c6bac0..3c30602 100644 --- a/lib/locales/es.json +++ b/lib/locales/es.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "No", "YES": "Sí", "ENCRYPTED": "", diff --git a/lib/locales/et.json b/lib/locales/et.json index bbc76bc..3778d4f 100644 --- a/lib/locales/et.json +++ b/lib/locales/et.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/fi.json b/lib/locales/fi.json index debff9c..21ecda8 100644 --- a/lib/locales/fi.json +++ b/lib/locales/fi.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/fr.json b/lib/locales/fr.json index 8629b76..46cea4e 100644 --- a/lib/locales/fr.json +++ b/lib/locales/fr.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "Non", "YES": "Oui", "ENCRYPTED": "", diff --git a/lib/locales/he.json b/lib/locales/he.json index ea0f4e5..19b98d9 100644 --- a/lib/locales/he.json +++ b/lib/locales/he.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/hi.json b/lib/locales/hi.json index fdca622..b112888 100644 --- a/lib/locales/hi.json +++ b/lib/locales/hi.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/hr.json b/lib/locales/hr.json index d1994d6..2c4c99c 100644 --- a/lib/locales/hr.json +++ b/lib/locales/hr.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/hu.json b/lib/locales/hu.json index a4a075e..8632ef5 100644 --- a/lib/locales/hu.json +++ b/lib/locales/hu.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/id.json b/lib/locales/id.json index 24cea50..6696234 100644 --- a/lib/locales/id.json +++ b/lib/locales/id.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/it.json b/lib/locales/it.json index 4be5d53..262d916 100644 --- a/lib/locales/it.json +++ b/lib/locales/it.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "No", "YES": "Sì", "ENCRYPTED": "", diff --git a/lib/locales/ja.json b/lib/locales/ja.json index 04e6735..e81d789 100644 --- a/lib/locales/ja.json +++ b/lib/locales/ja.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/ko.json b/lib/locales/ko.json index fdca622..b112888 100644 --- a/lib/locales/ko.json +++ b/lib/locales/ko.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/la.json b/lib/locales/la.json index b5cf0a2..a5b7b13 100644 --- a/lib/locales/la.json +++ b/lib/locales/la.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/mfe.json b/lib/locales/mfe.json index bbc76bc..3778d4f 100644 --- a/lib/locales/mfe.json +++ b/lib/locales/mfe.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/ms.json b/lib/locales/ms.json index 27575f7..670834c 100644 --- a/lib/locales/ms.json +++ b/lib/locales/ms.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/nb_NO.json b/lib/locales/nb_NO.json index 939f52b..40d7487 100644 --- a/lib/locales/nb_NO.json +++ b/lib/locales/nb_NO.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/nl.json b/lib/locales/nl.json index c817eee..1ff7fc2 100644 --- a/lib/locales/nl.json +++ b/lib/locales/nl.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/pl.json b/lib/locales/pl.json index d70f0de..cf13ca9 100644 --- a/lib/locales/pl.json +++ b/lib/locales/pl.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/ps.json b/lib/locales/ps.json index bbc76bc..3778d4f 100644 --- a/lib/locales/ps.json +++ b/lib/locales/ps.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/pt.json b/lib/locales/pt.json index 812b59d..f93a029 100644 --- a/lib/locales/pt.json +++ b/lib/locales/pt.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/pt_BR.json b/lib/locales/pt_BR.json index 1e36b53..145c6c5 100644 --- a/lib/locales/pt_BR.json +++ b/lib/locales/pt_BR.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/ro.json b/lib/locales/ro.json index 6d76460..00eb47a 100644 --- a/lib/locales/ro.json +++ b/lib/locales/ro.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/ru.json b/lib/locales/ru.json index 6b0f951..98a490b 100644 --- a/lib/locales/ru.json +++ b/lib/locales/ru.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/sh.json b/lib/locales/sh.json index bbc76bc..3778d4f 100644 --- a/lib/locales/sh.json +++ b/lib/locales/sh.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/si.json b/lib/locales/si.json index 842db6c..e713a3a 100644 --- a/lib/locales/si.json +++ b/lib/locales/si.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/sk.json b/lib/locales/sk.json index 8c42dc5..5151b3b 100644 --- a/lib/locales/sk.json +++ b/lib/locales/sk.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/sl.json b/lib/locales/sl.json index 463d58b..65dd58b 100644 --- a/lib/locales/sl.json +++ b/lib/locales/sl.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/sq.json b/lib/locales/sq.json index bbc76bc..3778d4f 100644 --- a/lib/locales/sq.json +++ b/lib/locales/sq.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/sr.json b/lib/locales/sr.json index 6aca55f..e6c2671 100644 --- a/lib/locales/sr.json +++ b/lib/locales/sr.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/sv.json b/lib/locales/sv.json index 59c215b..b8778ea 100644 --- a/lib/locales/sv.json +++ b/lib/locales/sv.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/ta.json b/lib/locales/ta.json index c46fd97..6116896 100644 --- a/lib/locales/ta.json +++ b/lib/locales/ta.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/template.json b/lib/locales/template.json index ce688bf..6b31c4e 100644 --- a/lib/locales/template.json +++ b/lib/locales/template.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/th.json b/lib/locales/th.json index bbc76bc..3778d4f 100644 --- a/lib/locales/th.json +++ b/lib/locales/th.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/tr.json b/lib/locales/tr.json index 76287db..675bd2a 100644 --- a/lib/locales/tr.json +++ b/lib/locales/tr.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/uk.json b/lib/locales/uk.json index bd8f31c..3cddd54 100644 --- a/lib/locales/uk.json +++ b/lib/locales/uk.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/vi.json b/lib/locales/vi.json index 35bb24e..52ce1b0 100644 --- a/lib/locales/vi.json +++ b/lib/locales/vi.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/zh.json b/lib/locales/zh.json index 5b01550..4811364 100644 --- a/lib/locales/zh.json +++ b/lib/locales/zh.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/lib/locales/zh_TW.json b/lib/locales/zh_TW.json index 43877f5..7d08dc5 100644 --- a/lib/locales/zh_TW.json +++ b/lib/locales/zh_TW.json @@ -1,4 +1,6 @@ { + "EXT_LIM": "", + "EXT_NOT_ALLOWED": "", "NO": "", "YES": "", "ENCRYPTED": "", diff --git a/script.php b/script.php index 2fc297f..fdd46e3 100644 --- a/script.php +++ b/script.php @@ -94,7 +94,9 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) exit; } - if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) { + if (!isset($_POST['time'])) { + $time = jirafeau_datestr_to_int($cfg['availability_default']); + } elseif (!$cfg['availabilities'][$_POST['time']]) { echo 'Error 4: The parameter time is invalid.'; exit; } else { @@ -108,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.'; @@ -183,7 +191,12 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) echo 'Error 9'; exit; } - if (strlen($link['key']) > 0 && hash('sha256', $key) != $link['key']) { + // sha hash compare + $sha_hash_compare = (strpos($link['key'], '[SHA256]') === 0 && hash_equals(substr($link['key'], 8), hash('sha256', $key))); + // legacy md5 compare - before prefixing + $md5_legacy_hash_compare = hash_equals($link['key'], md5($key)); + + if (strlen($link['key']) > 0 && !$sha_hash_compare && !$md5_legacy_hash_compare ) { sleep(2); echo 'Error 10'; exit; @@ -416,6 +429,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']; @@ -441,7 +460,9 @@ elseif (isset($_GET['init_async'])) { exit; } - if (!isset($_POST['time']) || !$cfg['availabilities'][$_POST['time']]) { + if (!isset($_POST['time'])) { + $time = jirafeau_datestr_to_int($cfg['availability_default']); + } elseif (!$cfg['availabilities'][$_POST['time']]) { echo 'Error 22'; exit; } else {