fix a couple of the errors in onedrive listener (#600)

* fix a couple of the errors in onedrive listener

* more fixes

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -   Fixed issue with install path not being used properly when switching empire location (@Vinnybod)
 -   Lock nim version in the install script (@Vinnybod)
+-   Fixes for the onedrive listener that broke with 5.0 (@Vinnybod)
 
 ## [5.2.0] - 2023-03-31
 

empire/server/common/agents.py

@@ -532,13 +532,7 @@ def get_agents_for_listener(self, listener_name):
                 .all()
             )
 
-        if agents:
-            # make sure names all ascii encoded
-            results = [r[0].encode("ascii", "ignore") for r in agents]
-        else:
-            results = []
-
-        return results
+            return [a[0] for a in agents]
 
     def get_autoruns_db(self):
         """

empire/server/listeners/dbx.py

@@ -926,9 +926,6 @@ def delete_file(dbx, path):
 
             # get any taskings applicable for agents linked to this listener
             sessionIDs = self.mainMenu.agents.get_agents_for_listener(listenerName)
-            for x in range(len(sessionIDs)):
-                if isinstance(sessionIDs[x], bytes):
-                    sessionIDs[x] = sessionIDs[x].decode("UTF-8")
 
             for sessionID in sessionIDs:
                 taskingData = self.mainMenu.agents.handle_agent_request(

empire/server/listeners/onedrive.py

@@ -851,9 +851,6 @@ def upload_stager():
                     try:
                         agent_id = item["name"].split(".")[0]
 
-                        for i in range(len(agent_ids)):
-                            agent_ids[i] = agent_ids[i].decode("UTF-8")
-
                         if (
                             agent_id not in agent_ids
                         ):  # If we don't recognize that agent, upload a message to restage
@@ -868,7 +865,8 @@ def upload_stager():
                             s.delete("%s/drive/items/%s" % (base_url, item["id"]))
                             continue
 
-                        self.mainMenu.agents.update_agent_lastseen_db(agent_id)
+                        with SessionLocal() as db:
+                            self.mainMenu.agents.update_agent_lastseen_db(agent_id, db)
 
                         # If the agent is just checking in, the file will only be 1 byte, so no results to fetch
                         if item["size"] > 1: