X-Git-Url: https://git.p6c8.net/jirafeau_project.git/blobdiff_plain/5d7c0d3ce08074fff55e7731490fe786cd6101e6..82c3971d76360b5f82e01d6e3bc0cbac3085ef1c:/f.php?ds=inline
diff --git a/f.php b/f.php
index 9219493..854da83 100644
--- a/f.php
+++ b/f.php
@@ -2,7 +2,7 @@
/*
* Jirafeau, your web file repository
* Copyright (C) 2008 Julien "axolotl" BERNARD
- * Copyright (C) 2015 Jerome Jutteau
+ * Copyright (C) 2015 Jerome Jutteau
*
* 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'];
@@ -91,8 +89,8 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) {
'
';
} else { ?>
' . t('PSW_PROTEC') .
'';
require(JIRAFEAU_ROOT.'lib/template/footer.php');
@@ -222,7 +217,6 @@ if (!$password_challenged && !$do_download && !$do_preview) {
echo '&k=' . urlencode($crypt_key);
} ?>';
document.getElementById('submit_post').submit ();"/>';
echo '';
@@ -241,9 +235,45 @@ header('Content-Type: ' . $link['mime_type']);
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']) {
+ /* Decrypt file. */
+ $r = fopen(VAR_FILES . $p . $link['hash'], 'rb');
+ $fs = fstat($r)['size'];
+
+ $crypt_header = fread($r, SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES);
+
+ /* Init module. */
+ $crypt_state = sodium_crypto_secretstream_xchacha20poly1305_init_pull($crypt_header, $crypt_key);
+
+ /* Decrypt file. */
+
+ for ($i = SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES; $i < $fs; $i += JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES) {
+ $to_dec = fread($r, JIRAFEAU_SODIUM_CHUNKSIZE + SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES);
+ [$dec, $crypt_tag] = sodium_crypto_secretstream_xchacha20poly1305_pull($crypt_state, $to_dec);
+ echo $dec;
+ }
+
+ fclose($r);
+
+ /* Cleanup. */
+ sodium_memzero($crypt_state);
+}
+/* Read encrypted file (legacy mode using mcrypt). */
+elseif ($link['crypted_legacy']) {
/* Init module */
$m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
/* Extract key and iv. */
@@ -256,7 +286,6 @@ if ($link['crypted']) {
while (!feof($r)) {
$dec = mdecrypt_generic($m, fread($r, 1024));
print $dec;
- ob_flush();
}
fclose($r);
/* Cleanup. */
@@ -265,17 +294,24 @@ if ($link['crypted']) {
}
/* Read file. */
else {
- $r = fopen(VAR_FILES . $p . $link['hash'], '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') {
jirafeau_delete_link($link_name);
}
+
+jirafeau_write_download_stats($link_name, get_ip_address($cfg));
+
exit;
?>