fix fedora modules and change empire empyre locations

caketi · Feb 2, 2017 · 4eaf007 · 4eaf007
1 parent e444a85
commit 4eaf007
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/modules/post-exploitation/empyre.py b/modules/post-exploitation/empyre.py
@@ -14,10 +14,10 @@
 INSTALL_TYPE="GIT"
 
 # LOCATION OF THE FILE OR GIT/SVN REPOSITORY
-REPOSITORY_LOCATION="https://github.com/adaptivethreat/EmPyre/"
+REPOSITORY_LOCATION="https://github.com/EmpireProject/EmPyre"
 
 # WHERE DO YOU WANT TO INSTALL IT
-INSTALL_LOCATION="empyre"
+INSTALL_LOCATION="empyre-py"
 
 # DEPENDS FOR DEBIAN INSTALLS
 DEBIAN="git, python-m2crypto, python-crypto"

diff --git a/modules/powershell/empire.py b/modules/powershell/empire.py
@@ -14,10 +14,10 @@
 INSTALL_TYPE="GIT"
 
 # LOCATION OF THE FILE OR GIT/SVN REPOSITORY
-REPOSITORY_LOCATION="https://github.com/adaptivethreat/Empire"
+REPOSITORY_LOCATION="https://github.com/EmpireProject/Empire"
 
 # WHERE DO YOU WANT TO INSTALL IT
-INSTALL_LOCATION="empire"
+INSTALL_LOCATION="empire-ps"
 
 # DEPENDS FOR DEBIAN INSTALLS
 DEBIAN="git, python-m2crypto, python-crypto"

diff --git a/readme/CHANGELOG b/readme/CHANGELOG
@@ -1,3 +1,10 @@
+~~~~~~~~~~~~~~~~~
+version 1.13.1
+~~~~~~~~~~~~~~~~~
+
+* fixed fedora as supported platform throwing fedora_modules error
+* changed github locations for the empyre and ps-empire changes
+
 ~~~~~~~~~~~~~~~~~
 version 1.13
 ~~~~~~~~~~~~~~~~~

diff --git a/src/core.py b/src/core.py
@@ -110,7 +110,7 @@ def count_modules():
     return counter
 
 # version information
-grab_version = "1.13"
+grab_version = "1.13.1"
 
 # banner
 banner = bcolors.RED + r"""
@@ -221,7 +221,7 @@ def module_parser(filename, term):
         if counter == 0:
             filename_short = filename.replace(definepath() + "/", "")
             filename_short = filename_short.replace(".py", "")
-            if term not in "BYPASS_UPDATE|LAUNCHER|TOOL_DEPEND|X64_LOCATION|install_update_all":
+            if term not in "BYPASS_UPDATE|LAUNCHER|TOOL_DEPEND|X64_LOCATION|install_update_all|FEDORA|OPENBSD|ARCHLINUX":
                               if filename_short not in "__init__|msfdb.sh":
                                         print_error("Warning, module %s was found but contains no %s field." % (filename_short, term))
                                         print_error("Check the module again for errors and try again.")
@@ -256,20 +256,21 @@ def profile_os():
     # if we are running a debian variant
     if os.path.isfile("/usr/bin/apt-get"):
         return "DEBIAN"
+
     if os.path.isfile("/usr/bin/aptitude"):
         return "DEBIAN"
 
     if os.path.isfile("/etc/arch-release"):
         return "ARCHLINUX"
+
     if os.path.isfile("/etc/fedora-release"):
         return "FEDORA"
-    # will add support for more operating systems later
 
+    # will add support for more operating systems later
     # else use custom
     else:
         return "CUSTOM"
 
-
 # standard log write out
 def logging(log):
     # grab the log path

diff --git a/src/framework.py b/src/framework.py
@@ -32,6 +32,8 @@
     os_profile = "Kali"
 else:
     os_profile = profile_os()
+
+
 print_status("Operating system detected as: " +
              bcolors.BOLD + os_profile + bcolors.ENDC)
 
@@ -364,7 +366,6 @@ def use_module(module, all_trigger):
 
                     # grab the OS type, DEBIAN, FEDORA, CUSTOM, BSD!!!! WOW!!,
                     ostype = profile_os()
-
                     # if OSTYPE is DEBIAN
                     if ostype == "DEBIAN":
                         print_status(
@@ -548,6 +549,11 @@ def handle_prompt(prompt):
                 deb_modules = ""
                 # base holder for all arch packages
                 arch_modules = ""
+                # base holder for all fedora packages
+                fedora_modules = ""
+                # base holder for all openbsd packages
+                openbsd_modules = ""
+
                 # first we install all depends for all applications
                 print_status(
                     "We are going to first install all prereqs using apt before installing..")
@@ -566,6 +572,7 @@ def handle_prompt(prompt):
                             # update depend modules
                             filename_short = str(filename_short)
                             ostype = profile_os()
+
                             if ostype == "DEBIAN":
                                 if not "install_update_all" in filename_short:
                                     from src.platforms.debian import base_install_modules
@@ -599,6 +606,7 @@ def handle_prompt(prompt):
 
                 # install all of the packages at once
                 ostype = profile_os()
+
                 if ostype == "DEBIAN":
                     deb_modules = deb_modules.replace(",", " ")
                     if deb_modules != "":