Merge branch 'patch-1' into 'show_password_box'

[jirafeau/jirafeau.git] / f.php

diff --git a/f.php b/f.php
index a93ec981949aed82ac2173f64918432119bd44fb..870b4bdd8aa28b400d92f668c83ca784f1d7cfe6 100644 (file)
--- a/f.php
+++ b/f.php
@@ -98,7 +98,7 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
              <tr><td>
              <?php echo t('GONNA_DEL') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
              </td></tr>
-             <tr><td>
+             <tr class="tos"><td>
                 <?php echo t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' ?>
              </td></tr>
              <tr><td>
@@ -143,7 +143,7 @@ if (!empty($link['key'])) {
              t('GIMME_PSW') . ' : ' .
              '<input type = "password" name = "key" autocomplete = "current-password"/>' .
              '</td></tr>' .
-             '<tr><td>' .
+             '<tr class="tos"><td>' .
              t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
              '</td></tr>';
 
@@ -171,7 +171,9 @@ if (!empty($link['key'])) {
         require(JIRAFEAU_ROOT.'lib/template/footer.php');
         exit;
     } else {
-        if (hash_equals($link['key'], md5($_POST['key']))) {
+        if (strpos($link['key'], '[SHA256]') == 0 && hash_equals(substr($link['key'], 8), hash('sha256', $_POST['key']))) {
+            $password_challenged = true;
+        } elseif (hash_equals($link['key'], md5($_POST['key']))) {
             $password_challenged = true;
         } else {
             sleep(2);
@@ -193,7 +195,7 @@ if (!$password_challenged && !$do_download && !$do_preview) {
              '<tr><td>' .
              t('NOW_DOWNLOADING') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
              '</td></tr>' .
-             '<tr><td>' .
+             '<tr class="tos"><td>' .
              t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
              '</td></tr>';
 
@@ -231,6 +233,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") {