5.0 - Moving files (#415)

* moving files around

* move starkiller submodule

* rename more files

.gitignore

@@ -10,7 +10,7 @@ empire/server/data/misc/ToObfuscate.ps1
 empire/server/data/misc/Obfuscated.ps1
 empire/server/data/generated-stagers/*
 empire/server/downloads/*
-empire/server/v2/api/static/*
+empire/server/api/static/*
 
 # client
 empire/client/generated-stagers/*

.gitmodules

@@ -43,6 +43,6 @@
 [submodule "empire/server/plugins/ChiselServer-Plugin"]
 	path = empire/server/plugins/ChiselServer-Plugin
 	url = https://github.com/BC-SECURITY/ChiselServer-Plugin.git
-[submodule "empire/server/v2/api/starkiller"]
-	path = empire/server/v2/api/starkiller
+[submodule "empire/server/api/v2/starkiller"]
+	path = empire/server/api/v2/starkiller
 	url = git@github.com:BC-SECURITY/Starkiller-Sponsors.git

empire/server/v2/api/v2App.py → empire/server/api/app.py

@@ -10,8 +10,8 @@
 from starlette.middleware.gzip import GZipMiddleware
 from starlette.staticfiles import StaticFiles
 
-from empire.server.v2.api.EmpireCORSMiddleware import EmpireCORSMiddleware
-from empire.server.v2.api.websocket.v2_socketio import setup_socket_events
+from empire.server.api.middleware import EmpireCORSMiddleware
+from empire.server.api.v2.websocket.socketio import setup_socket_events
 
 log = logging.getLogger(__name__)
 
@@ -42,20 +42,20 @@ def default(self, o):
 
 def initialize():
     # Not pretty but allows us to use main_menu by delaying the import
+    from empire.server.api.v2.agent import agent_api, agent_file_api, agent_task_api
+    from empire.server.api.v2.bypass import bypass_api
+    from empire.server.api.v2.credential import credential_api
+    from empire.server.api.v2.download import download_api
+    from empire.server.api.v2.host import host_api, process_api
+    from empire.server.api.v2.listener import listener_api, listener_template_api
+    from empire.server.api.v2.meta import meta_api
+    from empire.server.api.v2.module import module_api
+    from empire.server.api.v2.obfuscation import obfuscation_api
+    from empire.server.api.v2.plugin import plugin_api
+    from empire.server.api.v2.profile import profile_api
+    from empire.server.api.v2.stager import stager_api, stager_template_api
+    from empire.server.api.v2.user import user_api
     from empire.server.server import main
-    from empire.server.v2.api.agent import agentfilev2, agentv2, taskv2
-    from empire.server.v2.api.bypass import bypassv2
-    from empire.server.v2.api.credential import credentialv2
-    from empire.server.v2.api.download import downloadv2
-    from empire.server.v2.api.host import hostv2, processv2
-    from empire.server.v2.api.listener import listenertemplatev2, listenerv2
-    from empire.server.v2.api.meta import metav2
-    from empire.server.v2.api.module import modulev2
-    from empire.server.v2.api.obfuscation import obfuscationv2
-    from empire.server.v2.api.plugin import pluginv2
-    from empire.server.v2.api.profile import profilev2
-    from empire.server.v2.api.stager import stagertemplatev2, stagerv2
-    from empire.server.v2.api.user import userv2
 
     v2App = FastAPI()
 
@@ -66,24 +66,24 @@ def shutdown_event():
             log.info("Shutting down MainMenu...")
             main.shutdown()
 
-    v2App.include_router(listenertemplatev2.router)
-    v2App.include_router(listenerv2.router)
-    v2App.include_router(stagertemplatev2.router)
-    v2App.include_router(stagerv2.router)
-    v2App.include_router(taskv2.router)
-    v2App.include_router(agentv2.router)
-    v2App.include_router(agentfilev2.router)
-    v2App.include_router(userv2.router)
-    v2App.include_router(modulev2.router)
-    v2App.include_router(bypassv2.router)
-    v2App.include_router(obfuscationv2.router)
-    v2App.include_router(processv2.router)
-    v2App.include_router(profilev2.router)
-    v2App.include_router(credentialv2.router)
-    v2App.include_router(hostv2.router)
-    v2App.include_router(downloadv2.router)
-    v2App.include_router(metav2.router)
-    v2App.include_router(pluginv2.router)
+    v2App.include_router(listener_template_api.router)
+    v2App.include_router(listener_api.router)
+    v2App.include_router(stager_template_api.router)
+    v2App.include_router(stager_api.router)
+    v2App.include_router(agent_task_api.router)
+    v2App.include_router(agent_api.router)
+    v2App.include_router(agent_file_api.router)
+    v2App.include_router(user_api.router)
+    v2App.include_router(module_api.router)
+    v2App.include_router(bypass_api.router)
+    v2App.include_router(obfuscation_api.router)
+    v2App.include_router(process_api.router)
+    v2App.include_router(profile_api.router)
+    v2App.include_router(credential_api.router)
+    v2App.include_router(host_api.router)
+    v2App.include_router(download_api.router)
+    v2App.include_router(meta_api.router)
+    v2App.include_router(plugin_api.router)
 
     v2App.add_middleware(
         EmpireCORSMiddleware,
@@ -121,11 +121,12 @@ def shutdown_event():
     try:
         v2App.mount(
             "/",
-            StaticFiles(directory="empire/server/v2/api/starkiller/dist"),
+            StaticFiles(directory="empire/server/api/v2/starkiller/dist"),
             name="static",
         )
         log.info("Starkiller served at http://localhost:1337/index.html")
     except Exception as e:
+        log.warning("Failed to load Starkiller: %s", e)
         pass
 
     cert_path = os.path.abspath("./empire/server/data/")

empire/server/v2/api/jwt_auth.py → empire/server/api/jwt_auth.py

@@ -9,9 +9,9 @@
 from sqlalchemy.orm import Session
 from starlette import status
 
+from empire.server.api.v2.shared_dependencies import get_db
 from empire.server.database import models
 from empire.server.database.base import SessionLocal
-from empire.server.v2.api.shared_dependencies import get_db
 
 # This all comes from the amazing fastapi docs: https://fastapi.tiangolo.com/tutorial/security/oauth2-jwt/
 SECRET_KEY = SessionLocal().query(models.Config).first().jwt_secret_key

empire/server/v2/api/agent/agentv2.py → empire/server/api/v2/agent/agent_api.py

@@ -1,18 +1,18 @@
 from fastapi import Depends, HTTPException
 from sqlalchemy.orm import Session
 
-from empire.server.database import models
-from empire.server.server import main
-from empire.server.v2.api.agent.agent_dto import (
+from empire.server.api.api_router import APIRouter
+from empire.server.api.jwt_auth import get_current_active_user
+from empire.server.api.v2.agent.agent_dto import (
     Agent,
     Agents,
     AgentUpdateRequest,
     domain_to_dto_agent,
 )
-from empire.server.v2.api.EmpireApiRouter import APIRouter
-from empire.server.v2.api.jwt_auth import get_current_active_user
-from empire.server.v2.api.shared_dependencies import get_db
-from empire.server.v2.api.shared_dto import BadRequestResponse, NotFoundResponse
+from empire.server.api.v2.shared_dependencies import get_db
+from empire.server.api.v2.shared_dto import BadRequestResponse, NotFoundResponse
+from empire.server.database import models
+from empire.server.server import main
 
 agent_service = main.agentsv2
 

empire/server/v2/api/agent/agent_dto.py → empire/server/api/v2/agent/agent_dto.py

@@ -3,8 +3,8 @@
 
 from pydantic import BaseModel
 
+from empire.server.api.v2.shared_dto import PROXY_ID
 from empire.server.database import models
-from empire.server.v2.api.shared_dto import PROXY_ID
 
 
 def domain_to_dto_agent(agent: models.Agent):

empire/server/v2/api/agent/agentfilev2.py → empire/server/api/v2/agent/agent_file_api.py

@@ -3,15 +3,15 @@
 from fastapi import Depends, HTTPException
 from sqlalchemy.orm import Session
 
+from empire.server.api.api_router import APIRouter
+from empire.server.api.jwt_auth import get_current_active_user
+from empire.server.api.v2.agent.agent_file_dto import AgentFile, domain_to_dto_file
+from empire.server.api.v2.shared_dependencies import get_db
+from empire.server.api.v2.shared_dto import BadRequestResponse, NotFoundResponse
+from empire.server.core.agent_file_service import AgentFileService
+from empire.server.core.agent_service import AgentService
 from empire.server.database import models
 from empire.server.server import main
-from empire.server.v2.api.agent.agent_file_dto import AgentFile, domain_to_dto_file
-from empire.server.v2.api.EmpireApiRouter import APIRouter
-from empire.server.v2.api.jwt_auth import get_current_active_user
-from empire.server.v2.api.shared_dependencies import get_db
-from empire.server.v2.api.shared_dto import BadRequestResponse, NotFoundResponse
-from empire.server.v2.core.agent_file_service import AgentFileService
-from empire.server.v2.core.agent_service import AgentService
 
 agent_file_service: AgentFileService = main.agentfilesv2
 agent_service: AgentService = main.agentsv2

empire/server/v2/api/agent/agent_file_dto.py → empire/server/api/v2/agent/agent_file_dto.py

@@ -6,11 +6,11 @@
 
 from pydantic import BaseModel
 
-from empire.server.database import models
-from empire.server.v2.api.shared_dto import (
+from empire.server.api.v2.shared_dto import (
     DownloadDescription,
     domain_to_dto_download_description,
 )
+from empire.server.database import models
 
 
 def domain_to_dto_file(file: models.AgentFile, children: List[models.AgentFile]):

empire/server/v2/api/agent/taskv2.py → empire/server/api/v2/agent/agent_task_api.py

@@ -8,10 +8,9 @@
 from starlette.responses import Response
 from starlette.status import HTTP_204_NO_CONTENT
 
-from empire.server.database import models
-from empire.server.database.models import TaskingStatus
-from empire.server.server import main
-from empire.server.v2.api.agent.task_dto import (
+from empire.server.api.api_router import APIRouter
+from empire.server.api.jwt_auth import get_current_active_user, get_current_user
+from empire.server.api.v2.agent.agent_task_dto import (
     CommsPostRequest,
     DirectoryListPostRequest,
     DownloadPostRequest,
@@ -30,18 +29,19 @@
     WorkingHoursPostRequest,
     domain_to_dto_task,
 )
-from empire.server.v2.api.EmpireApiRouter import APIRouter
-from empire.server.v2.api.jwt_auth import get_current_active_user, get_current_user
-from empire.server.v2.api.shared_dependencies import get_db
-from empire.server.v2.api.shared_dto import (
+from empire.server.api.v2.shared_dependencies import get_db
+from empire.server.api.v2.shared_dto import (
     PROXY_NAME,
     BadRequestResponse,
     NotFoundResponse,
     OrderDirection,
 )
-from empire.server.v2.core.agent_service import AgentService
-from empire.server.v2.core.agent_task_service import AgentTaskService
-from empire.server.v2.core.download_service import DownloadService
+from empire.server.core.agent_service import AgentService
+from empire.server.core.agent_task_service import AgentTaskService
+from empire.server.core.download_service import DownloadService
+from empire.server.database import models
+from empire.server.database.models import TaskingStatus
+from empire.server.server import main
 
 agent_task_service: AgentTaskService = main.agenttasksv2
 agent_service: AgentService = main.agentsv2

empire/server/v2/api/agent/task_dto.py → empire/server/api/v2/agent/agent_task_dto.py

@@ -4,11 +4,11 @@
 
 from pydantic import BaseModel, Field
 
-from empire.server.database import models
-from empire.server.v2.api.shared_dto import (
+from empire.server.api.v2.shared_dto import (
     DownloadDescription,
     domain_to_dto_download_description,
 )
+from empire.server.database import models
 
 
 class TaskOrderOptions(str, Enum):

empire/server/v2/api/bypass/bypassv2.py → empire/server/api/v2/bypass/bypass_api.py

@@ -3,19 +3,19 @@
 from starlette.responses import Response
 from starlette.status import HTTP_204_NO_CONTENT
 
-from empire.server.database import models
-from empire.server.server import main
-from empire.server.v2.api.bypass.bypass_dto import (
+from empire.server.api.api_router import APIRouter
+from empire.server.api.jwt_auth import get_current_active_user
+from empire.server.api.v2.bypass.bypass_dto import (
     Bypass,
     Bypasses,
     BypassPostRequest,
     BypassUpdateRequest,
     domain_to_dto_bypass,
 )
-from empire.server.v2.api.EmpireApiRouter import APIRouter
-from empire.server.v2.api.jwt_auth import get_current_active_user
-from empire.server.v2.api.shared_dependencies import get_db
-from empire.server.v2.api.shared_dto import BadRequestResponse, NotFoundResponse
+from empire.server.api.v2.shared_dependencies import get_db
+from empire.server.api.v2.shared_dto import BadRequestResponse, NotFoundResponse
+from empire.server.database import models
+from empire.server.server import main
 
 bypass_service = main.bypassesv2
 

empire/server/v2/api/bypass/bypass_dto.py → empire/server/api/v2/bypass/bypass_dto.py

@@ -3,7 +3,7 @@
 
 from pydantic import BaseModel
 
-from empire.server.v2.api.shared_dto import Author
+from empire.server.api.v2.shared_dto import Author
 
 
 def domain_to_dto_bypass(bypass):

empire/server/v2/api/credential/credentialv2.py → empire/server/api/v2/credential/credential_api.py

@@ -5,19 +5,19 @@
 from starlette.responses import Response
 from starlette.status import HTTP_204_NO_CONTENT
 
-from empire.server.database import models
-from empire.server.server import main
-from empire.server.v2.api.credential.credential_dto import (
+from empire.server.api.api_router import APIRouter
+from empire.server.api.jwt_auth import get_current_active_user
+from empire.server.api.v2.credential.credential_dto import (
     Credential,
     CredentialPostRequest,
     Credentials,
     CredentialUpdateRequest,
     domain_to_dto_credential,
 )
-from empire.server.v2.api.EmpireApiRouter import APIRouter
-from empire.server.v2.api.jwt_auth import get_current_active_user
-from empire.server.v2.api.shared_dependencies import get_db
-from empire.server.v2.api.shared_dto import BadRequestResponse, NotFoundResponse
+from empire.server.api.v2.shared_dependencies import get_db
+from empire.server.api.v2.shared_dto import BadRequestResponse, NotFoundResponse
+from empire.server.database import models
+from empire.server.server import main
 
 credential_service = main.credentialsv2
 

empire/server/v2/api/download/downloadv2.py → empire/server/api/v2/download/download_api.py

@@ -5,22 +5,22 @@
 from sqlalchemy.orm import Session
 from starlette.responses import FileResponse
 
-from empire.server.database import models
-from empire.server.server import main
-from empire.server.v2.api.download.download_dto import (
+from empire.server.api.api_router import APIRouter
+from empire.server.api.jwt_auth import get_current_active_user
+from empire.server.api.v2.download.download_dto import (
     DownloadOrderOptions,
     Downloads,
     DownloadSourceFilter,
     domain_to_dto_download,
 )
-from empire.server.v2.api.EmpireApiRouter import APIRouter
-from empire.server.v2.api.jwt_auth import get_current_active_user
-from empire.server.v2.api.shared_dependencies import get_db
-from empire.server.v2.api.shared_dto import (
+from empire.server.api.v2.shared_dependencies import get_db
+from empire.server.api.v2.shared_dto import (
     BadRequestResponse,
     NotFoundResponse,
     OrderDirection,
 )
+from empire.server.database import models
+from empire.server.server import main
 
 download_service = main.downloadsv2
 

empire/server/v2/api/host/hostv2.py → empire/server/api/v2/host/host_api.py

@@ -1,13 +1,13 @@
 from fastapi import Depends, HTTPException
 from sqlalchemy.orm import Session
 
+from empire.server.api.api_router import APIRouter
+from empire.server.api.jwt_auth import get_current_active_user
+from empire.server.api.v2.host.host_dto import Host, Hosts, domain_to_dto_host
+from empire.server.api.v2.shared_dependencies import get_db
+from empire.server.api.v2.shared_dto import BadRequestResponse, NotFoundResponse
 from empire.server.database import models
 from empire.server.server import main
-from empire.server.v2.api.EmpireApiRouter import APIRouter
-from empire.server.v2.api.host.host_dto import Host, Hosts, domain_to_dto_host
-from empire.server.v2.api.jwt_auth import get_current_active_user
-from empire.server.v2.api.shared_dependencies import get_db
-from empire.server.v2.api.shared_dto import BadRequestResponse, NotFoundResponse
 
 host_service = main.hostsv2
 

empire/server/v2/api/host/processv2.py → empire/server/api/v2/host/process_api.py

@@ -1,17 +1,17 @@
 from fastapi import Depends, HTTPException
 from sqlalchemy.orm import Session
 
-from empire.server.database import models
-from empire.server.server import main
-from empire.server.v2.api.EmpireApiRouter import APIRouter
-from empire.server.v2.api.host.process_dto import (
+from empire.server.api.api_router import APIRouter
+from empire.server.api.jwt_auth import get_current_active_user
+from empire.server.api.v2.host.process_dto import (
     Process,
     Processes,
     domain_to_dto_process,
 )
-from empire.server.v2.api.jwt_auth import get_current_active_user
-from empire.server.v2.api.shared_dependencies import get_db
-from empire.server.v2.api.shared_dto import BadRequestResponse, NotFoundResponse
+from empire.server.api.v2.shared_dependencies import get_db
+from empire.server.api.v2.shared_dto import BadRequestResponse, NotFoundResponse
+from empire.server.database import models
+from empire.server.server import main
 
 host_process_service = main.processesv2
 host_service = main.hostsv2