move string functions

empire/server/api/v2/download/download_dto.py

@@ -5,7 +5,7 @@
 from pydantic import BaseModel
 
 from empire.server.api.v2.tag.tag_dto import Tag, domain_to_dto_tag
-from empire.server.utils.data_util import removeprefix
+from empire.server.utils.string_util import removeprefix
 
 
 def domain_to_dto_download(download):

empire/server/modules/python/persistence/multi/desktopfile.py

@@ -1,7 +1,7 @@
 from typing import Dict
 
 from empire.server.core.module_models import EmpireModule
-from empire.server.utils.data_util import removeprefix, removesuffix
+from empire.server.utils.string_util import removeprefix, removesuffix
 
 
 class Module:

empire/server/modules/python/persistence/osx/CreateHijacker.py

@@ -2,7 +2,7 @@
 from typing import Dict, Optional, Tuple
 
 from empire.server.core.module_models import EmpireModule
-from empire.server.utils.data_util import removeprefix, removesuffix
+from empire.server.utils.string_util import removeprefix, removesuffix
 
 
 class Module:

empire/server/modules/python/persistence/osx/LaunchAgent.py

@@ -2,7 +2,7 @@
 from typing import Dict, Optional, Tuple
 
 from empire.server.core.module_models import EmpireModule
-from empire.server.utils.data_util import removeprefix, removesuffix
+from empire.server.utils.string_util import removeprefix, removesuffix
 
 
 class Module:

empire/server/modules/python/persistence/osx/LaunchAgentUserLandPersistence.py

@@ -1,7 +1,7 @@
 from typing import Dict, Optional, Tuple
 
 from empire.server.core.module_models import EmpireModule
-from empire.server.utils.data_util import removeprefix, removesuffix
+from empire.server.utils.string_util import removeprefix, removesuffix
 
 
 class Module:

empire/server/stagers/osx/application.py

@@ -1,6 +1,6 @@
 import logging
 
-from empire.server.utils.data_util import removeprefix, removesuffix
+from empire.server.utils.string_util import removeprefix, removesuffix
 
 log = logging.getLogger(__name__)
 

empire/server/stagers/osx/dylib.py

@@ -1,5 +1,5 @@
 from empire.server.common import helpers
-from empire.server.utils.data_util import removeprefix, removesuffix
+from empire.server.utils.string_util import removeprefix, removesuffix
 
 
 class Stager:

empire/server/stagers/osx/pkg.py

@@ -1,5 +1,5 @@
 from empire.server.common import helpers
-from empire.server.utils.data_util import removeprefix, removesuffix
+from empire.server.utils.string_util import removeprefix, removesuffix
 
 
 class Stager:

empire/server/utils/data_util.py

@@ -86,17 +86,3 @@ def ps_convert_to_oneliner(psscript):
 def is_port_in_use(port: int) -> bool:
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         return s.connect_ex(("localhost", port)) == 0
-
-
-def removeprefix(s, prefix):
-    # Remove when we drop Python 3.8 support
-    if s.startswith(prefix):
-        return s[len(prefix) :]
-    return s
-
-
-def removesuffix(s, suffix):
-    # Remove when we drop Python 3.8 support
-    if s.endswith(suffix):
-        return s[: -len(suffix)]
-    return s

empire/server/utils/string_util.py

@@ -0,0 +1,12 @@
+def removeprefix(s, prefix):
+    # Remove when we drop Python 3.8 support
+    if s.startswith(prefix):
+        return s[len(prefix) :]
+    return s
+
+
+def removesuffix(s, suffix):
+    # Remove when we drop Python 3.8 support
+    if s.endswith(suffix):
+        return s[: -len(suffix)]
+    return s

empire/test/test_data_util.py → empire/test/test_string_util.py

@@ -1,4 +1,4 @@
-from empire.server.utils.data_util import removeprefix, removesuffix
+from empire.server.utils.string_util import removeprefix, removesuffix
 
 
 def test_remove_prefix():