!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;
}
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 {
$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;
}
}
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']) {
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_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;
} 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
if [ "$1" == "send" ]; then
if [ ! -f "$2" ]; then
- echo "File \"$2\" does not exists."
+ echo "File \"$2\" does not exist."
exit
fi
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 {