X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/87c8c5de8a035e3336090758274d8384701e98e8..refs/heads/f_issue_53:/f.php
diff --git a/f.php b/f.php
index 92736f7..13fe280 100644
--- a/f.php
+++ b/f.php
@@ -36,7 +36,7 @@ if (!isset($_GET['h']) || empty($_GET['h'])) {
$link_name = $_GET['h'];
-if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) {
+if (!preg_match('/^[0-9a-zA-Z_-]+$/', $link_name)) {
require(JIRAFEAU_ROOT.'lib/template/header.php');
echo '
';
require(JIRAFEAU_ROOT.'lib/template/footer.php');
@@ -82,7 +82,7 @@ if (!file_exists(VAR_FILES . $p . $link['hash'])) {
exit;
}
-if (!empty($delete_code) && $delete_code == $link['link_code']) {
+if (!empty($delete_code) && hash_equals((string) $link['link_code'], (string) $delete_code)) {
require(JIRAFEAU_ROOT.'lib/template/header.php');
if (isset($_POST['do_delete'])) {
jirafeau_delete_link($link_name);
@@ -171,7 +171,13 @@ if (!empty($link['key'])) {
require(JIRAFEAU_ROOT.'lib/template/footer.php');
exit;
} else {
- if (hash_equals($link['key'], hash('sha256',$_POST['key']))) {
+ $sha_hash_compare = strpos($link['key'], '[SHA256]') === 0 && hash_equals(substr($link['key'], 8), hash('sha256', $_POST['key']));
+ // legacy md5 compare - before prefixing
+ $md5_legacy_hash_compare = hash_equals($link['key'], md5($_POST['key']));
+
+ if ( $sha_hash_compare ) {
+ $password_challenged = true;
+ } elseif ( $md5_legacy_hash_compare ) {
$password_challenged = true;
} else {
sleep(2);
@@ -272,12 +278,12 @@ else {
}
}
+jirafeau_write_download_stats($link_name, get_ip_address($cfg));
+
if ($link['onetime'] == 'O') {
jirafeau_delete_link($link_name);
}
-jirafeau_write_download_stats($link_name, get_ip_address($cfg));
-
exit;
?>