Changeset 3023403

Timestamp:

01/18/2024 09:52:52 AM (2 years ago)

Author:

mndpsingh287

Message:

fixed issues

Location:

wp-file-manager/trunk

Files:

• css/fm_custom.css (modified) (1 diff)
• file_folder_manager.php (modified) (4 diffs)
• inc/backup.php (modified) (1 diff)
• inc/root.php (modified) (2 diffs)
• lib/php/elFinderVolumeLocalFileSystem.class.php (modified) (9 diffs)
• readme.txt (modified) (2 diffs)

wp-file-manager/trunk/css/fm_custom.css

@@ -197 +197 @@
     left: 10px;
 }
+.form-table .input-addon{
+    padding: 0.5rem 0.75rem;
+    margin-bottom: 0;
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 2;
+    color: #464a4c;
+    text-align: center;
+    background-color: #eceeef;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    border-radius: 0.25rem;
+    display: inline-block;
+}
+.fmInput{
+    width:60% !important;
+  }

wp-file-manager/trunk/file_folder_manager.php

@@ -5 +5 @@
   Description: Manage your WP files.
   Author: mndpsingh287
-  Version: 7.2.1
+  Version: 7.2.2
   Author URI: https://profiles.wordpress.org/mndpsingh287
   License: GPLv2
