Added ipaddress and ipaddressv6 format tags.

This commit is contained in:
Tib3rius 2021-09-03 23:50:40 -04:00
parent 4c3253e233
commit 137a848047
2 changed files with 20 additions and 4 deletions

View File

@ -246,6 +246,8 @@ async def service_scan(plugin, service):
# Create variables for fformat references.
address = service.target.address
addressv6 = service.target.address
ipaddress = target.ip
ipaddressv6 = target.ip
scandir = service.target.scandir
protocol = service.protocol
port = service.port
@ -263,7 +265,9 @@ async def service_scan(plugin, service):
if service.target.ipversion == 'IPv6':
nmap_extra += ' -6'
addressv6 = '[' + addressv6 + ']'
if addressv6 == target.ip:
addressv6 = '[' + addressv6 + ']'
ipaddressv6 = '[' + ipaddressv6 + ']'
tag = service.tag() + '/' + plugin.slug
@ -447,6 +451,8 @@ async def scan_target(target):
# Create variables for command references.
address = target.address
addressv6 = target.address
ipaddress = target.ip
ipaddressv6 = target.ip
scandir = target.scandir
protocol = service.protocol
port = service.port
@ -463,7 +469,9 @@ async def scan_target(target):
if target.ipversion == 'IPv6':
nmap_extra += ' -6'
addressv6 = '[' + addressv6 + ']'
if addressv6 == target.ip:
addressv6 = '[' + addressv6 + ']'
ipaddressv6 = '[' + ipaddressv6 + ']'
service_match = False
matching_plugins = []

View File

@ -37,6 +37,8 @@ class Target:
# Create variables for command references.
address = target.address
addressv6 = target.address
ipaddress = target.ip
ipaddressv6 = target.ip
scandir = target.scandir
nmap_extra = target.autorecon.args.nmap
@ -45,7 +47,9 @@ class Target:
if target.ipversion == 'IPv6':
nmap_extra += ' -6'
addressv6 = '[' + addressv6 + ']'
if addressv6 == target.ip:
addressv6 = '[' + addressv6 + ']'
ipaddressv6 = '[' + ipaddressv6 + ']'
plugin = inspect.currentframe().f_back.f_locals['self']
@ -117,6 +121,8 @@ class Service:
# Create variables for command references.
address = target.address
addressv6 = target.address
ipaddress = target.ip
ipaddressv6 = target.ip
scandir = target.scandir
protocol = self.protocol
port = self.port
@ -139,7 +145,9 @@ class Service:
if target.ipversion == 'IPv6':
nmap_extra += ' -6'
addressv6 = '[' + addressv6 + ']'
if addressv6 == target.ip:
addressv6 = '[' + addressv6 + ']'
ipaddressv6 = '[' + ipaddressv6 + ']'
plugin = inspect.currentframe().f_back.f_locals['self']