Merge pull request #57 from p0dalirius/improve-module-find-output-format

[bugfix] Fixed double backslashes in paths printed by module find
p0dalirius · Jun 22, 2024 · a01f869 · a01f869
2 parents 7f91439 + 45db71d
commit a01f869
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/smbclientng/core/SMBSession.py b/smbclientng/core/SMBSession.py
@@ -250,15 +250,13 @@ def recurse_action(paths=[], depth=0, callback=None):
 
                 for entry in entries:
                     if entry.is_directory():
-                        callback(entry, path + ntpath.sep + entry.get_longname() + ntpath.sep, depth)
+                        fullpath = path + ntpath.sep + entry.get_longname() + ntpath.sep
+                        next_directories_to_explore.append(fullpath)
                     else:
-                        callback(entry, path + ntpath.sep + entry.get_longname(), depth)
-
-                # Next directories to explore
-                for entry in entries:
-                    if entry.is_directory():
-                        next_directories_to_explore.append(path + ntpath.sep + entry.get_longname() + ntpath.sep)
-
+                        fullpath = path + ntpath.sep + entry.get_longname()
+                    fullpath = re.sub(r'\\\\+', r'\\', fullpath)
+                    callback(entry, fullpath, depth)
+
             return next_directories_to_explore
         # 
         if callback is not None: