Merge branch 'main' into main

Author: dhondta

.gitignore

@@ -72,3 +72,4 @@ tmp
 TODO
 script.py
 tool.py
+testsploit/workspace/*

pyproject.toml

@@ -34,13 +34,14 @@ classifiers = [
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 dependencies = [
-  "peewee",
-  "prompt_toolkit>=3.0.32",
+  "peewee>=3.17.6",
+  "prompt_toolkit>=3.0.47",
   "requests",
-  "tinyscript>=1.28.6",
+  "tinyscript>=1.30.15",
 ]
 dynamic = ["version"]
 

src/sploitkit/core/components/config.py

@@ -1,9 +1,4 @@
 # -*- coding: UTF-8 -*-
-import re
-from itertools import chain
-from termcolor import colored
-from tinyscript.helpers import is_function, BorderlessTable, Path
-
 from .logger import *
 
 
@@ -94,15 +89,17 @@ def __str__(self):
                 continue
             r = ["N", "Y"][r]
             if v == "":
+                from tinyscript.helpers import colored
                 n, v, r = map(lambda s: colored(s, "red", attrs=['bold']), [n, v, r])
             data.append([n, v, r, d])
         if len(data) > 1:
+            from tinyscript.helpers import BorderlessTable
             try:
                 prefix = self.console.opt_prefix
             except AttributeError:
                 prefix = None
             return BorderlessTable(data).table if prefix is None else \
-                   BorderlessTable(data, "%s options" % prefix).table
+                   BorderlessTable(data, f"{prefix} options").table
         return ""
 
     def __run_callback(self, key, name):
@@ -181,6 +178,7 @@ def items(self, fail=True):
 
     def keys(self, glob=False):
         """ Return string keys (like original dict). """
+        from itertools import chain
         l = [k for k in self._d.keys()]
         if glob:
             for k in chain(self._d.keys(), Config._g.keys()):
@@ -325,6 +323,7 @@ def bind(self, parent):
     @property
     def choices(self):
         """ Pre- or lazy-computed list of choices. """
+        from tinyscript.helpers import is_function
         c = self._choices
         if not is_function(c):
             return c
@@ -369,9 +368,11 @@ def value(self):
             value = Config._g.get(self.name, value)
         if self.required and value is None:
             raise ValueError(f"{self.name} must be defined")
-        try: # try to expand format variables using console's attributes
+        # try to expand format variables using console's attributes
+        from re import findall
+        try:
             kw = {}
-            for n in re.findall(r'\{([a-z]+)\}', str(value)):
+            for n in findall(r'\{([a-z]+)\}', str(value)):
                 kw[n] = self.config.console.__dict__.get(n, "")
             try:
                 value = value.format(**kw)
@@ -381,6 +382,7 @@ def value(self):
             pass
         # expand and resolve paths
         if self.name.endswith("FOLDER") or self.name.endswith("WORKSPACE"):
+            from tinyscript.helpers import Path
             # this will ensure that every path is expanded
             value = str(Path(value, expand=True))
         # convert common formats to their basic types

src/sploitkit/core/components/files.py

@@ -4,7 +4,7 @@
 from ftplib import FTP, FTP_TLS
 from shutil import which
 from subprocess import call, PIPE
-from tinyscript.helpers import b, ensure_str, txt_terminal_render, Path, TempPath
+from tinyscript.helpers import Path
 
 
 __all__ = ["FilesManager"]
@@ -42,7 +42,7 @@ def edit(self, filename):
         #FIXME: edit by calling the locator and manage its local file (e.g. for a URL, point to a temp folder)
         ted = self.console.config['TEXT_EDITOR']
         if which(ted) is None:
-            raise ValueError("'%s' does not exist or is not installed" % ted)
+            raise ValueError(f"'{ted}' does not exist or is not installed")
         p = Path(self.console.config['WORKSPACE']).joinpath(filename)
         if not p.exists():
             p.touch()
@@ -78,7 +78,7 @@ def page(self, *filenames):
         """ Page a list of files using Less. """
         tvw = self.console.config['TEXT_VIEWER']
         if which(tvw) is None:
-            raise ValueError("'%s' does not exist or is not installed" % tvw)
+            raise ValueError(f"'{tvw}' does not exist or is not installed")
         filenames = list(map(str, filenames))
         for f in filenames:
             if not Path(str(f)).is_file():
@@ -98,6 +98,7 @@ def save(self, key, dst):
 
     def view(self, key):
         """ View a file using the configured text viewer. """
+        from tinyscript.helpers import txt_terminal_render
         try:
             self.page_text(self[key])
         except KeyError:
@@ -120,7 +121,8 @@ def list(self):
     @property
     def tempdir(self):
         """ Get the temporary directory. """
+        from tinyscript.helpers import TempPath
         if not hasattr(self, "_tempdir"):
-            self._tempdir = TempPath(prefix="%s-" % self.console.appname, length=16)
+            self._tempdir = TempPath(prefix=f"{self.console.appname}-", length=16)
         return self._tempdir
 

src/sploitkit/core/components/jobs.py

@@ -1,11 +1,8 @@
 # -*- coding: UTF-8 -*-
 import shlex
 import subprocess
-from six import string_types
-from time import time
 from tinyscript.helpers.text import ansi_seq_strip
 
-from sploitkit.core.components.logger import null_logger
 
 __all__ = ["JobsPool"]
 
@@ -20,7 +17,7 @@ def __init__(self, cmd, **kwargs):
         debug = not kwargs.pop('no_debug', False)
         if debug:
             self.parent.logger.debug(" ".join(cmd) if isinstance(cmd, (tuple, list)) else cmd)
-        cmd = shlex.split(cmd) if isinstance(cmd, string_types) and not kwargs.get('shell', False) else cmd
+        cmd = shlex.split(cmd) if isinstance(cmd, str) and not kwargs.get('shell', False) else cmd
         super(Job, self).__init__(cmd, stdout=subprocess.PIPE, **kwargs)
         self._debug = debug
 
@@ -86,6 +83,7 @@ def run(self, cmd, stdin=None, show=False, timeout=None, ansi_strip=True, **kwar
         return out, err
 
     def run_iter(self, cmd, timeout=None, ansi_strip=True, **kwargs):
+        from time import time
         kwargs['stderr'] = subprocess.STDOUT
         kwargs['universal_newlines'] = True
         p = Job(cmd, parent=self, **kwargs)
@@ -124,5 +122,6 @@ def terminate(self, subpool=None):
     def logger(self):
         if hasattr(self, "console"):
             return self.console.logger
+        from sploitkit.core.components.logger import null_logger
         return null_logger
 

src/sploitkit/core/components/logger.py

@@ -1,7 +1,5 @@
 # -*- coding: utf8 -*-
-from logging.handlers import RotatingFileHandler
-from termcolor import colored
-from tinyscript import logging
+from tinyscript import colored, logging
 
 
 __all__ = ["get_logger", "null_logger", "set_logging_level"]
@@ -54,6 +52,7 @@ def emit(self, record):
 def get_logger(name, logfile=None, level="INFO", dev=False, enabled=True):
     """ Logger initialization function. """
     def _setup_logfile(l):
+        from logging.handlers import RotatingFileHandler
         if logfile is not None and not any(isinstance(h, RotatingFileHandler) for h in l.handlers):
             l.__logfile__ = logfile
             # setup a FileHandler for logging to a file (at level DEBUG)

src/sploitkit/core/components/recorder.py

@@ -1,7 +1,4 @@
 # -*- coding: UTF-8 -*-
-from tinyscript.helpers import Path
-
-
 __all__ = ["Recorder"]
 
 
@@ -24,6 +21,7 @@ def save(self, text):
 
     def start(self, filename, overwrite=False):
         """ Start the recorder, creating the record file. """
+        from tinyscript.helpers import Path
         self.__file = f = Path(filename)
         if f.suffix != ".rc":
             self.__file = f = Path(self.root_dir).joinpath(filename + ".rc")

src/sploitkit/core/components/sessions.py

@@ -1,20 +1,19 @@
 # -*- coding: UTF-8 -*-
 import os
-import shlex
-import shutil
-from subprocess import Popen
-from tinyscript.helpers import Path
+
 
 __all__ = ["SessionsManager"]
 
 
 class Session(object):
     """ Class representing a session object based on a shell command """
     def __init__(self, n, cmd, **kwargs):
+        from shlex import split
+        from tinyscript.helpers import Path
         self.id = n
         self.parent = kwargs.pop('parent')
         if isinstance(cmd, str):
-            cmd = shlex.split(cmd)
+            cmd = split(cmd)
         self._path = Path(self.parent.console._files.tempdir, "session", str(n), create=True)
         for i, s in enumerate(["stdin", "stdout", "stderr"]):
             fifo = str(self._path.joinpath(str(i)))
@@ -23,13 +22,15 @@ def __init__(self, n, cmd, **kwargs):
             setattr(self, "_" + s, os.open(fifo ,os.O_WRONLY))
 
     def close(self):
+        from shutil import rmtree
         for s in ["stdin", "stdout", "stderr"]:
             getattr(self, "_" + s).close()
-        shutil.rmtree(str(self._path))
+        rmtree(str(self._path))
         self._process.wait()
         del self.parent[self.id]
 
     def start(self, **kwargs):
+        from subprocess import Popen
         kwargs['close_fds'] = True
         kwargs['preexec_fn'] = os.setsid  # NB: see subprocess' doc ; preexec_fn is not thread-safe
         self._process = Popen(cmd, stdout=self._stdout, stderr=self._stderr, stdin=self._stdin, **kwargs) 

src/sploitkit/core/components/store.py

@@ -1,7 +1,4 @@
 # -*- coding: UTF-8 -*-
-import re
-from os import remove
-from shutil import copy
 from peewee import SqliteDatabase
 
 
@@ -88,6 +85,7 @@ def __init__(self, path, *args, **kwargs):
 
     def __getattr__(self, name):
         """ Override getattr to handle add_* store methods. """
+        from re import match
         if name == "basemodels":
             BaseModel = self._pool._entity_class._subclasses["basemodel"]
             return self._pool._entity_class._subclasses[BaseModel]
@@ -96,7 +94,7 @@ def __getattr__(self, name):
             return self._pool._entity_class._subclasses[Model]
         elif name == "volatile":
             return self.path == ":memory:"
-        elif re.match(r"^[gs]et_[a-z]+", name) and name != "model":
+        elif match(r"^[gs]et_[a-z]+", name) and name != "model":
             model = "".join(w.capitalize() for w in name.split("_")[1:])
             cls = self.get_model(model)
             if cls is not None:
@@ -121,9 +119,11 @@ def snapshot(self, save=True):
         if save:
             self._last_snapshot += 1
         s = f"{self.path}.snapshot{self._last_snapshot}"
+        from shutil import copy
         copy(self.path, s) if save else copy(s, self.path)
         if not save:
-            remove(f"{self.path}.snapshot{self._last_snapshot}")
+            from os import remove
+            remove("{}.snapshot{}".format(self.path, self._last_snapshot))
             self._last_snapshot -= 1
         self.connect()