X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/321f117a5857929c80bfb463991bfba4a9f3d730..16a87073b8e84430d58a866d387c0854b6f9d243:/lib/functions.php
diff --git a/lib/functions.php b/lib/functions.php
index 3e9155f..c660ec3 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -229,6 +229,30 @@ 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
@@ -237,7 +261,8 @@ function jirafeau_ini_to_bytes($value)
*/
function jirafeau_is_extension_allowed($cfg, $filename)
{
- if (empty($cfg['disallowed_extensions'])) {
+ $extensions = jirafeau_disallowed_extensions($cfg);
+ if (empty($extensions)) {
return true;
}
@@ -246,8 +271,8 @@ function jirafeau_is_extension_allowed($cfg, $filename)
// suffix match so that compound extensions such as 'tar.gz' work too;
// 'gz' still covers 'archive.tar.gz'
- foreach ($cfg['disallowed_extensions'] as $extension) {
- $suffix = '.' . strtolower($extension);
+ foreach ($extensions as $extension) {
+ $suffix = '.' . $extension;
if (substr($filename, -strlen($suffix)) === $suffix) {
return false;
}
@@ -1022,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
";