Merge branch 'trustedsec:master' into master

.github/workflows/Python_tests.yml

@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: [2.7, 3.6, 3.7, 3.8] # 3.5,
+        python-version: [3.7, 3.8] # 2.7, 3.5, 3.6
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python ${{ matrix.python-version }}

modules/exploitation/shellgen.py

@@ -14,14 +14,14 @@
 INSTALL_TYPE="GIT"
 
 # LOCATION OF THE FILE OR GIT/SVN REPOSTIRORY
-REPOSITORY_LOCATION="https://github.com/thejoker3000/ShellGen"
+REPOSITORY_LOCATION="https://gitlab.com/thejoker3000/ShellGen"
 
 INSTALL_LOCATION="shellgen"
 
 BYPASS_UPDATE="NO"
 
 # DEPENDS FOR DEBIAN INSTALLS
-DEBIAN="git,python2.7,python3"
+DEBIAN="git,python3"
 
 # COMMANDS TO RUN AFTER
 AFTER_COMMANDS=""

modules/intelligence-gathering/httprobe.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+####################################
+# Installation module for httprobe #
+####################################
+
+# AUTHOR OF MODULE NAME
+AUTHOR="Igibek Koishybayev"
+
+# DESCRIPTION OF THE MODULE
+DESCRIPTION="This module will install/update httprobe"
+
+# INSTALL TYPE GIT, SVN, FILE DOWNLOAD
+INSTALL_TYPE="GIT"
+
+# LOCATION OF THE FILE OR GIT/SVN REPOSITORY
+REPOSITORY_LOCATION="https://github.com/tomnomnom/httprobe"
+
+# WHERE DO YOU WANT TO INSTALL IT
+INSTALL_LOCATION="httprobe"
+
+# DEPENDS FOR DEBIAN INSTALLS
+DEBIAN="git,golang"
+
+# COMMANDS TO RUN AFTER
+AFTER_COMMANDS="cd {INSTALL_LOCATION},go get,go build"
+
+# THIS WILL CREATE AN AUTOMATIC LAUNCHER FOR THE TOOL
+LAUNCHER="httprobe"

modules/post-exploitation/havoc.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+#####################################
+# Installation module for Havoc C2
+#####################################
+
+# AUTHOR OF MODULE NAME
+AUTHOR="0xv1n"
+
+# DESCRIPTION OF THE MODULE
+DESCRIPTION="This module will install/update Havoc C2."
+
+# INSTALL TYPE GIT, SVN, FILE DOWNLOAD
+# OPTIONS = GIT, SVN, FILE
+INSTALL_TYPE="GIT"
+
+# LOCATION OF THE FILE OR GIT/SVN REPOSITORY
+REPOSITORY_LOCATION="https://github.com/HavocFramework/Havoc"
+
+# WHERE DO YOU WANT TO INSTALL IT
+INSTALL_LOCATION="havoc"
+
+# DEPENDS FOR DEBIAN INSTALLS
+DEBIAN="git, build-essential, apt-utils, cmake, libfontconfig1, libglu1-mesa-dev, libgtest-dev, libspdlog-dev, libboost-all-dev, libncurses5-dev, libgdbm-dev, libssl-dev, libreadline-dev, libffi-dev, libsqlite3-dev, libbz2-dev, mesa-common-dev, qtbase5-dev, qtchooser, qt5-qmake, qtbase5-dev-tools, libqt5websockets5, libqt5websockets5-dev, qtdeclarative5-dev, golang-go, qtbase5-dev, libqt5websockets5-dev, python3-dev, libboost-all-dev, mingw-w64, nasm"
+
+# DEPENDS FOR FEDORA INSTALLS
+FEDORA="git"
+
+# COMMANDS TO RUN AFTER
+AFTER_COMMANDS="cd {INSTALL_LOCATION}, cd teamserver, go mod download golang.org/x/sys, go mod download github.com/ugorji/go, cd {INSTALL_LOCATION}, make ts-build, make client-build"
+
+# THIS WILL CREATE AN AUTOMATIC LAUNCHER FOR THE TOOL
+LAUNCHER=""
+
+# PREREQ INSTALL MODULES NEEDED FOR THIS TOOL TO WORK PROPERLY
+TOOL_DEPEND=""

modules/vulnerability-analysis/hydra.py

@@ -20,13 +20,13 @@
 INSTALL_LOCATION="hydra"
 
 # DEPENDS FOR DEBIAN INSTALLS
-DEBIAN="libssl-dev libssh-dev libidn11-dev libpcre3-dev libgtk2.0-dev libmysqlclient-dev libpq-dev libsvn-dev firebird-dev ldap-utils ruby-dev"
+DEBIAN="libssl-dev libssh-dev libidn11-dev libpcre3-dev libgtk2.0-dev libmysqlclient-dev libpq-dev libsvn-dev firebird-dev ldap-utils ruby-dev cmake"
 
 # DEPENDS FOR FEDORA INSTALLS
 FEDORA="openssl-devel pcre-devel ncpfs-devel postgresql-devel libssh-devel subversion-devel libncurses-devel"
 
 # COMMANDS TO RUN AFTER
-AFTER_COMMANDS="echo installing hydra,cd {INSTALL_LOCATION},git clone http://git.libssh.org/projects/libssh.git libssh,cd libssh,mkdir build,cd build,cmake -DWITH_SSH1=On -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug ..,make -j4,make install,cd ../../,./configure,make -j4,make install"
+AFTER_COMMANDS="cd {INSTALL_LOCATION},git clone http://git.libssh.org/projects/libssh.git libssh,cd libssh,mkdir build,cd build,cmake -DWITH_SSH1=On -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug ..,make -j4,make install,cd ../../,./configure,make -j4,make install"
 
 # THIS WILL CREATE AN AUTOMATIC LAUNCHER FOR THE TOOL
 LAUNCHER="hydra"

modules/vulnerability-analysis/ncrack.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #####################################
-# Installation module for testSSL
+# Installation module for ncrack
 #####################################
 
 # AUTHOR OF MODULE NAME
@@ -29,4 +29,4 @@
 ARCHLINUX=""
 
 # COMMANDS TO RUN AFTER
-AFTER_COMMANDS="cd {INSTALL_LOCATION},./configure,make"
+AFTER_COMMANDS="cd {INSTALL_LOCATION},./configure,make,make install"

src/platforms/debian.py

@@ -24,9 +24,13 @@ def base_install_modules(module_name):
     # depends
     if counter == 1:
         for module in modules:
-            command = ("apt-get -q --allow-downgrades --allow-remove-essential --allow-change-held-packages -y install " + module)
+            # Check if `apt-fast` is available, otherwise use apt-get
+            if subprocess.Popen("which apt-fast >/dev/null", shell=True).wait() == 0:
+                command = ("apt-fast -y install " + module)
+            else:
+                command = ("apt-get -q --allow-downgrades --allow-remove-essential --allow-change-held-packages -y install " + module)
             subprocess.Popen("export DEBIAN_FRONTEND=noninteractive;%s" %
-                             command, shell=True).wait()
+                            command, shell=True).wait()
     else:
         command = ("apt-get -q --allow-downgrades --allow-remove-essential --allow-change-held-packages -y install " + modules)
         subprocess.Popen("export DEBIAN_FRONTEND=noninteractive;%s" %