@@ -17 +17 @@
     {
         protected $SERVER = 'https://searchpro.ai/api/plugindata/api.php';
-        var $ver = '7.2.1';
+        var $ver = '7.2.2';
         /* Auto Load Hooks */
         public function __construct()
@@ -49 +49 @@
             add_action('wp_ajax_mk_file_manager_single_backup_restore', array(&$this, 'mk_file_manager_single_backup_restore_callback'));
             add_action( 'rest_api_init', function () {
-                if(is_user_logged_in() && current_user_can('manage_options')){
+            if(current_user_can('manage_options') || (is_multisite() && current_user_can( 'manage_network' ))){
                     register_rest_route( 'v1', '/fm/backup/(?P<backup_id>[a-zA-Z0-9-=]+)/(?P<type>[a-zA-Z0-9-=]+)/(?P<key>[a-zA-Z0-9-=]+)', array(
                         'methods' => 'GET',
@@ -486 +486 @@
             $fmdb = $wpdb->prefix.'wpfm_backup';
             $date = date('Y-m-d H:i:s');
-            $file_number = 'backup_'.date('Y_m_d_H_i_s-').rand(0,9999);
+            $file_number = 'backup_'.date('Y_m_d_H_i_s-').bin2hex(openssl_random_pseudo_bytes(4));
             $nonce = sanitize_text_field($_POST['nonce']);
             $database = sanitize_text_field($_POST['database']);

wp-file-manager/trunk/inc/backup.php

@@ -252 +252 @@
         <button class="exitBackBtn bkpUnCheckAll log_btn disabled_btn"><?php _e('Deselect', 'wp-file-manager'); ?></button> 
     </div>
-    <p><i><strong><?php _e('Note:', 'wp-file-manager'); ?></strong> <?php _e('Backup files will be under', 'wp-file-manager'); ?> <code><?php echo $backup_dirname; ?></code></i></p>   
+    
 </div>

wp-file-manager/trunk/inc/root.php

@@ -2 +2 @@
 $this->custom_css();
 global $wpdb;
+$path = str_replace('\\', '/', ABSPATH);
 if (isset($_POST['submit']) && wp_verify_nonce(sanitize_text_field($_POST['wp_filemanager_root_nonce_field']), 'wp_filemanager_root_action')) {
-    
+  $directory_separators = ['../', './','..\\', '.\\', '..'];
+  $public_path = isset($_POST['public_path']) ? str_replace($directory_separators, '', htmlentities(trim($path.$_POST['public_path']))): $path;
   $save_array =     array(
-    'public_path' => isset($_POST['public_path']) ? str_replace('..', '', htmlentities(trim($_POST['public_path']))) : '',
+    'public_path' => $public_path,
     'fm_enable_trash' => isset($_POST['fm_enable_trash']) ? intval($_POST['fm_enable_trash']) : '',
     'fm_enable_media_upload' => isset($_POST['fm_enable_media_upload']) ? intval($_POST['fm_enable_media_upload']) : '',
@@ -55 +57 @@
 <th><?php _e('Public Root Path', 'wp-file-manager'); ?></th>
 <td>
-<input name="public_path" type="text" id="public_path" value="<?php echo isset($settings['public_path']) && !empty($settings['public_path']) ? $settings['public_path'] : $path; ?>" class="regular-text">
-<p class="description mb15"><?php _e('File Manager Root Path, you can change according to your choice.', 'wp-file-manager'); ?></p>
-<p><strong><?php _e('Default:', 'wp-file-manager'); ?></strong> <code><?php echo $path; ?></code></p>
+<?php 
+$path_length = strlen($path);
+$access_folder = isset($settings['public_path']) && !empty($settings['public_path']) ? substr($settings['public_path'],$path_length) : '';
+?>
+<div class="input-addon"><strong><?php _e('Default', 'wp-file-manager'); ?>: </strong><?php echo $path; ?></div>
+<input type="text" name="public_path" id="public_path" placeholder="<?php _e('Path of the folder to display e.g wp-content/uploads', 'wp-file-manager'); ?>" value="<?php echo $access_folder; ?>" class="regular-text fmInput"/>
 <p style="color:#F00" class="description mb15"><?php _e('Please change this carefully, wrong path can lead file manager plugin to go down.', 'wp-file-manager'); ?></p>
 </td>

wp-file-manager/trunk/lib/php/elFinderVolumeLocalFileSystem.class.php

@@ -76 +76 @@
         $this->options['dirMode'] = 0755;            // new dirs mode
         $this->options['fileMode'] = 0644;            // new files mode
-        $this->options['quarantine'] = '.quarantine'; // quarantine folder name - required to check archive (must be hidden)
         $this->options['rootCssClass'] = 'elfinder-navbar-root-local';
         $this->options['followSymLinks'] = true;
@@ -180 +179 @@
         }
         // check quarantine path
+        $_quarantine = '';
         if (!empty($this->options['quarantine'])) {
             if (strpos($this->options['quarantine'], DIRECTORY_SEPARATOR) === false) {
-                $hiddens['quarantine'] = $this->options['quarantine'];
-                $this->options['quarantine'] = $this->_abspath($this->options['quarantine']);
+                $_quarantine = $this->_abspath($this->options['quarantine']);
+                $this->options['quarantine'] = '';
             } else {
                 $this->options['quarantine'] = $this->_normpath($this->options['quarantine']);
             }
-        }
+        } else {
+            $_quarantine = $this->_abspath('.quarantine');
+        }
+        is_dir($_quarantine) && self::localRmdirRecursive($_quarantine);
 
         parent::configure();
@@ -231 +234 @@
                 }
             }
-        } 
+        } else if ($_path = elFinder::getCommonTempPath()) {
+            $this->quarantine = $_path;
+        }
 
         if (!$this->quarantine) {
@@ -259 +264 @@
 
         $this->statOwner = (!empty($this->options['statOwner']));
+
+        // enable WinRemoveTailDots plugin on Windows server
+        if (DIRECTORY_SEPARATOR !== '/') {
+            if (!isset($this->options['plugin'])) {
+                $this->options['plugin'] = array();
+            }
+            $this->options['plugin']['WinRemoveTailDots'] = array('enable' => true);
+        }
     }
 
@@ -365 +378 @@
             if (strpos($dir, '..' . DIRECTORY_SEPARATOR) !== false || substr($dir, -2) == '..') {
                 $dir = $this->root;
-            } 
+            }
             if (strpos($name, '..' . DIRECTORY_SEPARATOR) !== false) {
                 $name = basename($name);
@@ -475 +488 @@
             return $this->root;
         } else {
+            $path = $this->_normpath($path);
             if (strpos($path, $this->systemRoot) === 0) {
                 return $path;
@@ -957 +971 @@
     protected function _symlink($source, $targetDir, $name)
     {
-        return symlink($source, $this->_joinPath($targetDir, $name));
+        return $this->localFileSystemSymlink($source, $this->_joinPath($targetDir, $name));
     }
 
@@ -1189 +1203 @@
             $this->archiveSize = 0;
 
-            $symlinks = $this->_findSymlinks($dir);
-            
-            if ($symlinks) {
-                $this->delTree($dir);
-                return $this->setError(array_merge($this->error, array(elFinder::ERROR_ARC_SYMLINKS)));
-            }
+            // find symlinks and check extracted items
+            $checkRes = $this->checkExtractItems($dir);
+            if ($checkRes['symlinks']) {
+                self::localRmdirRecursive($dir);
+                return $this->setError(array_merge($this->error, array(elFinder::ERROR_ARC_SYMLINKS)));
+            }
+            $this->archiveSize = $checkRes['totalSize'];
+            if ($checkRes['rmNames']) {
+                foreach ($checkRes['rmNames'] as $name) {
+                    $this->addError(elFinder::ERROR_SAVE, $name);
+                }
+            }
+
+            // check max files size
+            if ($this->options['maxArcFilesSize'] > 0 && $this->options['maxArcFilesSize'] < $this->archiveSize) {
+                $this->delTree($dir);
+                return $this->setError(elFinder::ERROR_ARC_MAXSIZE);
+            }
 
             $extractTo = $this->extractToNewdir; // 'auto', ture or false
@@ -1443 +1469 @@
     {
         $res = false;
-        $errlev = error_reporting();
-        error_reporting($errlev ^ E_WARNING);
-        if ($res = symlink(realpath($target), $link)) {
-            $res = is_readable($link);
-        }
-        error_reporting($errlev);
+        if (function_exists('symlink') and is_callable('symlink')) {
+            $errlev = error_reporting();
+            error_reporting($errlev ^ E_WARNING);
+            if ($res = symlink(realpath($target), $link)) {
+                $res = is_readable($link);
+            }
+            error_reporting($errlev);
+        }
         return $res;
     }

wp-file-manager/trunk/readme.txt

@@ -3 +3 @@
 Tags: wp-file-manager, elfinder,file manager, ftp, wp-filemanager,file manager, wp-filemanager, Upload Files, WP File Manager, File Manage, Edit Files, Delete Files, FTP, filemanager, wpfilemanager, ftp, file transfer, update, create, delete, view, rename, editor, Cpanel, Control Panel, Admin, Shortcode, explorer, file explorer, filemanager
 Requires at least: 4.0
-Tested up to: 6.3.2
+Tested up to: 6.4.2
 Requires PHP: 5.2.4
-Stable tag: 7.2.1
+Stable tag: 7.2.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -140 +140 @@
 == Changelog ==
 
+= 7.2.2 (18 Jan, 2024) =
+* Fixed Security issue.
+
 = 7.2.1 (26th Oct, 2023) =
 * Directory Traversal issue resolved.