diff --git a/src/dronesploit/VERSION.txt b/src/dronesploit/VERSION.txt index 207197a..deeb25f 100755 --- a/src/dronesploit/VERSION.txt +++ b/src/dronesploit/VERSION.txt @@ -1 +1 @@ -1.1.13 +1.1.15 diff --git a/src/dronesploit/__conf__.py b/src/dronesploit/__conf__.py new file mode 100644 index 0000000..23a68a4 --- /dev/null +++ b/src/dronesploit/__conf__.py @@ -0,0 +1,12 @@ +# -*- coding: UTF-8 -*- +import builtins as bi +from sploitkit import * + + +bi.Command = Command +bi.Config = Config +bi.FrameworkConsole = FrameworkConsole +bi.Module = Module +bi.Option = Option +bi.Path = Path + diff --git a/src/dronesploit/__info__.py b/src/dronesploit/__info__.py index a356118..f00c1ac 100755 --- a/src/dronesploit/__info__.py +++ b/src/dronesploit/__info__.py @@ -7,7 +7,7 @@ __author__ = "Alexandre D'Hondt" __email__ = "alexandre.dhondt@gmail.com" __copyright__ = ("A. D'Hondt", 2019) -__license__ = "agpl-3.0" +__license__ = "gpl-3.0" with open(os.path.join(os.path.dirname(__file__), "VERSION.txt")) as f: __version__ = f.read().strip() diff --git a/src/dronesploit/__init__.py b/src/dronesploit/__init__.py index 5c0c4d0..a9aac47 100644 --- a/src/dronesploit/__init__.py +++ b/src/dronesploit/__init__.py @@ -1,12 +1,26 @@ #!/usr/bin/python3 +# -*- coding: UTF-8 -*- +from tinyscript import logging +#FIXME: process deprecation warnings +logging.captureWarnings(True) + +import builtins as bi import re -from sploitkit import FrameworkConsole -from tinyscript.helpers import is_bool, ExpiringDict, Path +from sploitkit import * +from tinyscript.helpers import is_bool, ExpiringDict __all__ = ["DronesploitConsole"] +bi.Command = Command +bi.Config = Config +bi.FrameworkConsole = FrameworkConsole +bi.Module = Module +bi.Option = Option +bi.Path = Path + + class DronesploitConsole(FrameworkConsole): exclude = ["root/test", "root/help"] sources = {'banners': Path("_src", "banners"), 'entities': "_src"} diff --git a/src/dronesploit/__main__.py b/src/dronesploit/__main__.py index fd66d92..a595e95 100755 --- a/src/dronesploit/__main__.py +++ b/src/dronesploit/__main__.py @@ -22,7 +22,7 @@ def main(): parser.add_argument("--dev", action="store_true", help="development mode") initialize(exit_at_interrupt=False, sudo=True) c = DronesploitConsole( - __scriptname__, + "DroneSploit", banner_section_styles={'title': {'fgcolor': "lolcat"}}, dev=args.dev, debug=args.verbose, diff --git a/src/dronesploit/_src/commands/generic.py b/src/dronesploit/_src/commands/generic.py index 29fccff..c18428e 100755 --- a/src/dronesploit/_src/commands/generic.py +++ b/src/dronesploit/_src/commands/generic.py @@ -1,5 +1,4 @@ # -*- coding: UTF-8 -*- -from sploitkit import * from tinyscript.helpers import is_iterable from yaml import dump diff --git a/src/dronesploit/_src/commands/wifi.py b/src/dronesploit/_src/commands/wifi.py index 6143ff0..b3a6788 100755 --- a/src/dronesploit/_src/commands/wifi.py +++ b/src/dronesploit/_src/commands/wifi.py @@ -1,7 +1,6 @@ # -*- coding: UTF-8 -*- from dronesploit.wifi import * from prompt_toolkit.formatted_text import ANSI -from sploitkit import * from tinyscript.helpers import colored, BorderlessTable diff --git a/src/dronesploit/_src/modules/auxiliary/wifi/sniff.py b/src/dronesploit/_src/modules/auxiliary/wifi/sniff.py index 2c941a2..31a3ebb 100755 --- a/src/dronesploit/_src/modules/auxiliary/wifi/sniff.py +++ b/src/dronesploit/_src/modules/auxiliary/wifi/sniff.py @@ -18,7 +18,7 @@ class SniffModule(WifiModule, ScanMixin): }) path = "auxiliary/wifi" - def run(self, filter_func=lambda *a, **kw): + def run(self, filter_func=lambda *a, **kw: True): self._filter_func = filter_func ScanMixin.scan(self, self.config.option('INTERFACE').value, self.config.option('TIMEOUT').value) delattr(self, "_filter_func") diff --git a/src/dronesploit/_src/modules/command/dji/tello.py b/src/dronesploit/_src/modules/command/dji/tello.py index aa79591..deb82c0 100755 --- a/src/dronesploit/_src/modules/command/dji/tello.py +++ b/src/dronesploit/_src/modules/command/dji/tello.py @@ -1,7 +1,6 @@ # -*- coding: UTF-8 -*- from dronesploit.drones.dji import TelloModule from dronesploit.wifi.mixin import ConnectMixin -from sploitkit import * class ChangeApPassword(TelloModule): diff --git a/src/dronesploit/_src/modules/command/hobicco/cme.py b/src/dronesploit/_src/modules/command/hobicco/cme.py index d5f8d4d..7c5ff3b 100755 --- a/src/dronesploit/_src/modules/command/hobicco/cme.py +++ b/src/dronesploit/_src/modules/command/hobicco/cme.py @@ -1,7 +1,6 @@ # -*- coding: UTF-8 -*- from dronesploit.drones.hobbico import CmeModule from dronesploit.wifi.mixin import ConnectMixin -from sploitkit import * class ChangeDatetime(CmeModule): diff --git a/src/dronesploit/_src/modules/command/hobicco/flitt.py b/src/dronesploit/_src/modules/command/hobicco/flitt.py index ae2d299..ebeb06f 100755 --- a/src/dronesploit/_src/modules/command/hobicco/flitt.py +++ b/src/dronesploit/_src/modules/command/hobicco/flitt.py @@ -1,6 +1,5 @@ # -*- coding: UTF-8 -*- from dronesploit.drones.hobbico import FlittCommandModule -from sploitkit import * class ChangeDatetime(FlittCommandModule): diff --git a/src/dronesploit/_src/modules/exploit/hobbico/cme.py b/src/dronesploit/_src/modules/exploit/hobbico/cme.py index e36d0bd..08487a6 100755 --- a/src/dronesploit/_src/modules/exploit/hobbico/cme.py +++ b/src/dronesploit/_src/modules/exploit/hobbico/cme.py @@ -1,6 +1,5 @@ # -*- coding: UTF-8 -*- from dronesploit.drones.hobbico import CmeUpdateModule -from sploitkit import * class FirmwareUpdate(CmeUpdateModule): diff --git a/src/dronesploit/drones/__init__.py b/src/dronesploit/drones/__init__.py index ca6bfc2..cca6e53 100755 --- a/src/dronesploit/drones/__init__.py +++ b/src/dronesploit/drones/__init__.py @@ -1,7 +1,6 @@ # -*- coding: UTF-8 -*- import ast import socket -from sploitkit import Module from time import sleep, time from ..wifi import DeauthMixin diff --git a/src/dronesploit/drones/dji.py b/src/dronesploit/drones/dji.py index 47327af..b860216 100755 --- a/src/dronesploit/drones/dji.py +++ b/src/dronesploit/drones/dji.py @@ -3,7 +3,6 @@ import socket import time from datetime import datetime -from sploitkit import * from . import DroneModule from ..wifi import drone_filter diff --git a/src/dronesploit/drones/hobbico.py b/src/dronesploit/drones/hobbico.py index 7210523..76f40e9 100755 --- a/src/dronesploit/drones/hobbico.py +++ b/src/dronesploit/drones/hobbico.py @@ -2,7 +2,6 @@ import time import yaml from datetime import datetime -from sploitkit import * from . import DroneModule from ..generic import ftp diff --git a/src/dronesploit/wifi/__init__.py b/src/dronesploit/wifi/__init__.py index c0b825c..f2ccb11 100755 --- a/src/dronesploit/wifi/__init__.py +++ b/src/dronesploit/wifi/__init__.py @@ -1,7 +1,5 @@ # -*- coding: UTF-8 -*- from time import time -from sploitkit import Config, Module, Option -from tinyscript.helpers import Path from .drone import * from .mixin import * @@ -10,7 +8,6 @@ __all__ = [ "re", "drone_filter", "time", - "Config", "Module", "Option", "Path", "DeauthMixin", "ScanMixin", "ConnectMixin", "WifiModule", "WifiAttackModule", "STATION_REGEX",