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
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);
$out .= "# OS details<br/>";
$out .= "- OS: " . php_uname() . "<br/>";
+ $out .= "- Docker: " . (is_file('/.dockerenv') ? 'yes' : 'no') . "<br/>";
$out .= "<br/>";
$out .= "# Browser details<br/>";
return $out;
}
+ if (filesize($refinfos) == 0) {
+ return $out;
+ }
+
$c = file($refinfos);
if(empty($c)) {
/* 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);
*/
function jirafeau_async_push($ref, $data, $code, $max_file_size)
{
+ $ref = trim($ref);
+ $code = trim($code);
+
/* Validate ref string. */
- if (!ctype_xdigit(trim($ref))) {
- return "Error: Malformed 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. */
/* Check some errors. */
if (count($a) == 0) {
- return "Error: cannot find transfer";
+ return 'Error: cannot find transfer';
}
- if ($a['next_code'] != "$code") {
- return "Error: bad transfer code";
+ if (!hash_equals($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
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);
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. */
fclose($r);
fclose($w);
jirafeau_async_delete($ref);
- return "Error: cannot write file";
+ return 'Error: cannot write file';
}
}
fclose($r);
*/
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(trim($ref))) {
- return "Error: Malformed 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";
+ $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 */
$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. */