Only set file permissions when configured

diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 10ddd56334c043a65a49d10af71e484c20fd641b..735048a867e98c54a9402c96243fe6a9ccf2393c 100644 (file)
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -127,13 +127,16 @@ class Proxy extends BaseModule
                }
 
                $basepath = $a->getBasePath();
+               $filepermission = DI::config()->get('system', 'proxy_file_chmod');
 
                // Store original image
                if ($direct_cache) {
                        // direct cache , store under ./proxy/
                        $filename = $basepath . '/proxy/' . ProxyUtils::proxifyUrl($request['url'], true);
                        file_put_contents($filename, $image->asString());
-                       chmod($filename, DI::config()->get('system', 'proxy_file_chmod'));
+                       if (!empty($filepermission)) {
+                               chmod($filename, $filepermission);
+                       }
                } elseif($cachefile !== '') {
                        // cache file
                        file_put_contents($cachefile, $image->asString());
@@ -153,7 +156,9 @@ class Proxy extends BaseModule
                if ($direct_cache && $request['sizetype'] != '') {
                        $filename = $basepath . '/proxy/' . ProxyUtils::proxifyUrl($request['url'], true) . $request['sizetype'];
                        file_put_contents($filename, $image->asString());
-                       chmod($filename, DI::config()->get('system', 'proxy_file_chmod'));
+                       if (!empty($filepermission)) {
+                               chmod($filename, $filepermission);
+                       }
                }
 
                self::responseImageHttpCache($image);

diff --git a/static/defaults.config.php b/static/defaults.config.php
index b075db36a06bada24930406869e72e30804419d6..ce9dd477aaf87caae2c5ea69c03b8b37ef6f2908 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -571,9 +571,9 @@ return [
                // Timeout in seconds for fetching the XRD links.
                'xrd_timeout' => 20,
 
-               // proxy_file_chmod (Integer)
-               // Access rights for downloaded files in /proxy/ directory
-               'proxy_file_chmod' => 0640,
+               // proxy_file_chmod (Octal Integer)
+               // Access rights for downloaded files in /proxy/ directory like 0640
+               'proxy_file_chmod' => 0,
        ],
        'experimental' => [
                // exp_themes (Boolean)