X-Git-Url: https://git.p6c8.net/jirafeau/pcanterino.git/blobdiff_plain/39ff6f56cbd8157556111441c987f2dd3258090a..bb3992d7f138eee6ec77b17c5027abec8ca474d6:/script.php diff --git a/script.php b/script.php index 301ebe8..b0cc0ac 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 { @@ -163,7 +165,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 +185,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_hash_compare = hash_equals($link['key'], md5($key)); + + if (strlen($link['key']) > 0 && !$sha_hash_compare && !$md5_hash_compare ) { sleep(2); echo 'Error 10'; exit; @@ -441,7 +448,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 {