Merge pull request #340 from byt3bl33d3r/python3

Python 3 Merge

Author: byt3bl33d3r

.gitignore

@@ -1,4 +1,5 @@
 data/cme.db
+*.bak
 *.log
 .venv
 # Byte-compiled / optimized / DLL files

.gitmodules

@@ -25,12 +25,6 @@
 [submodule "cme/data/mimipenguin"]
 	path = cme/data/mimipenguin
 	url = https://github.com/huntergregal/mimipenguin
-[submodule "cme/thirdparty/pywinrm"]
-	path = cme/thirdparty/pywinrm
-	url = https://github.com/diyan/pywinrm
-[submodule "cme/thirdparty/impacket"]
-	path = cme/thirdparty/impacket
-	url = https://github.com/SecureAuthCorp/impacket
 [submodule "cme/thirdparty/pywerview"]
 	path = cme/thirdparty/pywerview
 	url = https://github.com/the-useless-one/pywerview

MANIFEST.in

@@ -4,10 +4,6 @@ include LICENSE
 recursive-include cme/data *
 recursive-include cme/modules *
 recursive-include cme/thirdparty *
-prune cme/thirdparty/impacket/impacket/testcases
-prune cme/thirdparty/impacket/examples
-prune cme/thirdparty/pywinrm/winrm/tests
-prune cme/thirdparty/pywinrm/scripts
 prune cme/data/powersploit/Tests
 prune cme/data/powersploit/CodeExecution/Invoke-ReflectivePEInjection_Resources
 prune cme/data/powersploit/Exfiltration/LogonUser

Pipfile

@@ -17,12 +17,13 @@ netaddr = "*"
 pyopenssl = "*"
 termcolor = "*"
 msgpack-python = "*"
-pylnk = "*"
+pylnk3 = "*"
 splinter = "*"
 paramiko = "*"
 xmltodict = "*"
 six = "*"
 terminaltables = "*"
+pywinrm = "*"
 
 [requires]
-python_version = "2.7"
+python_version = "3.7"

Pipfile.lock

@@ -1,4 +1,4 @@
-![Supported Python versions](https://img.shields.io/badge/python-2.7-blue.svg)
+![Supported Python versions](https://img.shields.io/badge/python-3.6+-blue.svg)
 
 # CrackMapExec
 

README.md

@@ -6,8 +6,8 @@
 
 def gen_cli_args():
 
-    VERSION  = '4.0.1dev'
-    CODENAME = 'Bug Pr0n'
+    VERSION  = '5.0.0dev'
+    CODENAME = 'P3l1as'
 
     p_loader =  protocol_loader()
     protocols = p_loader.get_protocols()
@@ -31,7 +31,7 @@ def gen_cli_args():
            highlight(CODENAME)),
 
                                     formatter_class=RawTextHelpFormatter,
-                                    version='{} - {}'.format(VERSION, CODENAME),
+                                    #version='{} - {}'.format(VERSION, CODENAME),
                                     epilog="Ya feelin' a bit buggy all of a sudden?")
 
     parser.add_argument("-t", type=int, dest="threads", default=100, help="set how many concurrent threads to use (default: 100)")

cme/cli.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 import cmd
 import sqlite3
 import sys
@@ -7,7 +7,7 @@
 from time import sleep
 from terminaltables import AsciiTable
 from cme.msfrpc import Msfrpc, MsfAuthError
-from ConfigParser import ConfigParser
+import configparser
 from cme.loaders.protocol_loader import protocol_loader
 from requests import ConnectionError
 
@@ -38,23 +38,23 @@ def do_exit(self, line):
         sys.exit(0)
 
     def print_table(self, data, title=None):
-        print ""
+        print("")
         table = AsciiTable(data)
         if title:
             table.title = title
-        print table.table
-        print ""
+        print(table.table)
+        print("")
 
     def do_export(self, line):
         if not line:
-            print "[-] not enough arguments"
+            print("[-] not enough arguments")
             return
 
         line = line.split()
 
         if line[0].lower() == 'creds':
             if len(line) < 3:
-                print "[-] invalid arguments, export creds <plaintext|hashes|both|csv> <filename>"
+                print("[-] invalid arguments, export creds <plaintext|hashes|both|csv> <filename>")
                 return
             if line[1].lower() == 'plaintext':
                 creds = self.db.get_credentials(credtype="plaintext")
