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
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;
}
}
$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);
$out .= "- version: " . JIRAFEAU_VERSION . "<br/>";
$jirafeau_options = [
'debug',
+ 'debug_enforce_classic_upload',
'file_hash',
'litespeed_workaround',
'store_uploader_ip',