minor updates

modules/vulnerability-analysis/crackmapexec.py

@@ -20,13 +20,16 @@
 INSTALL_LOCATION="crackmapexec"
 
 # DEPENDS FOR DEBIAN INSTALLS
-DEBIAN="python-dev,python-pip"
+DEBIAN="libssl-dev,libffi-dev,python-dev,build-essential"
 
 # DEPENDS FOR FEDORA INSTALLS
 FEDORA="git"
 
 # COMMANDS TO RUN AFTER
-AFTER_COMMANDS="cd {INSTALL_LOCATION},pip install -r requirements.txt"
+AFTER_COMMANDS="cd {INSTALL_LOCATION},git submodule init && git submodule update -recursive,python setup.py install"
 
 # AUTOMATIC LAUNCH
 LAUNCHER="crackmapexec"
+
+# needed for install
+BYPASS_UPDATE="YES"

readme/CHANGELOG

@@ -10,6 +10,8 @@ version 1.8
 * added title setting for terminal window (awesome PR thnx!)
 * switched to metasploit nightly installer vs. git direct pull (love you egyp7)
 * added full python3 compatibility and tested
+* fixed the crackmapexec installer (thanks lawry)
+* added so if git was used with BYPASS_UPDATES - it would still do a git pull
 
 ~~~~~~~~~~~~~~~~~
 version 1.7.3

src/framework.py

@@ -252,8 +252,7 @@ def use_module(module, all_trigger):
                 # move to the location
                     if os.path.isdir(install_location):
                         if install_type.lower() == "git":
-                            print_status(
-                                "Updating the tool, be patient while git pull is initiated.")
+                            print_status("Updating the tool, be patient while git pull is initiated.")
                             proc = subprocess.Popen("cd %s;git pull" % (
                                 install_location), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
                             # here we check to see if we need anything we need to
@@ -374,13 +373,16 @@ def use_module(module, all_trigger):
 
                     # if we are using git
                     if install_type.lower() == "git":
-                        print_status(
-                            "GIT was the selected method for installation... Using GIT to install.")
-                        print_status("Installing now.. be patient...")
-                        proc = subprocess.Popen("git clone %s %s" % (
-                            repository_location, install_location), stderr=subprocess.PIPE, shell=True).wait()
-                        print_status(
-                            "Finished Installing! Enjoy the tool located under: " + install_location)
+                        # if we are updating
+                        if os.path.isdir(install_location):
+                            print_status("Installation already exists, going to git pull then run after commands..")
+                            subprocess.Popen("cd %s;git pull" % (install_location), stderr=subprocess.PIPE, shell=True).wait()
+                            print_status("Finished updating the tool located in:" + install_location)
+                        else:
+                            print_status("GIT was the selected method for installation... Using GIT to install.")
+                            print_status("Installing now.. be patient...")
+                            proc = subprocess.Popen("git clone %s %s" % (repository_location, install_location), stderr=subprocess.PIPE, shell=True).wait()
+                            print_status("Finished Installing! Enjoy the tool located under: " + install_location)
                         after_commands(filename, install_location)
                         launcher(filename, install_location)