From: Blackeye <14815724-Blackstareye@users.noreply.gitlab.com> Date: Sat, 31 Oct 2026 12:48:23 +0000 (+0100) Subject: Merge branch 'f_issue_53' into 'next-release' X-Git-Tag: 4.8.0~10 X-Git-Url: https://git.p6c8.net/jirafeau/pcanterino.git/commitdiff_plain/637aa52418a6ce24e7849b7a633f2a0e11d8029c?hp=-c Merge branch 'f_issue_53' into 'next-release' fix for password-protected download always fails with "Error 10" since 4.7.2 Closes #53 See merge request jirafeau/Jirafeau!41 --- 637aa52418a6ce24e7849b7a633f2a0e11d8029c diff --combined script.php index 39eb9d2,c4fbba5..fdd46e3 --- a/script.php +++ b/script.php @@@ -110,12 -110,6 +110,12 @@@ if (isset($_FILES['file']) && is_writab 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.'; @@@ -191,7 -185,12 +191,12 @@@ 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; @@@ -424,12 -423,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'];