Land #719, Fix a regression in the search behavior

rapid7 · Oct 10, 2024 · c372a98 · c372a98
2 parents 924f586 + ff617cf
commit c372a98
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/.../meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_fs_search.java b/.../meterpreter/stdapi/src/main/java/com/metasploit/meterpreter/stdapi/stdapi_fs_search.java
@@ -64,15 +64,16 @@ private static boolean matches(String text, String glob) {
 
     public static List findFiles(String path, String mask, boolean recurse, Integer startDate, Integer endDate) {
         try {
-            File pathfile = Loader.expand(path);
-            if (!pathfile.exists() || !pathfile.isDirectory()) {
-                pathfile = new File(path);
-                if (!pathfile.exists() || !pathfile.isDirectory()) {
+            File pathFile = Loader.expand(path);
+            if (!pathFile.exists() || !pathFile.isDirectory()) {
+                pathFile = new File(path);
+                if (!pathFile.exists() || !pathFile.isDirectory()) {
                     throw new IOException("Path not found: " + path);
                 }
             }
-            path = pathfile.getCanonicalPath();
-            String[] lst = new File(path).list();
+            path = pathFile.getCanonicalPath();
+            pathFile = new File(path);
+            String[] lst = pathFile.list();
             List glob = new ArrayList();
             if (lst == null) {
                 return glob;
@@ -81,7 +82,7 @@ public static List findFiles(String path, String mask, boolean recurse, Integer
                 if (lst[i] == null) {
                     continue;
                 }
-                File file = new File(lst[i]);
+                File file = new File(pathFile, lst[i]);
                 if (recurse && file.isDirectory()
                         // don't follow links to avoid infinite recursion
                         && file.getCanonicalPath().equals(file.getAbsolutePath())) {