X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/d8f5ef38cba8d5332711d623582933669aeeb2f3..e89ffa8b97e5bd2dcfe08db4f8944690629f3ced:/lib/functions.php diff --git a/lib/functions.php b/lib/functions.php index e9dacf1..e831087 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 @@ -862,7 +914,8 @@ function jirafeau_admin_clean() continue; } $p = s2p($l['hash']); - if ($l['time'] > 0 && $l['time'] < time() || // expired + if (empty($l['time']) || // invalid + $l['time'] > 0 && $l['time'] < time() || // expired !file_exists(VAR_FILES . $p . $l['hash']) || // invalid !file_exists(VAR_FILES . $p . $l['hash'] . '_count')) { // invalid jirafeau_delete_link($node); @@ -995,6 +1048,7 @@ function jirafeau_admin_bug_report($cfg) $out .= "# OS details
"; $out .= "- OS: " . php_uname() . "
"; + $out .= "- Docker: " . (is_file('/.dockerenv') ? 'yes' : 'no') . "
"; $out .= "
"; $out .= "# Browser details
"; @@ -1026,6 +1080,10 @@ function jirafeau_get_async_ref($ref) return $out; } + if (filesize($refinfos) == 0) { + return $out; + } + $c = file($refinfos); if(empty($c)) { @@ -1130,12 +1188,12 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) /* Validate ref string. */ if (!ctype_xdigit($ref) || strlen($ref) != JIRAFEAU_ASYNC_REF_LENGTH) { - return "Error: Malformed ref string"; + return 'Error: Malformed ref string'; } /* Validate code string. */ if (!ctype_xdigit($code) || strlen($code) != JIRAFEAU_ASYNC_CODE_LENGTH) { - return "Error: Malformed code string"; + return 'Error: Malformed code string'; } /* Get async infos. */ @@ -1143,11 +1201,11 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) /* Check some errors. */ if (count($a) == 0) { - return "Error: cannot find transfer"; + return 'Error: cannot find transfer'; } if (!hash_equals($a['next_code'], "$code")) { - return "Error: bad transfer 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 @@ -1155,10 +1213,10 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) return "Error: upload error: {$data_details}"; } if (empty($data['tmp_name'])) { - return "Error: missing tmp_name"; + return 'Error: missing tmp_name'; } if (!is_uploaded_file($data['tmp_name'])) { - return "Error: tmp_name may not be uploaded"; + return 'Error: tmp_name may not be uploaded'; } $p = s2p($ref); @@ -1171,7 +1229,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: file size is above upload limit"; + return 'Error: file size is above upload limit'; } /* Concatenate data. */ @@ -1182,7 +1240,7 @@ function jirafeau_async_push($ref, $data, $code, $max_file_size) fclose($r); fclose($w); jirafeau_async_delete($ref); - return "Error: cannot write file"; + return 'Error: cannot write file'; } } fclose($r); @@ -1217,12 +1275,12 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m /* Validate ref string. */ if (!ctype_xdigit($ref) || strlen($ref) != JIRAFEAU_ASYNC_REF_LENGTH) { - return "Error: Malformed ref string"; + return 'Error: Malformed ref string'; } /* Validate code string. */ if (!ctype_xdigit($code) || strlen($code) != JIRAFEAU_ASYNC_CODE_LENGTH) { - return "Error: Malformed code string"; + return 'Error: Malformed code string'; } /* Get async infos. */ @@ -1230,16 +1288,16 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m /* Check some errors. */ if (count($a) == 0) { - return "Error: cannot find transfer"; + return 'Error: cannot find transfer'; } if (!hash_equals($a['next_code'], "$code")) { - return "Error: bad code for ending transfer"; + return 'Error: bad code for ending transfer'; } /* Generate link infos. */ - $p = VAR_ASYNC . s2p($ref) . $ref . "_data"; + $p = VAR_ASYNC . s2p($ref) . $ref . '_data'; if (!file_exists($p)) { - return "Error: referenced file does not exist"; + return 'Error: referenced file does not exist'; } /* Store filesize before encrypting the file */ @@ -1294,10 +1352,10 @@ function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_m $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"; + return 'Error: cannot create folder in LINKS'; } if (!rename($link_tmp_name, VAR_LINKS . $l . $hash_link)) { - return "Error: cannot rename file in LINKS"; + return 'Error: cannot rename file in LINKS'; } /* Clean async upload. */