AutoArgparse: support bytes, better naming

Author: gpotter2

scapy/config.py

@@ -599,6 +599,7 @@ class ExtsManager(importlib.abc.MetaPathFinder):
     def __init__(self):
         self.exts: List[ScapyExt] = []
         self.all_specs: Dict[str, ScapyExt.ScapyExtSpec] = {}
+        self._loaded: List[str] = []
         # Add to meta_path as we are an import provider
         if self not in sys.meta_path:
             sys.meta_path.append(self)
@@ -628,6 +629,9 @@ def load(self, extension: str):
 
         :param extension: the name of the extension, as installed.
         """
+        if extension in self._loaded:
+            return
+
         try:
             import importlib.metadata
         except ImportError:
@@ -686,6 +690,7 @@ def load(self, extension: str):
 
         # Add to the extension list
         self.exts.append(ext)
+        self._loaded.append(extension)
 
         # If there are bash autocompletions, add them
         if ext.bash_completions:

scapy/layers/smbclient.py

@@ -1088,18 +1088,18 @@ def close(self):
 @conf.commands.register
 class smbclient(CLIUtil):
     r"""
-    A simple smbclient CLI
+    A simple SMB client CLI powered by Scapy
 
     :param target: can be a hostname, the IPv4 or the IPv6 to connect to
     :param UPN: the upn to use (DOMAIN/USER, DOMAIN\USER, USER@DOMAIN or USER)
     :param guest: use guest mode (over NTLM)
     :param ssp: if provided, use this SSP for auth.
     :param kerberos_required: require kerberos
     :param port: the TCP port. default 445
-    :param password: (string) if provided, used for auth
-    :param HashNt: (bytes) if provided, used for auth (NTLM)
-    :param HashAes256Sha96: (bytes) if provided, used for auth (Kerberos)
-    :param HashAes128Sha96: (bytes) if provided, used for auth (Kerberos)
+    :param password: if provided, used for auth
+    :param HashNt: if provided, used for auth (NTLM)
+    :param HashAes256Sha96: if provided, used for auth (Kerberos)
+    :param HashAes128Sha96: if provided, used for auth (Kerberos)
     :param ST: if provided, the service ticket to use (Kerberos)
     :param KEY: if provided, the session key associated to the ticket (Kerberos)
     :param cli: CLI mode (default True). False to use for scripting
@@ -1169,6 +1169,8 @@ def __init__(
         sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 10)
         # Timeout & connect
         sock.settimeout(timeout)
+        if debug:
+            print("Connecting to %s:%s" % (target, port))
         sock.connect((target, port))
         self.extra_create_options = []
         # Wrap with the automaton

scapy/utils.py

@@ -3940,20 +3940,24 @@ def AutoArgparse(
     # Process the parameters
     positional = []
     noargument = []
+    hexarguments = []
     parameters = {}
     for param in inspect.signature(func).parameters.values():
         if not param.annotation:
             continue
         noarg = False
-        parname = param.name
-        paramkwargs = {}
+        parname = param.name.replace("_", "-")
+        paramkwargs: Dict[str, Any] = {}
         if param.annotation is bool:
             if param.default is True:
                 parname = "no-" + parname
                 paramkwargs["action"] = "store_false"
             else:
                 paramkwargs["action"] = "store_true"
             noarg = True
+        elif param.annotation is bytes:
+            paramkwargs["type"] = str
+            hexarguments.append(parname)
         elif param.annotation in [str, int, float]:
             paramkwargs["type"] = param.annotation
         else:
@@ -3971,6 +3975,14 @@ def AutoArgparse(
             paramkwargs["action"] = "append"
         if param.name in argsdoc:
             paramkwargs["help"] = argsdoc[param.name]
+            if param.annotation is bytes:
+                paramkwargs["help"] = "(hex) " + paramkwargs["help"]
+            elif param.annotation is bool:
+                paramkwargs["help"] = "(flag) " + paramkwargs["help"]
+            else:
+                paramkwargs["help"] = (
+                    "(%s) " % param.annotation.__name__ + paramkwargs["help"]
+                )
         # Add to the parameter list
         parameters[parname] = paramkwargs
         if noarg:
@@ -3992,11 +4004,25 @@ def AutoArgparse(
 
     # Add parameters to parser
     for parname, paramkwargs in parameters.items():
-        parser.add_argument(parname, **paramkwargs)  # type: ignore
+        parser.add_argument(parname, **paramkwargs)
 
     # Now parse the sys.argv parameters
     params = vars(parser.parse_args())
 
+    # Convert hex parameters if provided
+    for p in hexarguments:
+        if params[p] is not None:
+            try:
+                params[p] = bytes.fromhex(params[p])
+            except ValueError:
+                print(
+                    conf.color_theme.fail(
+                        "ERROR: the value of parameter %s "
+                        "'%s' is not valid hexadecimal !" % (p, params[p])
+                    )
+                )
+                return None
+
     # Act as in interactive mode
     conf.logLevel = 20
     from scapy.themes import DefaultTheme
@@ -4011,7 +4037,7 @@ def AutoArgparse(
             }
         )
     except AssertionError as ex:
-        print("ERROR: " + str(ex))
+        print(conf.color_theme.fail("ERROR: " + str(ex)))
         parser.print_help()
     return None