X-Git-Url: https://git.p6c8.net/jirafeau/pcanterino.git/blobdiff_plain/ea13ecd5272b130c028b76b91b2a05ea65fd565b..d8f5ef38cba8d5332711d623582933669aeeb2f3:/lib/functions.php diff --git a/lib/functions.php b/lib/functions.php index 2843e29..e9dacf1 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -446,7 +446,7 @@ function jirafeau_upload($file, $one_time_download, $key, $time, $ip, $crypt, $l 'link' => '', 'delete_link' => '')); } - jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method); + return jirafeau_add_file($file, $one_time_download, $key, $time, $ip, $crypt, $link_name_length, $file_hash_method); } /** @@ -464,9 +464,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 +544,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 +554,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 +623,7 @@ function jirafeau_is_viewable($mime) if (!empty($mime)) { $viewable = array('image', 'video', 'audio'); $decomposed = explode('/', $mime); - if (in_array($decomposed[0], $viewable) && strpos($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 +771,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 +796,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 +947,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', @@ -1013,11 +1022,16 @@ function jirafeau_get_async_ref($ref) $out = array(); $refinfos = VAR_ASYNC . s2p("$ref") . "$ref"; - if (!file_exists($refinfos)) { + if (!is_file($refinfos)) { return $out; } $c = file($refinfos); + + if(empty($c)) { + return $out; + } + $out['file_name'] = trim($c[0]); $out['mime_type'] = trim($c[1]); $out['key'] = trim($c[2], NL); @@ -1066,9 +1080,9 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) /* Create temporary folder. */ $ref = ''; $p = ''; - $code = jirafeau_gen_random(4); + $code = jirafeau_gen_random(JIRAFEAU_ASYNC_CODE_LENGTH); do { - $ref = jirafeau_gen_random(32); + $ref = jirafeau_gen_random(JIRAFEAU_ASYNC_REF_LENGTH); $p = VAR_ASYNC . s2p($ref); } while (file_exists($p)); @mkdir($p, 0755, true); @@ -1080,10 +1094,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. */ @@ -1111,6 +1125,19 @@ function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip) */ function jirafeau_async_push($ref, $data, $code, $max_file_size) { + $ref = trim($ref); + $code = trim($code); + + /* Validate ref string. */ + if (!ctype_xdigit($ref) || strlen($ref) != JIRAFEAU_ASYNC_REF_LENGTH) { + return "Error: Malformed ref string"; + } + + /* Validate code string. */ + if (!ctype_xdigit($code) || strlen($code) != JIRAFEAU_ASYNC_CODE_LENGTH) { + return "Error: Malformed code string"; + } + /* Get async infos. */ $a = jirafeau_get_async_ref($ref); @@ -1118,7 +1145,8 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) if (count($a) == 0) { return "Error: cannot find transfer"; } - if ($a['next_code'] != "$code") { + + if (!hash_equals($a['next_code'], "$code")) { return "Error: bad transfer code"; } if ($data['error'] != UPLOAD_ERR_OK) { @@ -1184,19 +1212,41 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) */ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_method) { + $ref = trim($ref); + $code = trim($code); + + /* Validate ref string. */ + if (!ctype_xdigit($ref) || strlen($ref) != JIRAFEAU_ASYNC_REF_LENGTH) { + return "Error: Malformed ref string"; + } + + /* Validate code string. */ + if (!ctype_xdigit($code) || strlen($code) != JIRAFEAU_ASYNC_CODE_LENGTH) { + return "Error: Malformed code string"; + } + /* Get async infos. */ $a = jirafeau_get_async_ref($ref); - if (count($a) == 0 - || $a['next_code'] != "$code") { - return "Error: bad code for ending transfer"; + + /* Check some errors. */ + if (count($a) == 0) { + return "Error: cannot find transfer"; } + if (!hash_equals($a['next_code'], "$code")) { + return "Error: bad code for ending transfer"; + } /* Generate link infos. */ $p = VAR_ASYNC . s2p($ref) . $ref . "_data"; if (!file_exists($p)) { return "Error: referenced file does not exist"; } + /* Store filesize before encrypting the file */ + /* Otherwise we would send the size of the encrypted file and the data of the unencrypted file */ + /* This would break some browsers */ + $size = filesize($p); + $crypted = false; $crypt_key = ''; if ($crypt == true && extension_loaded('sodium') == true) { @@ -1209,7 +1259,6 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m } $hash = jirafeau_hash_file($file_hash_method, $p); - $size = filesize($p); $np = s2p($hash); $delete_link_code = jirafeau_gen_random(5); @@ -1630,7 +1679,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() @@ -1775,7 +1824,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) { ?> @@ -1792,6 +1841,21 @@ function jirafeau_create_upload_finished_box($preview = true)

+ +
+

+ +
+

+ '?> + +

+
+
+ + +