Merge pull request #37 from p0dalirius/implement-wildcards-in-put-com…

…mand [enhancement] Implemented wildcards in pu command, resolves #35
p0dalirius · Jun 17, 2024 · edfe377 · edfe377
2 parents f0a6044 + cdd1d7a
commit edfe377
Showing 1 changed file with 56 additions and 27 deletions.
diff --git a/smbclientng/core/SMBSession.py b/smbclientng/core/SMBSession.py
@@ -277,7 +277,9 @@ def get_file(self, path=None, keepRemotePath=False):
                 regexp = filename.replace('.', '\\.').replace('*', '.*')
                 if re.match(regexp, entry.get_longname()):
                     matching_entries.append(entry)
-
+
+        matching_entries = sorted(list(set(matching_entries)))
+
         for entry in matching_entries:
             if entry.is_directory():
                 if self.config.debug:
@@ -773,33 +775,60 @@ def put_file(self, localpath=None):
             localpath (str, optional): The local file path of the file to be uploaded. Defaults to None.
         """
 
-        if os.path.exists(localpath):
-            if os.path.isfile(localpath):
-                try:
-                    localfile = os.path.basename(localpath)
-                    f = LocalFileIO(
-                        mode="rb", 
-                        path=localpath, 
-                        debug=self.config.debug
-                    )
-                    self.smbClient.putFile(
-                        shareName=self.smb_share, 
-                        pathName=ntpath.normpath(self.smb_cwd + ntpath.sep + localfile + ntpath.sep), 
-                        callback=f.read
-                    )
-                    f.close()
-                except (BrokenPipeError, KeyboardInterrupt) as err:
-                    print("[!] Interrupted.")
-                    self.close_smb_session()
-                    self.init_smb_session()
-                except Exception as err:
-                    print("[!] Failed to upload '%s': %s" % (localfile, err))
-                    if self.config.debug:
-                        traceback.print_exc()
-            else:
-                print("[!] The specified localpath is a directory. Use 'put -r <directory>' instead.")
+        # Parse path
+        localpath = localpath.replace('/', os.path.sep)
+        if os.path.sep in localpath:
+            tmp_search_path = os.path.normpath(os.getcwd() + os.path.sep + os.path.dirname(localpath))
         else:
-            print("[!] The specified localpath does not exist.")
+            tmp_search_path = os.path.normpath(os.getcwd() + os.path.sep)
+        # Parse filename
+        filename = os.path.basename(localpath)
+
+        # Search for the file
+        matches = os.listdir(tmp_search_path)
+        # Filter the entries
+        matching_entries = []
+        for entry in matches:
+            if entry == filename:
+                matching_entries.append(entry)
+            elif '*' in filename:
+                regexp = filename.replace('.', '\\.').replace('*', '.*')
+                if re.match(regexp, entry):
+                    matching_entries.append(entry)
+
+        matching_entries = sorted(list(set(matching_entries)))
+
+        # Loop and upload
+        for localpath in matching_entries:
+            if os.path.exists(localpath):
+                if os.path.isfile(localpath):
+                    try:
+                        localfile = os.path.basename(localpath)
+                        f = LocalFileIO(
+                            mode="rb", 
+                            path=localpath, 
+                            debug=self.config.debug
+                        )
+                        self.smbClient.putFile(
+                            shareName=self.smb_share, 
+                            pathName=ntpath.normpath(self.smb_cwd + ntpath.sep + localfile + ntpath.sep), 
+                            callback=f.read
+                        )
+                        f.close()
+                    except (BrokenPipeError, KeyboardInterrupt) as err:
+                        print("[!] Interrupted.")
+                        self.close_smb_session()
+                        self.init_smb_session()
+                    except Exception as err:
+                        print("[!] Failed to upload '%s': %s" % (localfile, err))
+                        if self.config.debug:
+                            traceback.print_exc()
+                else:
+                    # [!] The specified localpath is a directory. Use 'put -r <directory>' instead.
+                    pass
+            else:
+                # [!] The specified localpath does not exist.
+                pass
 
     def put_file_recursively(self, localpath=None):
         """