From f1ed986bd06bcc0dcefd8b6bae18a3d356c066b2 Mon Sep 17 00:00:00 2001
From: Tib3rius <48113936+Tib3rius@users.noreply.github.com>
Date: Wed, 6 Oct 2021 11:49:11 -0400
Subject: [PATCH] Plugin updates.

Added an NTP nmap plugin.
Updated SIP plugin.
---
 autorecon/default-plugins/misc.py | 13 +++++++++++++
 autorecon/default-plugins/sip.py  |  4 ++--
 autorecon/main.py                 |  2 +-
 pyproject.toml                    |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/autorecon/default-plugins/misc.py b/autorecon/default-plugins/misc.py
index 4775909..f848f75 100644
--- a/autorecon/default-plugins/misc.py
+++ b/autorecon/default-plugins/misc.py
@@ -92,6 +92,19 @@ class NmapNNTP(ServiceScan):
 	async def run(self, service):
 		await service.execute('nmap {nmap_extra} -sV -p {port} --script="banner,nntp-ntlm-info" -oN "{scandir}/{protocol}_{port}_nntp_nmap.txt" -oX "{scandir}/xml/{protocol}_{port}_nntp_nmap.xml" {address}')
 
+class NmapNTP(ServiceScan):
+
+	def __init__(self):
+		super().__init__()
+		self.name = "Nmap NTP"
+		self.tags = ['default', 'safe', 'ntp']
+
+	def configure(self):
+		self.match_service_name('^ntp')
+
+	async def run(self, service):
+		await service.execute('nmap {nmap_extra} -sV -p {port} --script="banner,(ntp* or ssl*) and not (brute or broadcast or dos or external or fuzzer)" -oN "{scandir}/{protocol}_{port}_ntp_nmap.txt" -oX "{scandir}/xml/{protocol}_{port}_ntp_nmap.xml" {address}')
+
 class NmapPOP3(ServiceScan):
 
 	def __init__(self):
diff --git a/autorecon/default-plugins/sip.py b/autorecon/default-plugins/sip.py
index 8b60f7e..878f9e4 100644
--- a/autorecon/default-plugins/sip.py
+++ b/autorecon/default-plugins/sip.py
@@ -8,7 +8,7 @@ class NmapSIP(ServiceScan):
 		self.tags = ['default', 'safe', 'sip']
 
 	def configure(self):
-		self.match_service_name('^asterisk')
+		self.match_service_name(['^asterisk', '^sip'])
 
 	async def run(self, service):
 		await service.execute('nmap {nmap_extra} -sV -p {port} --script="banner,sip-enum-users,sip-methods" -oN "{scandir}/{protocol}_{port}_sip_nmap.txt" -oX "{scandir}/xml/{protocol}_{port}_sip_nmap.xml" {address}')
@@ -21,7 +21,7 @@ class SIPVicious(ServiceScan):
 		self.tags = ['default', 'safe', 'sip']
 
 	def configure(self):
-		self.match_service_name('^asterisk')
+		self.match_service_name(['^asterisk', '^sip'])
 
 	def manual(self, service, plugin_was_run):
 		if service.target.ipversion == 'IPv4':
diff --git a/autorecon/main.py b/autorecon/main.py
index 8508300..00f2fb6 100644
--- a/autorecon/main.py
+++ b/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.3"
+VERSION = "2.0.4"
 
 if not os.path.exists(config['config_dir']):
 	shutil.rmtree(config['config_dir'], ignore_errors=True, onerror=None)
diff --git a/pyproject.toml b/pyproject.toml
index ced414a..7fd8810 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "autorecon"
-version = "2.0.3"
+version = "2.0.4"
 description = "A multi-threaded network reconnaissance tool which performs automated enumeration of services."
 authors = ["Tib3rius"]
 license = "GNU GPL v3"