Fixed bug from #35

src/dronesploit/VERSION.txt

@@ -1 +1 @@
-1.1.13
+1.1.15

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
+

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()

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"}

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,

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
 

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
 
 

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")

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):

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):

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):

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):

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

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

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

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",