X-Git-Url: https://git.p6c8.net/jirafeau.git/blobdiff_plain/ecfc8a70b8f33915e53ef2fc9ab14e77daa96e72..4dc05368251f5bb89a2780f5b1a4bd1866369bdd:/lib/functions.php?ds=inline diff --git a/lib/functions.php b/lib/functions.php index 4e22796..53733ca 100644 --- a/lib/functions.php +++ b/lib/functions.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 * Copyright (C) 2015 Nicola Spanti (RyDroid) * * This program is free software: you can redistribute it and/or modify @@ -192,12 +192,16 @@ function jirafeau_ini_to_bytes($value) switch (strtoupper($modifier)) { case 'P': $bytes *= 1024; + // no break case 'T': $bytes *= 1024; + // no break case 'G': $bytes *= 1024; + // no break case 'M': $bytes *= 1024; + // no break case 'K': $bytes *= 1024; } @@ -210,8 +214,10 @@ function jirafeau_ini_to_bytes($value) */ function jirafeau_get_max_upload_size_bytes() { - return min(jirafeau_ini_to_bytes(ini_get('post_max_size')), - jirafeau_ini_to_bytes(ini_get('upload_max_filesize'))); + return min( + jirafeau_ini_to_bytes(ini_get('post_max_size')), + jirafeau_ini_to_bytes(ini_get('upload_max_filesize')) + ); } /** @@ -321,7 +327,7 @@ function jirafeau_delete_file($hash) /** hash file's content - * @param $method hash method, see 'file_hash' option. 'md5' or 'md5_outside'. + * @param $method hash method, see 'file_hash' option. Valid methods are 'md5', 'md5_outside' or 'random' * @param $file_path file to hash * @returns hash string */ @@ -332,6 +338,8 @@ function jirafeau_hash_file($method, $file_path) return jirafeau_md5_outside($file_path); case 'md5': return md5_file($file_path); + case 'random': + return jirafeau_gen_random(32); } return md5_file($file_path); } @@ -343,22 +351,30 @@ function jirafeau_hash_file($method, $file_path) */ function jirafeau_md5_outside($file_path) { - $size = filesize($file_path); - if ($size === false) { - $size = 0; - } + $out = false; $handle = fopen($file_path, "r"); if ($handle === false) { return false; } + $size = filesize($file_path); + if ($size === false) { + goto err; + } $first = fread($handle, 64); if ($first === false) { - return false; + goto err; + } + if (fseek($handle, $size < 64 ? 0 : $size - 64) == -1) { + goto err; } - fseek($handle, $size < 64 ? 0 : $size - 64); $last = fread($handle, 64); + if ($last === false) { + goto err; + } + $out = md5($first . $last . $size); + err: fclose($handle); - return md5($first . $last . $size); + return $out; } /** @@ -449,10 +465,12 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l /* create link file */ $link_tmp_name = VAR_LINKS . $hash . rand(0, 10000) . '.tmp'; $handle = fopen($link_tmp_name, 'w'); - fwrite($handle, - $name . NL. $mime_type . NL. $size . NL. $password . NL. $time . + fwrite( + $handle, + $name . NL. $mime_type . NL. $size . NL. $password . NL. $time . NL . $hash. NL . ($one_time_download ? 'O' : 'R') . NL . time() . - NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O')); + NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O') + ); fclose($handle); $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length); $l = s2p("$hash_link"); @@ -559,6 +577,14 @@ function check_errors($cfg) if (!is_writable(VAR_ASYNC)) { add_error(t('ASYNC_DIR_W'), VAR_ASYNC); } + + if ($cfg['enable_crypt'] && $cfg['litespeed_workaround']) { + add_error(t('INCOMPATIBLE_OPTIONS_W'), 'enable_crypt=true
litespeed_workaround=true'); + } + + if ($cfg['one_time_download'] && $cfg['litespeed_workaround']) { + add_error(t('INCOMPATIBLE_OPTIONS_W'), 'one_time_download=true
litespeed_workaround=true'); + } } /** @@ -609,15 +635,9 @@ function jirafeau_admin_list($name, $file_hash, $link_hash) echo t('LS_FILES'); } echo ''; - echo ''; + echo '
'; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; echo ''; echo ''; @@ -654,22 +674,17 @@ function jirafeau_admin_list($name, $file_hash, $link_hash) echo ''; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
' . t('FILENAME') . '' . t('TYPE') . '' . t('SIZE') . '' . t('EXPIRE') . '' . t('ONETIME') . '' . t('UPLOAD_DATE') . '' . t('ORIGIN') . '' . t('ACTION') . '
' . '' . jirafeau_escape($l['file_name']) . ''; - echo '' . jirafeau_escape($l['mime_type']) . '' . jirafeau_human_size($l['file_size']) . '' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . ''; - if ($l['onetime'] == 'O') { - echo 'Y'; - } else { - echo 'N'; + t('DL_PAGE') . '">' . jirafeau_escape($l['file_name']) . '
'; + echo t('TYPE') . ': ' . jirafeau_escape($l['mime_type']) . '
'; + echo t('SIZE') . ': ' . jirafeau_human_size($l['file_size']) . '
'; + echo t('EXPIRE') . ': ' . ($l['time'] == -1 ? '∞' : jirafeau_get_datetimefield($l['time'])) . '
'; + echo t('ONETIME') . ': ' . ($l['onetime'] == 'O' ? 'Yes' : 'No') . '
'; + echo t('UPLOAD_DATE') . ': ' . jirafeau_get_datetimefield($l['upload_date']) . '
'; + if (strlen($l['ip']) > 0) { + echo t('ORIGIN') . ': ' . $l['ip'] . '
'; } - echo '		' . jirafeau_get_datetimefield($l['upload_date']) . '' . $l['ip'] . '' . - '
' . + echo '
'; + echo '' . '' . '' . jirafeau_admin_csrf_field() . @@ -773,6 +788,95 @@ function jirafeau_admin_clean_async() } return $count; } + +/** + * Better strval function for debug purposes + */ +function jirafeau_strval($value) +{ + if (gettype($value) == "boolean") { + return $value ? 'true' : 'false'; + } + return strval($value); +} + +/** + * Show file/folder permissions + */ +function jirafeau_fileperms($path) +{ + $out = substr(sprintf("%o", @fileperms($path)), -4) . ", "; + $out .= "read " . (is_readable($path) ? "OK" : "KO") . ", "; + $out .= "write " . (is_writable($path) ? "OK" : "KO"); + return $out; +} + +/** + * Show some useful informations for bug reporting. + */ +function jirafeau_admin_bug_report($cfg) +{ + $out = "
" . t('REPORTING_AN_ISSUE') . ""; + $out .= "If you have a problem related to Jirafeau, please open an issue, explain your problem in english and copy-paste the following content:

"; + + $out .= "# Jirafeau
"; + $out .= "- version: " . JIRAFEAU_VERSION . "
"; + $jirafeau_options = [ + 'debug', + 'file_hash', + 'litespeed_workaround', + 'store_uploader_ip', + 'installation_done', + 'enable_crypt', + 'preview', + 'maximal_upload_size', + 'store_uploader_ip' + ]; + foreach ($jirafeau_options as &$o) { + $v = $cfg[$o]; + $out .= "- $o: " . jirafeau_strval($v) . " (" . gettype($v) . ")
"; + } + $out .= "
"; + + $out .= "# PHP options
"; + $out .= "- php version: " . phpversion() . "
"; + $out .= "- mcrypt version: " . phpversion('mcrypt') . "
"; + $php_options = [ + 'post_max_size', + 'upload_max_filesize' + ]; + foreach ($php_options as &$o) { + $v = ini_get($o); + $out .= "- $o: " . jirafeau_strval($v) . " (" . gettype($v). ")
"; + } + $out .= "
"; + + $out .= "# File permissions
"; + $out .= "- 'var' folder permissions: " . jirafeau_fileperms($cfg['var_root']) . "
"; + $out .= "- 'file' folder permissions: " . jirafeau_fileperms(VAR_FILES) . "
"; + $out .= "- 'links' folder permissions: " . jirafeau_fileperms(VAR_LINKS) . "
"; + $out .= "- 'async' folder permissions: " . jirafeau_fileperms(VAR_ASYNC) . "
"; + $out .= "
"; + + $out .= "# Server details
"; + $out .= "- server software: " . $_SERVER["SERVER_SOFTWARE"] . "
"; + $out .= "
"; + + $out .= "# OS details
"; + $out .= "- OS: " . php_uname() . "
"; + $out .= "
"; + + $out .= "# Browser details
"; + $out .= ""; + $out .= "
"; + return $out; +} + /** * Read async transfert informations * @return array containing informations. @@ -848,6 +952,10 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) return; } + /* touch empty data file */ + $w_path = $p . $ref . '_data'; + touch($w_path); + /* md5 password or empty */ $password = ''; if (!empty($key)) { @@ -857,11 +965,13 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) /* Store informations. */ $p .= $ref; $handle = fopen($p, 'w'); - fwrite($handle, - str_replace(NL, '', trim($filename)) . NL . + fwrite( + $handle, + str_replace(NL, '', trim($filename)) . NL . str_replace(NL, '', trim($type)) . NL . $password . NL . $time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL . - time() . NL . $code . NL); + time() . NL . $code . NL + ); fclose($handle); return $ref . NL . $code ; @@ -919,10 +1029,12 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) /* Update async file. */ $code = jirafeau_gen_random(4); $handle = fopen(VAR_ASYNC . $p . $ref, 'w'); - fwrite($handle, - $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL . + fwrite( + $handle, + $a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL . $a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL . - time() . NL . $code . NL); + time() . NL . $code . NL + ); fclose($handle); return $code; } @@ -986,16 +1098,18 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m /* Create link. */ $link_tmp_name = VAR_LINKS . $hash . rand(0, 10000) . '.tmp'; $handle = fopen($link_tmp_name, 'w'); - fwrite($handle, - $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL . + fwrite( + $handle, + $a['file_name'] . NL . $a['mime_type'] . NL . $size . NL . $a['key'] . NL . $a['time'] . NL . $hash . NL . $a['onetime'] . NL . - time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O')); + time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O') + ); fclose($handle); $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length); $l = s2p("$hash_link"); if (!@mkdir(VAR_LINKS . $l, 0755, true) || !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) { - echo "Error"; + return 'Error'; } /* Clean async upload. */ @@ -1143,7 +1257,8 @@ function jirafeau_challenge_ip($allowedIpList, $challengedIp) * Check if Jirafeau has a restriction on the IP address for uploading. * @return true if uploading is IP restricted, false otherwise. */ -function jirafeau_upload_has_ip_restriction($cfg) { +function jirafeau_upload_has_ip_restriction($cfg) +{ return count($cfg['upload_ip']) > 0; } @@ -1181,7 +1296,7 @@ function jirafeau_challenge_upload_ip_without_password($cfg, $challengedIp) * @param $password password to be challenged * @return true if access is valid, false otherwise. */ -function jirafeau_challenge_upload ($cfg, $ip, $password) +function jirafeau_challenge_upload($cfg, $ip, $password) { return jirafeau_challenge_upload_ip_without_password($cfg, $ip) || (!jirafeau_has_upload_password($cfg) && !jirafeau_upload_has_ip_restriction($cfg)) || @@ -1326,3 +1441,84 @@ function jirafeau_admin_csrf_field() { return ""; } + +function jirafeau_dir_size($dir) +{ + $size = 0; + foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $entry) { + $size += is_file($entry) ? filesize($entry) : jirafeau_dir_size($entry); + } + return $size; +} + +function jirafeau_export_cfg($cfg) +{ + $content = ' true, + 'why' => $mkdir_str1 . '
' . + $path . '
' . $solution_str . + '
' . $mkdir_str2); + } + + foreach (array('files', 'links', 'async') as $subdir) { + $subpath = $path.$subdir; + + if (!jirafeau_mkdir($subpath) || !jirafeau_is_writable($subpath)) { + return array('has_error' => true, + 'why' => $mkdir_str1 . '
' . + $subpath . '
' . $solution_str . + '
' . $mkdir_str2); + } + } + + return array('has_error' => false, 'why' => ''); +} + +function jirafeau_add_ending_slash($path) +{ + return $path . ((substr($path, -1) == '/') ? '' : '/'); +} + +function jirafeau_default_web_root() +{ + return $_SERVER['HTTP_HOST'] . str_replace(basename(__FILE__), '', $_SERVER['REQUEST_URI']); +}