@@ -70,21 +70,21 @@ def do_export(self, line):
                         export_file.write('{},{},{},{},{},{}\n'.format(credid,domain,user,password,credtype,fromhost))
                     else:
                         export_file.write('{}\n'.format(password))
-            print '[+] creds exported'
+            print('[+] creds exported')
 
         elif line[0].lower() == 'hosts':
             if len(line) < 2:
-                print "[-] invalid arguments, export hosts <filename>"
+                print("[-] invalid arguments, export hosts <filename>")
                 return
             hosts = self.db.get_computers()
             with open(os.path.expanduser(line[1]), 'w') as export_file:
                 for host in hosts:
                     hostid,ipaddress,hostname,domain,opsys,dc = host
                     export_file.write('{},{},{},{},{},{}\n'.format(hostid,ipaddress,hostname,domain,opsys,dc))
-            print '[+] hosts exported'
+            print('[+] hosts exported')
 
         else:
-            print '[-] invalid argument, specify creds or hosts'
+            print('[-] invalid argument, specify creds or hosts')
 
 
     def do_import(self, line):
@@ -116,12 +116,12 @@ def do_import(self, line):
 
                         self.db.add_credential(cred['credtype'], cred['domain'], cred['username'], cred['password'])
 
-                    print "[+] Empire credential import successful"
+                    print("[+] Empire credential import successful")
                 else:
-                    print "[-] Error authenticating to Empire's RESTful API server!"
+                    print("[-] Error authenticating to Empire's RESTful API server!")
 
             except ConnectionError as e:
