X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/blobdiff_plain/f65244fc26208f942fbe5e5cdf5a6570dc493005..6d2f72029699314db90926f57861154ae76d3852:/lib/functions.php?ds=inline diff --git a/lib/functions.php b/lib/functions.php index 99c11ec..5800190 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 @@ -20,14 +20,21 @@ */ /** - * Transform a string in a path by seperating each letters by a '/'. + * Transform a string in a path by separating each letters by a '/'. * @return path finishing with a '/' */ function s2p($s) { + $block_size = 8; $p = ''; for ($i = 0; $i < strlen($s); $i++) { - $p .= $s{$i} . '/'; + $p .= $s[$i]; + if (($i + 1) % $block_size == 0) { + $p .= '/'; + } + } + if (strlen($s) % $block_size != 0) { + $p .= '/'; } return $p; } @@ -61,16 +68,16 @@ function base_16_to_64($num) # Convert long hex string to bin. $size = strlen($num); for ($i = 0; $i < $size; $i++) { - $b .= $hex2bin{hexdec($num{$i})}; + $b .= $hex2bin[hexdec($num[$i])]; } # Convert long bin to base 64. $size *= 4; for ($i = $size - 6; $i >= 0; $i -= 6) { - $o = $m{bindec(substr($b, $i, 6))} . $o; + $o = $m[bindec(substr($b, $i, 6))] . $o; } # Some few bits remaining ? if ($i < 0 && $i > -6) { - $o = $m{bindec(substr($b, 0, $i + 6))} . $o; + $o = $m[bindec(substr($b, 0, $i + 6))] . $o; } return $o; } @@ -120,6 +127,26 @@ function jirafeau_human_size($octets) return round($o, 1) . $u[$p]; } +// Convert UTC timestamp to a datetime field +function jirafeau_get_datetimefield($timestamp) +{ + $content = '' + . strftime('%Y-%m-%d %H:%M', $timestamp) . ' (GMT)'; + return $content; +} + +function jirafeau_fatal_error($errorText, $cfg = array()) +{ + echo '

Error

' . $errorText . '

'; + require(JIRAFEAU_ROOT . 'lib/template/footer.php'); + exit; +} + +function jirafeau_non_fatal_error($errorText) +{ + echo '

' . $errorText . '

