X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/2dc4984ad57dfcb0ded829bfc9d45493484fe6e3..e7ca00035309ca757f2be9dddf37b0f66d66c2b6:/f.php

diff --git a/f.php b/f.php
index 5fd8575..5555523 100644
--- a/f.php
+++ b/f.php
@@ -2,7 +2,7 @@
 /*
  *  Jirafeau, your web file repository
  *  Copyright (C) 2008  Julien "axolotl" BERNARD <axolotl@magieeternelle.org>
- *  Copyright (C) 2015  Jerome Jutteau <j.jutteau@gmail.com>
+ *  Copyright (C) 2015  Jerome Jutteau <jerome@jutteau.fr>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
@@ -32,8 +32,6 @@ if (!isset($_GET['h']) || empty($_GET['h'])) {
  * Be sure PHP's safe mode is off.
  */
 @set_time_limit(0);
-/* Remove errors. */
-@error_reporting(0);
 
 $link_name = $_GET['h'];
 
@@ -73,8 +71,8 @@ if (isset($_GET['p']) && !empty($_GET['p'])) {
     $do_preview = true;
 }
 
-$p = s2p($link['md5']);
-if (!file_exists(VAR_FILES . $p . $link['md5'])) {
+$p = s2p($link['hash']);
+if (!file_exists(VAR_FILES . $p . $link['hash'])) {
     jirafeau_delete_link($link_name);
     require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>'.t('FILE_NOT_AVAIL').
@@ -91,21 +89,19 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
             '</p></div>';
     } else { ?>
         <div>
-        <form action="f.php" method="post" id="submit_delete_post" class="form login">
-        <input type="hidden" name="do_delete" value=1/>
+        <form action="<?php echo 'f.php?h=' . $link_name . '&amp;d=' . $delete_code; ?>" method="post" id="submit_delete_post" class="form login">
+        <input type="hidden" name="do_delete" value="1" />
         <fieldset>
              <legend> <?php echo t('CONFIRM_DEL') ?> </legend>
              <table>
              <tr><td>
-             <?php echo t('GONNA_DEL') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
+             <?php echo t('GONNA_DEL') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
              </td></tr>
              <tr><td>
-                <?php echo t('USING_SERIVCE'). ' <a href="tos.php">' . t('TOS') . '</a>.' ?>
+                <?php echo t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' ?>
              </td></tr>
              <tr><td>
-                <input type="submit" id="submit_delete"  value="<?php echo t('DELETE'); ?>"
-                onclick="document.getElementById('submit_delete_post').action='<?php echo 'f.php?h=' . $link_name . '&amp;d=' . $delete_code . "';"; ?>
-                document.getElementById('submit_delete').submit ();"/>
+                <input type="submit" id="submit_delete" value="<?php echo t('DELETE'); ?>"/>
              </td></tr>
              </table>
          </fieldset></form></div><?php
@@ -144,10 +140,10 @@ if (!empty($link['key'])) {
              '<legend>' . t('PSW_PROTEC') .
              '</legend><table><tr><td>' .
              t('GIMME_PSW') . ' : ' .
-             '<input type = "password" name = "key" />' .
+             '<input type = "password" name = "key" autocomplete = "current-password"/>' .
              '</td></tr>' .
              '<tr><td>' .
-             t('USING_SERIVCE'). ' <a href="tos.php">' . t('TOS') . '</a>.' .
+             t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
              '</td></tr>';
 
         if ($link['onetime'] == 'O') {
@@ -169,7 +165,6 @@ if (!empty($link['key'])) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
             document.getElementById('submit_preview').submit ();"/><?php
-
         }
         echo '</td></tr></table></fieldset></form></div>';
         require(JIRAFEAU_ROOT.'lib/template/footer.php');
@@ -193,12 +188,12 @@ if (!$password_challenged && !$do_download && !$do_preview) {
     echo '<div>' .
              '<form action="f.php" method="post" id="submit_post" class="form download">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
-        echo '<fieldset><legend>' . htmlspecialchars($link['file_name']) . '</legend><table>' .
+        echo '<fieldset><legend>' . jirafeau_escape($link['file_name']) . '</legend><table>' .
              '<tr><td>' .
-             t('NOW_DOWNLOADING') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
+             t('NOW_DOWNLOADING') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
              '</td></tr>' .
              '<tr><td>' .
-             t('USING_SERIVCE'). ' <a href="tos.php">' . t('TOS') . '</a>.' .
+             t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
              '</td></tr>';
 
     if ($link['onetime'] == 'O') {
@@ -222,7 +217,6 @@ if (!$password_challenged && !$do_download && !$do_preview) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
         document.getElementById('submit_post').submit ();"/><?php
-
         }
     echo '</td></tr>';
     echo '</table></fieldset></form></div>';
@@ -238,23 +232,36 @@ if (!jirafeau_is_viewable($link['mime_type']) || !$cfg['preview'] || $do_downloa
     header('Content-Disposition: filename="' . $link['file_name'] . '"');
 }
 header('Content-Type: ' . $link['mime_type']);
-header('Content-MD5: ' . hex_to_base64($link['md5']));
-
+if ($cfg['file_hash'] == "md5") {
+    header('Content-MD5: ' . hex_to_base64($link['hash']));
+}
+if ($cfg['litespeed_workaround']) {
+    // Work around that LiteSpeed truncates large files.
+    // See https://www.litespeedtech.com/support/wiki/doku.php/litespeed_wiki:config:internal-redirect
+    if ($_GET['litespeed_workaround'] == 'phase2') {
+        $file_web_path = preg_replace('#^' . $_SERVER['DOCUMENT_ROOT'] . '#', '', VAR_FILES);
+        header('X-LiteSpeed-Location: ' . $file_web_path . $p . $link['hash']);
+    } else {
+        // Since Content-Type isn't forwarded by LiteSpeed, first
+        // redirect to the same URL but append the file name.
+        header('Location: ' . $_SERVER['PHP_SELF'] . '/' . $link['file_name'] . '?' .
+               $_SERVER['QUERY_STRING'] . '&litespeed_workaround=phase2');
+    }
+}
 /* Read encrypted file. */
-if ($link['crypted']) {
+elseif ($link['crypted']) {
     /* Init module */
     $m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
     /* Extract key and iv. */
-    $md5_key = md5($crypt_key);
-    $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
+    $hash_key = md5($crypt_key);
+    $iv = jirafeau_crypt_create_iv($hash_key, mcrypt_enc_get_iv_size($m));
     /* Init module. */
-    mcrypt_generic_init($m, $md5_key, $iv);
+    mcrypt_generic_init($m, $hash_key, $iv);
     /* Decrypt file. */
-    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
+    $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
     while (!feof($r)) {
         $dec = mdecrypt_generic($m, fread($r, 1024));
         print $dec;
-        ob_flush();
     }
     fclose($r);
     /* Cleanup. */
@@ -263,12 +270,16 @@ if ($link['crypted']) {
 }
 /* Read file. */
 else {
-    $r = fopen(VAR_FILES . $p . $link['md5'], 'r');
-    while (!feof($r)) {
-        print fread($r, 1024);
-        ob_flush();
+    if ($cfg['use_xsendfile']) {
+        $file_web_path = preg_replace('#^' . $_SERVER['DOCUMENT_ROOT'] . '#', '', VAR_FILES);
+        header('X-Sendfile: ' . $file_web_path . $p . $link['hash']);
+    } else {
+        $r = fopen(VAR_FILES . $p . $link['hash'], 'r');
+        while (!feof($r)) {
+            print fread($r, 1024);
+        }
+        fclose($r);
     }
-    fclose($r);
 }
 
 if ($link['onetime'] == 'O') {