X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/1d414d7f236e26fd125dec93105bfa2ce0fc3540..8f196e16aebd9aa84bf8c6d356d499dec4e9885e:/f.php diff --git a/f.php b/f.php index 922668f..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 '

' . t('FILE_404') . '

'; 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'], md5($_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); @@ -231,6 +237,7 @@ if (!jirafeau_is_viewable($link['mime_type']) || !$cfg['preview'] || $do_downloa header('Content-Disposition: attachment; filename="' . $link['file_name'] . '"'); } else { header('Content-Disposition: filename="' . $link['file_name'] . '"'); + header('X-Content-Type-Options: nosniff'); } header('Content-Type: ' . $link['mime_type']); if ($cfg['file_hash'] == "md5") { @@ -271,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; ?>