'; +} + function jirafeau_clean_rm_link($link) { $p = s2p("$link"); @@ -137,10 +164,10 @@ function jirafeau_clean_rm_link($link) } } -function jirafeau_clean_rm_file($md5) +function jirafeau_clean_rm_file($hash) { - $p = s2p("$md5"); - $f = VAR_FILES . $p . $md5; + $p = s2p("$hash"); + $f = VAR_FILES . $p . $hash; if (file_exists($f) && is_file($f)) { unlink($f); } @@ -168,16 +195,23 @@ function jirafeau_ini_to_bytes($value) $modifier = substr($value, -1); $bytes = substr($value, 0, -1); switch (strtoupper($modifier)) { - case 'P': - $bytes *= 1024; - case 'T': - $bytes *= 1024; - case 'G': - $bytes *= 1024; - case 'M': - $bytes *= 1024; - case 'K': - $bytes *= 1024; + default: + return intval($value); + break; + 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; } return $bytes; } @@ -188,8 +222,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')) + ); } /** @@ -198,9 +234,31 @@ function jirafeau_get_max_upload_size_bytes() */ function jirafeau_get_max_upload_size() { - return jirafeau_human_size( - min(jirafeau_ini_to_bytes(ini_get('post_max_size')), - jirafeau_ini_to_bytes(ini_get('upload_max_filesize')))); + return jirafeau_human_size(jirafeau_get_max_upload_size_bytes()); +} + +/** + * get the maximal upload size for a data chunk in async uploads + * @param max_upload_chunk_size_bytes + */ +function jirafeau_get_max_upload_chunk_size_bytes($max_upload_chunk_size_bytes = 0) +{ + if ($max_upload_chunk_size_bytes == 0) { + $size = jirafeau_get_max_upload_size_bytes(); + // Jirafeau must choose an arbitrary number as PHP config does not give any limit nor $max_upload_chunk_size_bytes + if ($size == 0) { + return 10000000; // 10MB + } + return $size; + } + $size = min( + jirafeau_get_max_upload_size_bytes(), + $max_upload_chunk_size_bytes + ); + if ($size == 0) { + return $max_upload_chunk_size_bytes; + } + return $size; } /** @@ -211,19 +269,19 @@ function jirafeau_get_max_upload_size() function jirafeau_upload_errstr($code) { switch ($code) { - case UPLOAD_ERR_INI_SIZE: - case UPLOAD_ERR_FORM_SIZE: - return t('Your file exceeds the maximum authorized file size. '); + case UPLOAD_ERR_INI_SIZE: + case UPLOAD_ERR_FORM_SIZE: + return t('Your file exceeds the maximum authorized file size. '); - case UPLOAD_ERR_PARTIAL: - case UPLOAD_ERR_NO_FILE: - return - t('Your file was not uploaded correctly. You may succeed in retrying. '); + case UPLOAD_ERR_PARTIAL: + case UPLOAD_ERR_NO_FILE: + return + t('Your file was not uploaded correctly. You may succeed in retrying. '); - case UPLOAD_ERR_NO_TMP_DIR: - case UPLOAD_ERR_CANT_WRITE: - case UPLOAD_ERR_EXTENSION: - return t('Internal error. You may not succeed in retrying. '); + case UPLOAD_ERR_NO_TMP_DIR: + case UPLOAD_ERR_CANT_WRITE: + case UPLOAD_ERR_EXTENSION: + return t('Internal error. You may not succeed in retrying. '); } return t('Unknown error. '); } @@ -241,31 +299,31 @@ function jirafeau_delete_link($link) jirafeau_clean_rm_link($link); - $md5 = $l['md5']; - $p = s2p("$md5"); + $hash = $l['hash']; + $p = s2p("$hash"); $counter = 1; - if (file_exists(VAR_FILES . $p . $md5. '_count')) { - $content = file(VAR_FILES . $p . $md5. '_count'); + if (file_exists(VAR_FILES . $p . $hash. '_count')) { + $content = file(VAR_FILES . $p . $hash. '_count'); $counter = trim($content[0]); } $counter--; if ($counter >= 1) { - $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w'); + $handle = fopen(VAR_FILES . $p . $hash. '_count', 'w'); fwrite($handle, $counter); fclose($handle); } if ($counter == 0) { - jirafeau_clean_rm_file($md5); + jirafeau_clean_rm_file($hash); } } /** * Delete a file and it's links. */ -function jirafeau_delete_file($md5) +function jirafeau_delete_file($hash) { $count = 0; /* Get all links files. */ @@ -288,17 +346,69 @@ function jirafeau_delete_file($md5) if (!count($l)) { continue; } - if ($l['md5'] == $md5) { + if ($l['hash'] == $hash) { $count++; jirafeau_delete_link($node); } } } } - jirafeau_clean_rm_file($md5); + jirafeau_clean_rm_file($hash); return $count; } + +/** hash file's content + * @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 + */ +function jirafeau_hash_file($method, $file_path) +{ + switch ($method) { + case 'md5_outside': + 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); +} + +/** hash part of file: start, end and size. + * This is a partial file hash, faster but weaker. + * @param $file_path file to hash + * @returns hash string + */ +function jirafeau_md5_outside($file_path) +{ + $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) { + goto err; + } + if (fseek($handle, $size < 64 ? 0 : $size - 64) == -1) { + goto err; + } + $last = fread($handle, 64); + if ($last === false) { + goto err; + } + $out = md5($first . $last . $size); + err: + fclose($handle); + return $out; +} + /** * handles an uploaded file * @param $file the file struct given by $_FILE[] @@ -313,7 +423,7 @@ function jirafeau_delete_file($md5) * 'link' => the link name of the uploaded file * 'delete_link' => the link code to delete file */ -function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length) +function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method) { if (empty($file['tmp_name']) || !is_uploaded_file($file['tmp_name'])) { return (array( @@ -340,73 +450,75 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l } } - /* file informations */ - $md5 = md5_file($file['tmp_name']); + /* file information */ + $hash = jirafeau_hash_file($file_hash_method, $file['tmp_name']); $name = str_replace(NL, '', trim($file['name'])); $mime_type = $file['type']; $size = $file['size']; /* does file already exist ? */ $rc = false; - $p = s2p("$md5"); - if (file_exists(VAR_FILES . $p . $md5)) { + $p = s2p("$hash"); + if (file_exists(VAR_FILES . $p . $hash)) { $rc = unlink($file['tmp_name']); } elseif ((file_exists(VAR_FILES . $p) || @mkdir(VAR_FILES . $p, 0755, true)) - && move_uploaded_file($file['tmp_name'], VAR_FILES . $p . $md5)) { + && move_uploaded_file($file['tmp_name'], VAR_FILES . $p . $hash)) { $rc = true; } if (!$rc) { return (array( 'error' => array('has_error' => true, - 'why' => t('Internal error during file creation.')), + 'why' => t('INTERNAL_ERROR_DEL')), 'link' =>'', 'delete_link' => '')); } /* Increment or create count file. */ $counter = 0; - if (file_exists(VAR_FILES . $p . $md5 . '_count')) { - $content = file(VAR_FILES . $p . $md5. '_count'); + if (file_exists(VAR_FILES . $p . $hash . '_count')) { + $content = file(VAR_FILES . $p . $hash. '_count'); $counter = trim($content[0]); } $counter++; - $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w'); + $handle = fopen(VAR_FILES . $p . $hash. '_count', 'w'); fwrite($handle, $counter); fclose($handle); /* Create delete code. */ $delete_link_code = jirafeau_gen_random(5); - /* md5 password or empty. */ + /* hash password or empty. */ $password = ''; if (!empty($key)) { $password = md5($key); } /* create link file */ - $link_tmp_name = VAR_LINKS . $md5 . rand(0, 10000) . '.tmp'; + $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 . - NL . $md5. NL . ($one_time_download ? 'O' : 'R') . NL . time() . - NL . $ip . NL. $delete_link_code . NL . ($crypted ? 'C' : 'O')); + 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') + ); fclose($handle); - $md5_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length); - $l = s2p("$md5_link"); + $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 . $md5_link)) { + !rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) { if (file_exists($link_tmp_name)) { unlink($link_tmp_name); } $counter--; if ($counter >= 1) { - $handle = fopen(VAR_FILES . $p . $md5. '_count', 'w'); + $handle = fopen(VAR_FILES . $p . $hash. '_count', 'w'); fwrite($handle, $counter); fclose($handle); } else { - jirafeau_clean_rm_file($md5_link); + jirafeau_clean_rm_file($hash_link); } return array( 'error' => @@ -416,7 +528,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l 'delete_link' => ''); } return array( 'error' => $noerr, - 'link' => $md5_link, + 'link' => $hash_link, 'delete_link' => $delete_link_code, 'crypt_key' => $crypt_key); } @@ -429,10 +541,15 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l function jirafeau_is_viewable($mime) { if (!empty($mime)) { - /* Actually, verify if mime-type is an image or a text. */ - $viewable = array('image', 'text', 'video', 'audio'); + $viewable = array('image', 'video', 'audio'); $decomposed = explode('/', $mime); - return in_array($decomposed[0], $viewable); + if (in_array($decomposed[0], $viewable) && strpos($mime, 'image/svg+xml') === false) { + return true; + } + $viewable = array('text/plain'); + if (in_array($mime, $viewable)) { + return true; + } } return false; } @@ -479,32 +596,47 @@ function show_errors() function check_errors($cfg) { - if (file_exists(JIRAFEAU_ROOT . 'install.php') - && !($cfg['installation_done'] === true)) { - header('Location: install.php'); - exit; + if (!($cfg['installation_done'] === true)) { + if (file_exists(JIRAFEAU_ROOT . 'install.php')) { + header('Location: install.php'); + exit; + } else { + add_error(t('INSTALL_FILE_NOT_FOUND_TITLE'), t('INSTALL_FILE_NOT_FOUND_DESC')); + } } - /* check if the destination dirs are writable */ - $writable = is_writable(VAR_FILES) && is_writable(VAR_LINKS); - - /* Checking for errors. */ if (!is_writable(VAR_FILES)) { - add_error(t('The file directory is not writable!'), VAR_FILES); + add_error(t('FILE_DIR_W'), VAR_FILES); } if (!is_writable(VAR_LINKS)) { - add_error(t('The link directory is not writable!'), VAR_LINKS); + add_error(t('LINK_DIR_W'), VAR_LINKS); } if (!is_writable(VAR_ASYNC)) { - add_error(t('The async directory is not 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'); + } + if ($cfg['upload_ldap_auth'] === true) { + if (sizeof($cfg['upload_password']) > 0) { + add_error(t('INCOMPATIBLE_OPTIONS_W'), 'upload_ldap_auth=true
sizeof(upload_password) > 0'); + } + if (sizeof($cfg['upload_ip_nopassword']) > 0) { + add_error(t('INCOMPATIBLE_OPTIONS_W'), 'upload_ldap_auth=true
sizeof(upload_ip_nopassword) > 0'); + } } } /** - * Read link informations - * @return array containing informations. + * Read link information + * @return array containing information. */ function jirafeau_get_link($hash) { @@ -521,7 +653,7 @@ function jirafeau_get_link($hash) $out['file_size'] = trim($c[2]); $out['key'] = trim($c[3], NL); $out['time'] = trim($c[4]); - $out['md5'] = trim($c[5]); + $out['hash'] = trim($c[5]); $out['onetime'] = trim($c[6]); $out['upload_date'] = trim($c[7]); $out['ip'] = trim($c[8]); @@ -538,28 +670,22 @@ function jirafeau_admin_list($name, $file_hash, $link_hash) { echo '
'; if (!empty($name)) { - echo t('Filename') . ": $name "; + echo t('FILENAME') . ": " . jirafeau_escape($name); } if (!empty($file_hash)) { - echo t('file') . ": $file_hash "; + echo t('FILE') . ": " . jirafeau_escape($file_hash); } if (!empty($link_hash)) { - echo t('link') . ": $link_hash "; + echo t('LINK') . ": " . jirafeau_escape($link_hash); } if (empty($name) && empty($file_hash) && empty($link_hash)) { - echo t('List all files'); + echo t('LS_FILES'); } echo ''; echo ''; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; /* Get all links files. */ @@ -575,56 +701,53 @@ function jirafeau_admin_list($name, $file_hash, $link_hash) /* Push new found directory. */ $stack[] = $d . $node . '/'; } elseif (is_file($d . $node)) { - /* Read link informations. */ + /* Read link information. */ $l = jirafeau_get_link($node); if (!count($l)) { continue; } /* Filter. */ - if (!empty($name) && !preg_match("/$name/i", htmlspecialchars($l['file_name']))) { + if (!empty($name) && !@preg_match("/$name/i", jirafeau_escape($l['file_name']))) { continue; } - if (!empty($file_hash) && $file_hash != $l['md5']) { + if (!empty($file_hash) && $file_hash != $l['hash']) { continue; } if (!empty($link_hash) && $link_hash != $node) { continue; } - /* Print link informations. */ + /* Print link information. */ echo ''; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; echo ''; @@ -656,15 +779,15 @@ function jirafeau_admin_clean() /* Push new found directory. */ $stack[] = $d . $node . '/'; } elseif (is_file($d . $node)) { - /* Read link informations. */ + /* Read link information. */ $l = jirafeau_get_link(basename($node)); if (!count($l)) { continue; } - $p = s2p($l['md5']); + $p = s2p($l['hash']); if ($l['time'] > 0 && $l['time'] < time() || // expired - !file_exists(VAR_FILES . $p . $l['md5']) || // invalid - !file_exists(VAR_FILES . $p . $l['md5'] . '_count')) { // invalid + !file_exists(VAR_FILES . $p . $l['hash']) || // invalid + !file_exists(VAR_FILES . $p . $l['hash'] . '_count')) { // invalid jirafeau_delete_link($node); $count++; } @@ -676,7 +799,7 @@ function jirafeau_admin_clean() /** - * Clean old async transferts. + * Clean old async transfers. * @return number of cleaned files. */ function jirafeau_admin_clean_async() @@ -697,12 +820,12 @@ function jirafeau_admin_clean_async() /* Push new found directory. */ $stack[] = $d . $node . '/'; } elseif (is_file($d . $node)) { - /* Read async informations. */ + /* Read async information. */ $a = jirafeau_get_async_ref(basename($node)); if (!count($a)) { continue; } - /* Delete transferts older than 1 hour. */ + /* Delete transfers older than 1 hour. */ if (time() - $a['last_edited'] > 3600) { jirafeau_async_delete(basename($node)); $count++; @@ -712,9 +835,108 @@ 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', + 'max_upload_chunk_size_bytes' + ]; + 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', + 'safe_mode', + 'max_execution_time', + 'max_input_time' + ]; + foreach ($php_options as &$o) { + $v = ini_get($o); + $out .= "- $o: " . jirafeau_strval($v) . " (" . gettype($v). ")
"; + } + $out .= "- can set_time_limit: " . (set_time_limit(0) ? "yes" : "no") . "
"; + $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 .= "
"; + + $out .= "# Memory
"; + $out .= "- memory_get_peak_usage: " . jirafeau_human_size(memory_get_peak_usage()) . "
"; + + $out .= "
"; + return $out; +} + /** - * Read async transfert informations - * @return array containing informations. + * Read async transfer information + * @return array containing information. */ function jirafeau_get_async_ref($ref) { @@ -738,7 +960,7 @@ function jirafeau_get_async_ref($ref) } /** - * Delete async transfert informations + * Delete async transfer information */ function jirafeau_async_delete($ref) { @@ -762,17 +984,15 @@ function jirafeau_async_delete($ref) /** * Init a new asynchronous upload. - * @param $finename Name of the file to send + * @param $filename Name of the file to send * @param $one_time One time upload parameter * @param $key eventual password (or blank) * @param $time time limit * @param $ip ip address of the client - * @return a string containing a temporary reference followed by a code or the string 'Error' + * @return a string containing a temporary reference followed by a code or a string starting with 'Error' */ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) { - $res = 'Error'; - /* Create temporary folder. */ $ref; $p; @@ -783,24 +1003,29 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) } while (file_exists($p)); @mkdir($p, 0755, true); if (!file_exists($p)) { - echo 'Error'; - return; + return 'Error: cannot create async folder.'; } + /* touch empty data file */ + $w_path = $p . $ref . '_data'; + touch($w_path); + /* md5 password or empty */ $password = ''; if (!empty($key)) { $password = md5($key); } - /* Store informations. */ + /* Store information. */ $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 ; @@ -812,7 +1037,7 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) * @param $file piece of data * @param $code client code for this operation * @param $max_file_size maximum allowed file size - * @return a string containing a next code to use or the string "Error" + * @return a string containing a next code to use or a string starting with 'Error' */ function jirafeau_async_push($ref, $data, $code, $max_file_size) { @@ -820,11 +1045,22 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) $a = jirafeau_get_async_ref($ref); /* Check some errors. */ - if (count($a) == 0 - || $a['next_code'] != "$code" - || empty($data['tmp_name']) - || !is_uploaded_file($data['tmp_name'])) { - return 'Error'; + if (count($a) == 0) { + return "Error: cannot find transfer"; + } + if ($a['next_code'] != "$code") { + return "Error: bad transfer code"; + } + if ($data['error'] != UPLOAD_ERR_OK) { + // Check error code in https://www.php.net/manual/en/features.file-upload.errors.php + $data_details = print_r($data, true); + return "Error: upload error: {$data_details}"; + } + if (empty($data['tmp_name'])) { + return "Error: missing tmp_name"; + } + if (!is_uploaded_file($data['tmp_name'])) { + return "Error: tmp_name may not be uploaded"; } $p = s2p($ref); @@ -837,7 +1073,7 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) if ($max_file_size > 0 && filesize($r_path) + filesize($w_path) > $max_file_size * 1024 * 1024) { jirafeau_async_delete($ref); - return 'Error'; + return "Error: file size is above upload limit"; } /* Concatenate data. */ @@ -848,7 +1084,7 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) fclose($r); fclose($w); jirafeau_async_delete($ref); - return 'Error'; + return "Error: cannot write file"; } } fclose($r); @@ -858,35 +1094,37 @@ 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; } /** - * Finalyze an asynchronous upload. + * Finalize an asynchronous upload. * @param $ref asynchronous upload reference * @param $code client code for this operation * @param $crypt boolean asking to crypt or not * @param $link_name_length link name length - * @return a string containing the download reference followed by a delete code or the string 'Error' + * @return a string containing the download reference followed by a delete code or a string starting with 'Error' */ -function jirafeau_async_end($ref, $code, $crypt, $link_name_length) +function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_method) { /* Get async infos. */ $a = jirafeau_get_async_ref($ref); if (count($a) == 0 || $a['next_code'] != "$code") { - return "Error"; + return "Error: bad code for ending transfer"; } /* Generate link infos. */ $p = VAR_ASYNC . s2p($ref) . $ref . "_data"; if (!file_exists($p)) { - return 'Error'; + return "Error: referenced file does not exist"; } $crypted = false; @@ -898,48 +1136,52 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length) } } - $md5 = md5_file($p); + $hash = jirafeau_hash_file($file_hash_method, $p); $size = filesize($p); - $np = s2p($md5); + $np = s2p($hash); $delete_link_code = jirafeau_gen_random(5); /* File already exist ? */ if (!file_exists(VAR_FILES . $np)) { @mkdir(VAR_FILES . $np, 0755, true); } - if (!file_exists(VAR_FILES . $np . $md5)) { - rename($p, VAR_FILES . $np . $md5); + if (!file_exists(VAR_FILES . $np . $hash)) { + rename($p, VAR_FILES . $np . $hash); } /* Increment or create count file. */ $counter = 0; - if (file_exists(VAR_FILES . $np . $md5 . '_count')) { - $content = file(VAR_FILES . $np . $md5. '_count'); + if (file_exists(VAR_FILES . $np . $hash . '_count')) { + $content = file(VAR_FILES . $np . $hash. '_count'); $counter = trim($content[0]); } $counter++; - $handle = fopen(VAR_FILES . $np . $md5. '_count', 'w'); + $handle = fopen(VAR_FILES . $np . $hash. '_count', 'w'); fwrite($handle, $counter); fclose($handle); /* Create link. */ - $link_tmp_name = VAR_LINKS . $md5 . rand(0, 10000) . '.tmp'; + $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 . - $a['key'] . NL . $a['time'] . NL . $md5 . NL . $a['onetime'] . NL . - time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O')); + 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') + ); fclose($handle); - $md5_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length); - $l = s2p("$md5_link"); - if (!@mkdir(VAR_LINKS . $l, 0755, true) || - !rename($link_tmp_name, VAR_LINKS . $l . $md5_link)) { - echo "Error"; + $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)) { + return "Error: cannot create folder in LINKS"; + } + if (!rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) { + return "Error: cannot rename file in LINKS"; } /* Clean async upload. */ jirafeau_async_delete($ref); - return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key); + return $hash_link . NL . $delete_link_code . NL . urlencode($crypt_key); } function jirafeau_crypt_create_iv($base, $size) @@ -969,10 +1211,10 @@ function jirafeau_encrypt_file($fp_src, $fp_dst) $m = mcrypt_module_open('rijndael-256', '', 'ofb', ''); /* Generate key. */ $crypt_key = jirafeau_gen_random(10); - $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); /* Crypt file. */ $r = fopen($fp_src, 'r'); $w = fopen($fp_dst, 'c'); @@ -1008,8 +1250,8 @@ function jirafeau_decrypt_file($fp_src, $fp_dst, $k) $m = mcrypt_module_open('rijndael-256', '', 'ofb', ''); /* Extract key and iv. */ $crypt_key = $k; - $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)); /* Decrypt file. */ $r = fopen($fp_src, 'r'); $w = fopen($fp_dst, 'c'); @@ -1055,23 +1297,22 @@ function jirafeau_challenge_upload_password($cfg, $password) } /** - * Test if visitor's IP is authorized to upload. - * @param $ip IP to be challenged + * Test if the given IP is whitelisted by the given list. + * + * @param $allowedIpList array of allowed IPs + * @param $challengedIp IP to be challenged * @return true if IP is authorized, false otherwise. */ -function jirafeau_challenge_upload_ip($cfg, $ip) +function jirafeau_challenge_ip($allowedIpList, $challengedIp) { - if (count($cfg['upload_ip']) == 0) { - return true; - } - foreach ($cfg['upload_ip'] as $i) { - if ($i == $ip) { + foreach ($allowedIpList as $i) { + if ($i == $challengedIp) { return true; } // CIDR test for IPv4 only. if (strpos($i, '/') !== false) { list($subnet, $mask) = explode('/', $i); - if ((ip2long($ip) & ~((1 << (32 - $mask)) - 1)) == ip2long($subnet)) { + if ((ip2long($challengedIp) & ~((1 << (32 - $mask)) - 1)) == ip2long($subnet)) { return true; } } @@ -1079,43 +1320,54 @@ function jirafeau_challenge_upload_ip($cfg, $ip) return false; } +/** + * 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) +{ + return count($cfg['upload_ip']) > 0; +} + +/** + * Test if visitor's IP is authorized to upload at all. + * + * @param $cfg configuration + * @param $challengedIp IP to be challenged + * @return true if IP is authorized, false otherwise. + */ +function jirafeau_challenge_upload_ip($cfg, $challengedIp) +{ + // If no IP address have been listed, allow upload from any IP + if (!jirafeau_upload_has_ip_restriction($cfg)) { + return true; + } + return jirafeau_challenge_ip($cfg['upload_ip'], $challengedIp); +} + +/** + * Test if visitor's IP is authorized to upload without a password. + * + * @param $cfg configuration + * @param $challengedIp IP to be challenged + * @return true if IP is authorized, false otherwise. + */ +function jirafeau_challenge_upload_ip_without_password($cfg, $challengedIp) +{ + return jirafeau_challenge_ip($cfg['upload_ip_nopassword'], $challengedIp); +} + /** * Test if visitor's IP is authorized or password is supplied and authorized * @param $ip IP to be challenged * @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) { - // Allow if no ip restrictaion and no password restriction - if ((count ($cfg['upload_ip']) == 0) and (count ($cfg['upload_password']) == 0)) { - return true; - } - - // Allow if ip is in array - foreach ($cfg['upload_ip'] as $i) { - if ($i == $ip) { - return true; - } - // CIDR test for IPv4 only. - if (strpos ($i, '/') !== false) - { - list ($subnet, $mask) = explode('/', $i); - if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet)) { - return true; - } - } - } - if (!jirafeau_has_upload_password($cfg)) { - return false; - } - - foreach ($cfg['upload_password'] as $p) { - if ($password == $p) { - return true; - } - } - return false; + return jirafeau_challenge_upload_ip_without_password($cfg, $ip) || + (!jirafeau_has_upload_password($cfg) && !jirafeau_upload_has_ip_restriction($cfg)) || + (jirafeau_challenge_upload_password($cfg, $password) && jirafeau_challenge_upload_ip($cfg, $ip)); } /** Tell if we have some HTTP headers generated by a proxy */ @@ -1197,210 +1449,200 @@ function hex_to_base64($hex) } /** - * Read alias informations - * @return array containing informations. + * Replace markers in templates. + * + * Available markers have the scheme "###MARKERNAME###". + * + * @param $content string Template text with markers + * @param $htmllinebreaks boolean Convert linebreaks to BR-Tags + * @return Template with replaced markers */ -function jirafeau_get_alias($hash) +function jirafeau_replace_markers($content, $htmllinebreaks = false) { - $out = array(); - $link = VAR_ALIAS . s2p("$hash") . $hash; + $patterns = array( + '/###ORGANISATION###/', + '/###CONTACTPERSON###/', + '/###WEBROOT###/' + ); + $replacements = array( + $GLOBALS['cfg']['organisation'], + $GLOBALS['cfg']['contactperson'], + $GLOBALS['cfg']['web_root'] + ); + $content = preg_replace($patterns, $replacements, $content); - if (!file_exists($link)) { - return $out; + if (true === $htmllinebreaks) { + $content = nl2br($content); } - $c = file($link); - $out['md5_password'] = trim($c[0]); - $out['ip'] = trim($c[1]); - $out['update_date'] = trim($c[2]); - $out['destination'] = trim($c[3], NL); - - return $out; + return $content; } -/** Create an alias to a jirafeau's link. - * @param $alias alias name - * @param $destination reference of the destination - * @param $password password to protect alias - * @param $ip client's IP - * @return a string containing the edit code of the alias or the string "Error" - */ -function jirafeau_alias_create($alias, $destination, $password, $ip) +function jirafeau_escape($string) { - /* Check that alias and password are long enough. */ - if (strlen($alias) < 8 || - strlen($alias) > 32 || - strlen($password) < 8 || - strlen($password) > 32) { - return 'Error'; - } + return htmlspecialchars($string, ENT_QUOTES); +} - /* Check that destination exists. */ - $l = jirafeau_get_link($destination); - if (!count($l)) { - return 'Error'; - } +function jirafeau_admin_session_start() +{ + $_SESSION['admin_auth'] = true; + $_SESSION['admin_csrf'] = md5(uniqid(mt_rand(), true)); +} - /* Check that alias does not already exists. */ - $alias = md5($alias); - $p = VAR_ALIAS . s2p($alias); - if (file_exists($p)) { - return 'Error'; - } +function jirafeau_session_end() +{ + $_SESSION = array(); + session_destroy(); +} - /* Create alias folder. */ - @mkdir($p, 0755, true); - if (!file_exists($p)) { - return 'Error'; - } +function jirafeau_admin_session_logged() +{ + return isset($_SESSION['admin_auth']) && + isset($_SESSION['admin_csrf']) && + isset($_POST['admin_csrf']) && + $_SESSION['admin_auth'] === true && + $_SESSION['admin_csrf'] === $_POST['admin_csrf']; +} - /* Generate password. */ - $md5_password = md5($password); +function jirafeau_admin_csrf_field() +{ + return ""; +} - /* Store informations. */ - $p .= $alias; - $handle = fopen($p, 'w'); - fwrite($handle, - $md5_password . NL . - $ip . NL . - time() . NL . - $destination . NL); - fclose($handle); +function jirafeau_user_session_start() +{ + $_SESSION['user_auth'] = true; +} - return 'Ok'; +function jirafeau_user_session_logged() +{ + return isset($_SESSION['user_auth']) && + $_SESSION['user_auth'] === true; } -/** Update an alias. - * @param $alias alias to update - * @param $destination reference of the new destination - * @param $password password to protect alias - * @param $new_password optional new password to protect alias - * @param $ip client's IP - * @return "Ok" or "Error" string - */ -function jirafeau_alias_update($alias, $destination, $password, - $new_password, $ip) +function jirafeau_dir_size($dir) { - $alias = md5($alias); - /* Check that alias exits. */ - $a = jirafeau_get_alias($alias); - if (!count($a)) { - return 'Error'; + $size = 0; + foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $entry) { + $size += is_file($entry) ? filesize($entry) : jirafeau_dir_size($entry); } + return $size; +} - /* Check that destination exists. */ - $l = jirafeau_get_link($a["destination"]); - if (!count($l)) { - return 'Error'; - } +function jirafeau_export_cfg($cfg) +{ + $content = '= 8 && - strlen($new_password) <= 32) { - $p = md5($new_password); - } elseif (strlen($new_password) > 0) { - return 'Error'; + if (false === $fileWrite) { + jirafeau_fatal_error(t('Can not write local configuration file')); } +} - /* Rewrite informations. */ - $p = VAR_ALIAS . s2p($alias) . $alias; - $handle = fopen($p, 'w'); - fwrite($handle, - $p . NL . - $ip . NL . - time() . NL . - $destination . NL); - fclose($handle); - return 'Ok'; +function jirafeau_mkdir($path) +{ + return !(!file_exists($path) && !@mkdir($path, 0755)); } -/** Get an alias. - * @param $alias alias to get - * @return alias destination or "Error" string +/** + * Returns true whether the path is writable or we manage to make it + * so, which essentially is the same thing. + * @param $path is the file or directory to be tested. + * @return true if $path is writable. */ -function jirafeau_alias_get($alias) +function jirafeau_is_writable($path) { - $alias = md5($alias); - /* Check that alias exits. */ - $a = jirafeau_get_alias($alias); - if (!count($a)) { - return 'Error'; - } - - return $a['destination']; + /* "@" gets rid of error messages. */ + return is_writable($path) || @chmod($path, 0777); } -function jirafeau_clean_rm_alias($alias) +function jirafeau_check_var_dir($path) { - $p = s2p("$alias"); - if (file_exists(VAR_ALIAS . $p . $alias)) { - unlink(VAR_ALIAS . $p . $alias); - } - $parse = VAR_ALIAS . $p; - $scan = array(); - while (file_exists($parse) - && ($scan = scandir($parse)) - && count($scan) == 2 // '.' and '..' folders => empty. - && basename($parse) != basename(VAR_ALIAS)) { - rmdir($parse); - $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1); + $mkdir_str1 = t('CANNOT_CREATE_DIR') . ':'; + $mkdir_str2 = t('MANUAL_CREATE'); + $write_str1 = t('DIR_NOT_W') . ':'; + $write_str2 = t('You should give the write permission to the web server on ' . + 'this directory.'); + $solution_str = t('HERE_SOLUTION') . ':'; + + if (!jirafeau_mkdir($path) || !jirafeau_is_writable($path)) { + return array('has_error' => 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' => ''); } -/** Delete an alias. - * @param $alias alias to delete - * @param $password password to protect alias - * @return "Ok" or "Error" string - */ -function jirafeau_alias_delete($alias, $password) +function jirafeau_add_ending_slash($path) { - $alias = md5($alias); - /* Check that alias exits. */ - $a = jirafeau_get_alias($alias); - if (!count($a)) { - return "Error"; - } - - /* Check password. */ - if ($a["md5_password"] != md5($password)) { - return 'Error'; - } + return $path . ((substr($path, -1) == '/') ? '' : '/'); +} - jirafeau_clean_rm_alias($alias); - return 'Ok'; +function jirafeau_default_web_root() +{ + return $_SERVER['HTTP_HOST'] . str_replace('install.php', '', $_SERVER['REQUEST_URI']); } -/** - * Replace markers in templates. - * - * Available markers have the scheme "###MARKERNAME###". - * - * @param $content string Template text with markers - * @param $htmllinebreaks boolean Convert linebreaks to BR-Tags - * @return Template with replaced markers - */ -function jirafeau_replace_markers($content, $htmllinebreaks = false) +function jirafeau_has_ldap_auth($cfg) { - $patterns = array( - '/###ORGANISATION###/', - '/###CONTACTPERSON###/', - '/###WEBROOT###/' - ); - $replacements = array( - $GLOBALS['cfg']['organisation'], - $GLOBALS['cfg']['contactperson'], - $GLOBALS['cfg']['web_root'] - ); - $content = preg_replace($patterns, $replacements, $content); + return $cfg['upload_ldap_auth'] === true; +} - if (true === $htmllinebreaks) { - $content = nl2br($content); +function jirafeau_challenge_ldap_auth($cfg, $user, $password) +{ + if (!jirafeau_has_ldap_auth($cfg)) { + return "upload_ldap_auth not set"; + } + if (strlen($cfg['upload_ldap_host']) == 0) { + return "upload_ldap_host not set"; + } + if (strlen($cfg['upload_ldap_base_dn']) == 0) { + return "upload_ldap_base_dn not set"; + } + $host = $cfg['upload_ldap_host']; + $base_dn = $cfg['upload_ldap_base_dn']; + $con = ldap_connect("ldap://$host"); + $ldap_user = "cn=$user,$base_dn"; + if (!$con) { + return "cannot initiate connection to ldap server"; + } + ldap_set_option($con, LDAP_OPT_PROTOCOL_VERSION, 3); + ldap_set_option($con, LDAP_OPT_REFERRALS, 0); + $bind = ldap_bind_ext($con, $ldap_user, $password, [['oid' => LDAP_CONTROL_PASSWORDPOLICYREQUEST]]); + if (!$bind) { + ldap_close($con); + return "cannot bind to ldap server"; + } + $parsing = ldap_parse_result($con, $bind, $errcode, $matcheddn, $errmsg, $referrals, $ctrls); + if (!$parsing) { + ldap_close($con); + return "cannot parlse ldap results"; + } + if ($errcode == 49) { + ldap_close($con); + return "bad password"; + } + if ($errcode != 0) { + ldap_close($con); + return "ldap auth error: $errmsg ($errcode)"; } - - return $content; + return true; }
' . t('Filename') . '' . t('Type') . '' . t('Size') . '' . t('Expire') . '' . t('Onetime') . '' . t('Upload date') . '' . t('Origin') . '' . t('Action') . '' . t('ACTION') . '
' . - '' . htmlspecialchars($l['file_name']) . ''; - echo '' . $l['mime_type'] . '' . jirafeau_human_size($l['file_size']) . '' . ($l['time'] == -1 ? '' : strftime('%c', $l['time'])) . - ''; - if ($l['onetime'] == 'O') { - echo 'Y'; - } else { - echo 'N'; + '' . 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 '		' . strftime('%c', $l['upload_date']) . '' . $l['ip'] . '' . - '
' . + echo '
'; + echo '' . '' . '' . - '' . + jirafeau_admin_csrf_field() . + '' . '' . - '
' . + '' . '' . '' . - '' . + jirafeau_admin_csrf_field() . + '' . '
' . - '
' . + '' . '' . - '' . - '' . + '' . + jirafeau_admin_csrf_field() . + '' . '
' . '