Merge branch 'main' into ldap-fix

lib/attacks/cmpivot.py

@@ -76,8 +76,7 @@ def do_cd(self, arg):
         #path needs to end with \ or all file system queries will fail
         if not arg.endswith("\\"): 
             arg = arg + "\\"
-        option = arg.split(' ')
-        self.cwd = option[0]
+        self.cwd = arg
 
 # ############
 # Database Section
@@ -128,8 +127,7 @@ def do_get_lastlogon(self, arg):
     @cmd2.with_category(SA)    
     def do_cat(self, arg):
         """Read file contents.                      cat (filename)"""
-        option = arg.split(' ')
-        filename = option[0]
+        filename = arg
         logger.info(f"Tasked SCCM to show {arg}")
         fullpath = self.cwd + filename
         self.script.cat(fullpath, device=self.device)

lib/scripts/runscript.py

@@ -188,7 +188,7 @@ def cat(self, file, device):
         #filecontent cmpivot module doesn't work so here's the bandaid
         script = '''
 function do-cat{
-    $contents = (Get-Content -Path %s) -replace 111,222
+    $contents = (Get-Content -Path "%s") -replace 111,222
     return $contents
 }
 function Do-Delete {