X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/a046e3b04175367c1afadd306513414fa61ba3fd..refs/heads/f_issue_53:/script.php diff --git a/script.php b/script.php index c0cee68..b0cc0ac 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 { @@ -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; } @@ -175,7 +177,7 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) } if (strlen($d) > 0 && $d == $link['link_code']) { jirafeau_delete_link($link_name); - echo "Ok"; + echo 'Ok'; exit; } if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) { @@ -183,7 +185,12 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) echo 'Error 9'; exit; } - if (strlen($link['key']) > 0 && md5($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; @@ -217,8 +224,8 @@ if (isset($_FILES['file']) && is_writable(VAR_FILES) } elseif (isset($_GET['get_version'])) { echo JIRAFEAU_VERSION; } elseif (isset($_GET['lang'])) { - $l=$_GET['lang']; - if ($l == "bash") { + $l = $_GET['lang']; + if ($l == 'bash') { ?> #!/bin/bash @@ -320,7 +327,7 @@ downloadpage='f.php' if [ "$1" == "send" ]; then if [ ! -f "$2" ]; then - echo "File \"$2\" does not exists." + echo "File \"$2\" does not exist." exit fi @@ -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 {