X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/3fb73e41b539df62f75cbcf740488cfc15fa8b79..03ed5327384d8fb6f25fc60f6f4e249458f15c8a:/lib/functions.php diff --git a/lib/functions.php b/lib/functions.php index 7ac4c9e..7f03b5f 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -229,6 +229,58 @@ function jirafeau_ini_to_bytes($value) return $bytes; } +/** + * returns the configured disallowed extensions, lower-cased and without + * a leading dot + * @param $cfg jirafeau config + * @returns array of normalized extensions + */ +function jirafeau_disallowed_extensions($cfg) +{ + if (empty($cfg['disallowed_extensions'])) { + return array(); + } + + // tolerate a leading dot in the config, e.g. '.jpg' instead of 'jpg' + $extensions = array(); + foreach ($cfg['disallowed_extensions'] as $extension) { + $extension = ltrim(strtolower(trim($extension)), '.'); + if ($extension !== '') { + $extensions[] = $extension; + } + } + + return $extensions; +} + +/** + * checks if a file name's extension is allowed to be uploaded + * @param $cfg jirafeau config + * @param $filename the name of the file being uploaded + * @returns true if the extension is allowed + */ +function jirafeau_is_extension_allowed($cfg, $filename) +{ + $extensions = jirafeau_disallowed_extensions($cfg); + if (empty($extensions)) { + return true; + } + + // trailing dots and whitespace are dropped on storage or by the client OS + $filename = strtolower(rtrim($filename, " \t\n\r\0\v.")); + + // suffix match so that compound extensions such as 'tar.gz' work too; + // 'gz' still covers 'archive.tar.gz' + foreach ($extensions as $extension) { + $suffix = '.' . $extension; + if (substr($filename, -strlen($suffix)) === $suffix) { + return false; + } + } + + return true; +} + /** * gets the maximum upload size according to php.ini * @returns the maximum upload size in bytes @@ -464,9 +516,9 @@ function jirafeau_handle_add_file_encryption($crypt_module_enabled, $file_path) error_log("PHP extension sodium not loaded, won't encrypt in Jirafeau"); } if ($crypt_module_enabled == true && extension_loaded('sodium') == true) { - $crypt_key = jirafeau_encrypt_file($file_path, $file_path.'crypt'); + $crypt_key = jirafeau_encrypt_file($file_path, $file_path.'.crypt'); if (strlen($crypt_key) > 0) { - if (rename($file_path.'crypt', $file_path) === true) { + if (rename($file_path.'.crypt', $file_path) === true) { $crypted = true; } } @@ -544,7 +596,7 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt, /* hash password or empty. */ $password = ''; if (!empty($key)) { - $password = md5($key); + $password = '[SHA256]' . hash('sha256', $key); } /* create link file */ @@ -554,7 +606,7 @@ function jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt, $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 ? 'C2' : 'O') ); fclose($handle); $hash_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length); @@ -623,7 +675,7 @@ function jirafeau_is_viewable($mime) if (!empty($mime)) { $viewable = array('image', 'video', 'audio'); $decomposed = explode('/', $mime); - if (in_array($decomposed[0], $viewable) && stripos($mime, 'image/svg+xml') === false) { + if (in_array($decomposed[0], $viewable) && stripos($mime, 'image/svg+xml') === false && strpos($mime, ',') === false) { return true; } $viewable = array('text/plain'); @@ -771,6 +823,9 @@ function jirafeau_admin_list($name, $file_hash, $link_hash) if (!empty($link_hash) && $link_hash != $node) { continue; } + + /* Get download statistics */ + $ld = jirafeau_get_download_stats($node); /* Print link information. */ echo ''; echo ''; @@ -793,6 +848,11 @@ function jirafeau_admin_list($name, $file_hash, $link_hash) if (strlen($l['ip']) > 0) { echo t('ORIGIN') . ': ' . $l['ip'] . '
'; } + echo t('DOWNLOAD_COUNT') . ': ' . $ld['count'] . '
'; + if ($ld['count'] > 0) { + echo t('DOWNLOAD_DATE') . ': ' . jirafeau_get_datetimefield($ld['date']) . '
'; + echo t('DOWNLOAD_IP') . ': ' . $ld['ip'] . '
'; + } echo ''; if (!$l['crypted'] && !$l['crypted_legacy']) { @@ -939,6 +999,7 @@ function jirafeau_admin_bug_report($cfg) $out .= "- version: " . JIRAFEAU_VERSION . "
"; $jirafeau_options = [ 'debug', + 'debug_enforce_classic_upload', 'file_hash', 'litespeed_workaround', 'store_uploader_ip', @@ -1080,10 +1141,10 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) $w_path = $p . $ref . '_data'; touch($w_path); - /* md5 password or empty */ + /* sha256 password or empty */ $password = ''; if (!empty($key)) { - $password = md5($key); + $password = '[SHA256]' . hash('sha256', $key); } /* Store information. */ @@ -1634,7 +1695,7 @@ function jirafeau_escape($string) function jirafeau_admin_session_start() { $_SESSION['admin_auth'] = true; - $_SESSION['admin_csrf'] = md5(uniqid(mt_rand(), true)); + $_SESSION['admin_csrf'] = hash('sha256', uniqid(mt_rand(), true)); } function jirafeau_session_end() @@ -1779,7 +1840,7 @@ function jirafeau_write_download_stats($hash, $ip) fclose($handle); } -function jirafeau_create_upload_finished_box($preview = true) +function jirafeau_create_upload_finished_box($preview = true, $download_pass = null) { ?> @@ -1796,6 +1857,21 @@ function jirafeau_create_upload_finished_box($preview = true)

+ +
+

+ +
+

+ '?> + +

+
+
+ + +