Merge branch 'Tib3rius:main' into main

autorecon/main.py

@@ -17,7 +17,7 @@ from autorecon.io import slugify, e, fformat, cprint, debug, info, warn, error,
 from autorecon.plugins import Pattern, PortScan, ServiceScan, Report, AutoRecon
 from autorecon.targets import Target, Service
 
-VERSION = "2.0.23"
+VERSION = "2.0.24"
 
 if not os.path.exists(config['config_dir']):
 	shutil.rmtree(config['config_dir'], ignore_errors=True, onerror=None)

autorecon/plugins.py

@@ -49,13 +49,21 @@ class Plugin(object):
 		self.autorecon.add_argument(self, name, choices=choices, default=default, help=help)
 
 	@final
-	def get_option(self, name):
+	def get_option(self, name, default=None):
 		# TODO: make sure name is simple.
 		name = self.slug.replace('-', '_') + '.' + slugify(name).replace('-', '_')
 
 		if name in vars(self.autorecon.args):
-			return vars(self.autorecon.args)[name]
+			if vars(self.autorecon.args)[name] is None:
+				if default:
+					return default
+				else:
+					return None
+			else:
+				return vars(self.autorecon.args)[name]
 		else:
+			if default:
+				return default
 			return None
 
 	@final

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "autorecon"
-version = "2.0.23"
+version = "2.0.24"
 description = "A multi-threaded network reconnaissance tool which performs automated enumeration of services."
 authors = ["Tib3rius"]
 license = "GNU GPL v3"