diff --git a/src/Jirafeau/f.php b/src/Jirafeau/f.php index 26c8ae1..b6c1c7b 100644 --- a/src/Jirafeau/f.php +++ b/src/Jirafeau/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,10 +32,9 @@ 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']; + if (!preg_match('/[0-9a-zA-Z_-]+$/', $link_name)) { require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '

' . t('FILE_404') . '

'; @@ -57,11 +56,6 @@ if (isset($_GET['d']) && !empty($_GET['d']) && $_GET['d'] != '1') { $delete_code = $_GET['d']; } -$update_period = ''; -if (isset($_GET['u']) && !empty($_GET['u'])) { - $update_period = $_GET['u']; -} - $crypt_key = ''; if (isset($_GET['k']) && !empty($_GET['k'])) { $crypt_key = $_GET['k']; @@ -77,14 +71,8 @@ if (isset($_GET['p']) && !empty($_GET['p'])) { $do_preview = true; } -// XXX KAZ -$do_update = false; -if (isset($_GET['u']) && !empty($_GET['u'])) { - $do_update = 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'). @@ -113,9 +101,8 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) { ' . t('TOS') . '.' ?> - - document.getElementById('submit_delete').submit ();"/> // ' + + onclick="document.getElementById('submit_delete_post').action='"/>

$link['time']) { jirafeau_delete_link($link_name); require(JIRAFEAU_ROOT.'lib/template/header.php'); @@ -162,39 +138,38 @@ if (!empty($link['key'])) { else { require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '
' . - '
'; require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; @@ -247,7 +222,6 @@ if (!$password_challenged && !$do_download && !$do_preview) { echo '&k=' . urlencode($crypt_key); } ?>'; document.getElementById('submit_post').submit ();"/>'; echo ''; @@ -263,23 +237,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. */ @@ -288,10 +275,9 @@ if ($link['crypted']) { } /* Read file. */ else { - $r = fopen(VAR_FILES . $p . $link['md5'], 'r'); + $r = fopen(VAR_FILES . $p . $link['hash'], 'r'); while (!feof($r)) { print fread($r, 1024); - ob_flush(); } fclose($r); }