X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/eae7f48e501c8709a049d291069bc37150ecc1a1..5180854ea1087330a8d472e63cfa0ba54b0666ea:/script.php diff --git a/script.php b/script.php index aa8c259..39eb9d2 100644 --- a/script.php +++ b/script.php @@ -74,7 +74,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) !jirafeau_challenge_upload($cfg, get_ip_address($cfg), $_POST['upload_password'])) { echo 'Error 3: Invalid password'; exit; - } elseif (!jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { + } elseif (!isset($_POST['upload_password']) && !jirafeau_challenge_upload($cfg, get_ip_address($cfg), null)) { echo 'Error 2: No password nor allowed IP'; exit; } @@ -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.'; @@ -163,7 +171,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) $d = $_GET['d']; } - if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) { + if (!preg_match('/^[0-9a-zA-Z_-]+$/', $link_name)) { echo 'Error 7'; exit; } @@ -183,7 +191,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) echo 'Error 9'; exit; } - if (strlen($link['key']) > 0 && md5($key) != $link['key']) { + if (strlen($link['key']) > 0 && hash('sha256', $key) != $link['key']) { sleep(2); echo 'Error 10'; exit; @@ -416,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']; @@ -441,7 +455,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 {