-                print "[-] Unable to connect to Empire's RESTful API server: {}".format(e)
+                print("[-] Unable to connect to Empire's RESTful API server: {}".format(e))
 
         elif line == 'metasploit':
             msf = Msfrpc({'host': self.config.get('Metasploit', 'rpc_host'),
@@ -130,7 +130,7 @@ def do_import(self, line):
             try:
                 msf.login('msf', self.config.get('Metasploit', 'password'))
             except MsfAuthError:
-                print "[-] Error authenticating to Metasploit's MSGRPC server!"
+                print("[-] Error authenticating to Metasploit's MSGRPC server!")
                 return
 
             console_id = str(msf.call('console.create')['id'])
@@ -159,7 +159,7 @@ def do_import(self, line):
 
             msf.call('console.destroy', [console_id])
 
-            print "[+] Metasploit credential import successful"
+            print("[+] Metasploit credential import successful")
 
     def complete_import(self, text, line, begidx, endidx):
         "Tab-complete 'import' commands."
@@ -188,10 +188,10 @@ def __init__(self, config_path):
         self.config_path = config_path
 
         try:
-            self.config = ConfigParser()
+            self.config = configparser.ConfigParser()
             self.config.read(self.config_path)
         except Exception as e:
-            print "[-] Error reading cme.conf: {}".format(e)
+            print("[-] Error reading cme.conf: {}".format(e))
             sys.exit(1)
 
         self.workspace_dir = os.path.expanduser('~/.cme/workspaces')
@@ -213,7 +213,7 @@ def open_proto_db(self, db_path):
         self.conn.isolation_level = None
 
     def write_configfile(self):
-        with open(self.config_path, 'wb') as configfile:
+        with open(self.config_path, 'w') as configfile:
             self.config.write(configfile)
 
     def do_proto(self, proto):
@@ -243,7 +243,7 @@ def do_workspace(self, line):
         if line.split()[0] == 'create':
             new_workspace = line.split()[1].strip()
 
-            print "[*] Creating workspace '{}'".format(new_workspace)
+            print("[*] Creating workspace '{}'".format(new_workspace))
             os.mkdir(os.path.join(self.workspace_dir, new_workspace))
 
             for protocol in self.protocols.keys():
@@ -255,7 +255,7 @@ def do_workspace(self, line):
                 proto_db_path = os.path.join(self.workspace_dir, new_workspace, protocol + '.db')
 
                 if not os.path.exists(proto_db_path):
-                    print '[*] Initializing {} protocol database'.format(protocol.upper())
+                    print('[*] Initializing {} protocol database'.format(protocol.upper()))
                     conn = sqlite3.connect(proto_db_path)
                     c = conn.cursor()
 
@@ -286,7 +286,7 @@ def main():
     config_path = os.path.expanduser('~/.cme/cme.conf')
 
     if not os.path.exists(config_path):
-        print "[-] Unable to find config file"
+        print("[-] Unable to find config file")
         sys.exit(1)
 
     try:

cme/cmedb.py

@@ -1,4 +1,5 @@
 import logging
+from os.path import isfile
 # from traceback import format_exc
 from gevent.lock import BoundedSemaphore
 from gevent.socket import gethostbyname
@@ -77,7 +78,7 @@ def proto_flow(self):
                 self.call_cmd_args()
 
     def call_cmd_args(self):
-        for k, v in vars(self.args).iteritems():
+        for k, v in vars(self.args).items():
             if hasattr(self, k) and hasattr(getattr(self, k), '__call__'):
                 if v is not False and v is not None:
                     logging.debug('Calling {}()'.format(k))
@@ -163,16 +164,16 @@ def login(self):
                         self.logger.error("Invalid database credential ID!")
 
         for user in self.args.username:
-            if type(user) is file:
+            if not isinstance(user, str) and isfile(user.name):
                 for usr in user:
                     if self.args.hash:
                         with sem:
                             for ntlm_hash in self.args.hash:
-                                if type(ntlm_hash) is not file:
+                                if isinstance(ntlm_hash, str):
                                     if not self.over_fail_limit(usr.strip()):
                                         if self.hash_login(self.domain, usr.strip(), ntlm_hash): return True
 
-                                elif type(ntlm_hash) is file:
+                                elif not isinstance(ntlm_hash, str) and isfile(ntlm_hash.name):
                                     for f_hash in ntlm_hash:
                                         if not self.over_fail_limit(usr.strip()):
                                             if self.hash_login(self.domain, usr.strip(), f_hash.strip()): return True
@@ -181,25 +182,25 @@ def login(self):
                     elif self.args.password:
                         with sem:
                             for password in self.args.password:
-                                if type(password) is not file:
+                                if isinstance(password, str):
                                     if not self.over_fail_limit(usr.strip()):
                                         if self.plaintext_login(self.domain, usr.strip(), password): return True
 
-                                elif type(password) is file:
+                                elif not isinstance(password, str) and isfile(password.name):
                                     for f_pass in password:
                                         if not self.over_fail_limit(usr.strip()):
                                             if self.plaintext_login(self.domain, usr.strip(), f_pass.strip()): return True
                                     password.seek(0)
 
-            elif type(user) is not file:
+            elif isinstance(user, str):
                     if hasattr(self.args, 'hash') and self.args.hash:
                         with sem:
                             for ntlm_hash in self.args.hash:
-                                if type(ntlm_hash) is not file:
+                                if isinstance(ntlm_hash, str):
                                     if not self.over_fail_limit(user):
                                         if self.hash_login(self.domain, user, ntlm_hash): return True
 
-                                elif type(ntlm_hash) is file:
+                                elif not isinstance(ntlm_hash, str) and  isfile(ntlm_hash.name):
                                     for f_hash in ntlm_hash:
                                         if not self.over_fail_limit(user):
                                             if self.hash_login(self.domain, user, f_hash.strip()): return True
@@ -208,14 +209,14 @@ def login(self):
                     elif self.args.password:
                         with sem:
                             for password in self.args.password:
-                                if type(password) is not file:
+                                if isinstance(password, str):
                                     if not self.over_fail_limit(user):
                                         if hasattr(self.args, 'domain'):
                                             if self.plaintext_login(self.domain, user, password): return True
                                         else:
                                             if self.plaintext_login(user, password): return True
 
-                                elif type(password) is file:
+                                elif not isinstance(password, str) and  isfile(password.name):
                                     for f_pass in password:
                                         if not self.over_fail_limit(user):
                                             if hasattr(self.args, 'domain'):

cme/connection.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from ConfigParser import ConfigParser
+import configparser
 
 class Context:
 
@@ -11,8 +11,8 @@ def __init__(self, db, logger, args):
         self.log_folder_path = os.path.join(os.path.expanduser('~/.cme'), 'logs')
         self.localip = None
 
-        self.conf = ConfigParser()
+        self.conf = configparser.ConfigParser()
         self.conf.read(os.path.expanduser('~/.cme/cme.conf'))
 
-        for key, value in vars(args).iteritems():
+        for key, value in vars(args).items():
             setattr(self, key, value)