5.0 Download API (#290)

.gitignore

@@ -34,3 +34,5 @@ empire/client/generated-stagers
 
 empire/server/v2/api/static/*
 starkiller-dist.tar.gz
+
+empire/test/downloads

empire/server/common/agents.py

@@ -65,7 +65,7 @@
 from builtins import object, str
 from datetime import datetime, timezone
 
-from pydispatch import dispatcher
+# from pydispatch import dispatcher
 from sqlalchemy import and_, func, or_, update
 from sqlalchemy.orm import Session, undefer
 from zlib_wrapper import decompress
@@ -317,6 +317,8 @@ def save_file(
             sessionID = nameid
 
         lang = self.get_language_db(sessionID)
+
+        # todo this doesn't work for non-windows. All files are stored flat.
         parts = path.split("\\")
 
         # construct the appropriate save path
@@ -1156,7 +1158,7 @@ def handle_agent_staging(
                             sessionID
                         )
                         signal = json.dumps({"print": True, "message": message})
-                        dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                        # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                         return "ERROR: Invalid PowerShell public key"
 
             elif language.lower() == "python":
@@ -1165,7 +1167,7 @@ def handle_agent_staging(
                         sessionID
                     )
                     signal = json.dumps({"print": True, "message": message})
-                    dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                    # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                     return "Error: Invalid Python key post format from %s" % (sessionID)
                 else:
                     try:
@@ -1175,7 +1177,7 @@ def handle_agent_staging(
                             sessionID
                         )
                         signal = json.dumps({"print": True, "message": message})
-                        dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                        # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                         return "Error: Invalid Python key post format from {}".format(
                             sessionID
                         )
@@ -1192,7 +1194,7 @@ def handle_agent_staging(
                         sessionID, clientIP
                     )
                     signal = json.dumps({"print": True, "message": message})
-                    dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                    # dispatcher.send(signal, sender="agents/{}".format(sessionID))
 
                     delay = listenerOptions["DefaultDelay"]["Value"]
                     jitter = listenerOptions["DefaultJitter"]["Value"]
@@ -1228,7 +1230,7 @@ def handle_agent_staging(
                     sessionID, clientIP, language
                 )
                 signal = json.dumps({"print": True, "message": message})
-                dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                 return "ERROR: invalid language: {}".format(language)
 
         elif meta == "STAGE2":
@@ -1249,7 +1251,7 @@ def handle_agent_staging(
                         )
                     )
                     signal = json.dumps({"print": True, "message": message})
-                    dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                    # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                     # remove the agent from the cache/database
                     self.mainMenu.agents.remove_agent_db(sessionID)
                     return (
@@ -1263,7 +1265,7 @@ def handle_agent_staging(
                 ):
                     message = "[!] Invalid nonce returned from {}".format(sessionID)
                     signal = json.dumps({"print": True, "message": message})
-                    dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                    # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                     # remove the agent from the cache/database
                     self.mainMenu.agents.remove_agent_db(sessionID)
                     return "ERROR: Invalid nonce returned from %s" % (sessionID)
@@ -1272,7 +1274,7 @@ def handle_agent_staging(
                     sessionID, message
                 )
                 signal = json.dumps({"print": False, "message": message})
-                dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                # dispatcher.send(signal, sender="agents/{}".format(sessionID))
 
                 listener = str(parts[1], "utf-8")
                 domainname = str(parts[2], "utf-8")
@@ -1299,7 +1301,7 @@ def handle_agent_staging(
                     )
                 )
                 signal = json.dumps({"print": True, "message": message})
-                dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                 # remove the agent from the cache/database
                 self.mainMenu.agents.remove_agent_db(sessionID)
                 return (
@@ -1348,7 +1350,7 @@ def handle_agent_staging(
                 sessionID, clientIP
             )
             signal = json.dumps({"print": True, "message": message})
-            dispatcher.send(signal, sender="agents/{}".format(sessionID))
+            # dispatcher.send(signal, sender="agents/{}".format(sessionID))
 
             agent = self.mainMenu.agents.get_agent_for_socket(sessionID)
             hooks.run_hooks(
@@ -1390,7 +1392,7 @@ def handle_agent_staging(
                 sessionID, clientIP, meta
             )
             signal = json.dumps({"print": True, "message": message})
-            dispatcher.send(signal, sender="agents/{}".format(sessionID))
+            # dispatcher.send(signal, sender="agents/{}".format(sessionID))
 
     def handle_agent_data(
         self,
@@ -1411,7 +1413,7 @@ def handle_agent_data(
                 len(routingPacket)
             )
             signal = json.dumps({"print": False, "message": message})
-            dispatcher.send(signal, sender="empire")
+            # dispatcher.send(signal, sender="empire")
             return None
 
         if isinstance(routingPacket, str):
@@ -1431,7 +1433,7 @@ def handle_agent_data(
                     )
                 )
                 signal = json.dumps({"print": False, "message": message})
-                dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                 dataToReturn.append(
                     (
                         language,
@@ -1453,7 +1455,7 @@ def handle_agent_data(
                     sessionID
                 )
                 signal = json.dumps({"print": False, "message": message})
-                dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                 dataToReturn.append(
                     ("", "ERROR: sessionID %s not in cache!" % (sessionID))
                 )
@@ -1463,7 +1465,7 @@ def handle_agent_data(
                     sessionID
                 )
                 signal = json.dumps({"print": False, "message": message})
-                dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                 dataToReturn.append(
                     (
                         language,
@@ -1478,7 +1480,7 @@ def handle_agent_data(
                     )
                 )
                 signal = json.dumps({"print": False, "message": message})
-                dispatcher.send(signal, sender="agents/{}".format(sessionID))
+                # dispatcher.send(signal, sender="agents/{}".format(sessionID))
                 dataToReturn.append(
                     (
                         language,
@@ -1912,7 +1914,9 @@ def process_agent_packet(
 
             # attach file to tasking
             download = models.Download(
-                location=final_save_path, size=os.path.getsize(final_save_path)
+                location=final_save_path,
+                filename=final_save_path.split("/")[-1],
+                size=os.path.getsize(final_save_path),
             )
             db.add(download)
             db.flush()
@@ -1930,7 +1934,7 @@ def process_agent_packet(
                         )
                     )
                     signal = json.dumps({"print": True, "message": message})
-                    dispatcher.send(signal, sender="agents/{}".format(self.sessionID))
+                    # dispatcher.send(signal, sender="agents/{}".format(self.sessionID))
                     return
 
                 with open(savePath, "a+") as f:
@@ -2061,7 +2065,7 @@ def process_agent_packet(
             self.save_agent_log(session_id, data)
             message = "[+] Updated comms for {} to {}".format(session_id, listener_name)
             signal = json.dumps({"print": False, "message": message})
-            dispatcher.send(signal, sender="agents/{}".format(session_id))
+            # dispatcher.send(signal, sender="agents/{}".format(session_id))
 
         elif response_name == "TASK_UPDATE_LISTENERNAME":
             # The agent listener name variable has been updated agent side

empire/server/common/empire.py

@@ -20,7 +20,8 @@
 
 from prompt_toolkit import HTML, PromptSession
 from prompt_toolkit.patch_stdout import patch_stdout
-from pydispatch import dispatcher
+
+# from pydispatch import dispatcher
 from sqlalchemy import and_, func, or_
 
 from empire.server.common import hooks_internal
@@ -447,7 +448,7 @@ def preobfuscate_modules(self, obfuscation_command, reobfuscate=False):
                         "obfuscated_file": os.path.basename(file),
                     }
                 )
-                dispatcher.send(signal, sender="empire")
+                # dispatcher.send(signal, sender="empire")
             else:
                 print(
                     helpers.color(

empire/server/common/events.py

@@ -7,11 +7,12 @@
 
 import json
 
-from pydispatch import dispatcher
-
 from empire.server.database import models
 from empire.server.database.base import SessionLocal
 
+# from pydispatch import dispatcher
+
+
 # from empire.server.common import db # used in the disabled TODO below
 
 ################################################################################

empire/server/common/helpers.py

@@ -40,16 +40,13 @@
 """
 from __future__ import division, print_function
 
-import json
-
-from future import standard_library
-
-standard_library.install_aliases()
 import base64
 import binascii
 import datetime
 import fnmatch
 import hashlib
+import json
+import numbers
 import os
 import random
 import re
@@ -66,7 +63,6 @@
 
 import iptools
 import netifaces
-from past.utils import old_div
 
 ###############################################################
 #
@@ -658,6 +654,17 @@ def get_file_datetime():
     return datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
 
 
+def old_div(a, b):
+    """
+    Equivalent to ``a / b`` on Python 2 without ``from __future__ import
+    division``.
+    """
+    if isinstance(a, numbers.Integral) and isinstance(b, numbers.Integral):
+        return a // b
+    else:
+        return a / b
+
+
 def get_file_size(file):
     """
     Returns a string with the file size and highest rating.

empire/server/common/http.py

@@ -24,11 +24,11 @@
 import threading
 from http.server import BaseHTTPRequestHandler
 
-from pydispatch import dispatcher
-
 # Empire imports
 from . import helpers
 
+# from pydispatch import dispatcher
+
 
 def default_page(path_to_html_file="empty"):
     if path_to_html_file == "empty":

empire/server/common/packets.py

@@ -66,11 +66,12 @@
 import struct
 import sys
 
-from pydispatch import dispatcher
-
 # Empire imports
 from . import encryption
 
+# from pydispatch import dispatcher
+
+
 # 0         -> error
 # 1-99      -> standard functionality
 # 100-199   -> dynamic functionality

empire/server/common/pylnk.py

@@ -23,9 +23,6 @@
 
 from __future__ import print_function
 
-from future import standard_library
-
-standard_library.install_aliases()
 import re
 import time
 from builtins import chr, object, range, str

empire/server/common/stagers.py

@@ -26,12 +26,12 @@
 
 import donut
 import macholib.MachO
-from past.utils import old_div
 
 from empire.server.database import models
 from empire.server.database.base import SessionLocal
 
 from . import helpers
+from .helpers import old_div
 
 
 class Stagers(object):

empire/server/database/models.py

@@ -52,6 +52,13 @@
     Column("download_id", Integer, ForeignKey("downloads.id")),
 )
 
+# this doesn't actually join to anything atm, but is used for the filtering in api/v2/downloads
+upload_download_assc = Table(
+    "upload_download_assc",
+    Base.metadata,
+    Column("download_id", Integer, ForeignKey("downloads.id")),
+)
+
 
 class User(Base):
     __tablename__ = "users"