X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/6fdc9ef24d11ad73c879be49d9c2e254505d40b6..5825452a9810099554dd124a158b0a74af417863:/lib/functions.php?ds=sidebyside
diff --git a/lib/functions.php b/lib/functions.php
index e5a05b0..c660ec3 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
@@ -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 */
@@ -947,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',
@@ -994,6 +1047,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
";
@@ -1088,10 +1142,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. */
@@ -1642,7 +1696,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()