X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/2dc4984ad57dfcb0ded829bfc9d45493484fe6e3..82c3971d76360b5f82e01d6e3bc0cbac3085ef1c:/f.php?ds=sidebyside diff --git a/f.php b/f.php index 5fd8575..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']; @@ -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 '

'.t('FILE_NOT_AVAIL'). @@ -91,21 +89,19 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) { '

'; } else { ?>
-
' . t('PSW_PROTEC') . '' . ''; if ($link['onetime'] == 'O') { @@ -169,7 +165,6 @@ if (!empty($link['key'])) { echo '&k=' . urlencode($crypt_key); } ?>'; document.getElementById('submit_preview').submit ();"/>
' . t('GIMME_PSW') . ' : ' . - '' . + '' . '
' . - t('USING_SERIVCE'). ' ' . t('TOS') . '.' . + t('USING_SERVICE'). ' ' . t('TOS') . '.' . '
'; require(JIRAFEAU_ROOT.'lib/template/footer.php'); @@ -193,12 +188,12 @@ if (!$password_challenged && !$do_download && !$do_preview) { echo '
' . '
'; ?> ' . htmlspecialchars($link['file_name']) . '' . + echo '
' . jirafeau_escape($link['file_name']) . '
' . '' . ''; if ($link['onetime'] == 'O') { @@ -222,7 +217,6 @@ if (!$password_challenged && !$do_download && !$do_preview) { echo '&k=' . urlencode($crypt_key); } ?>'; document.getElementById('submit_post').submit ();"/>'; echo '
' . - 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']) . ').' . '
' . - t('USING_SERIVCE'). ' ' . t('TOS') . '.' . + t('USING_SERVICE'). ' ' . t('TOS') . '.' . '
'; @@ -238,23 +232,60 @@ 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']) { + /* 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. */ - $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,17 +294,24 @@ 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') { jirafeau_delete_link($link_name); } + +jirafeau_write_download_stats($link_name, get_ip_address($cfg)); + exit; ?>