Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add state column to csv #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add state column to csv #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions nmaptocsv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

output_grp = parser.add_argument_group('Output parameters')
output_grp.add_argument('-o', '--output', help = 'CSV output filename (stdout if not specified)')
output_grp.add_argument('-f', '--format', help = 'CSV column format { fqdn, rdns, hop_number, ip, mac_address, mac_vendor, port, protocol, os, script, service, version } (default: ip-fqdn-port-protocol-service-version)', default = 'ip-fqdn-port-protocol-service-version')
output_grp.add_argument('-f', '--format', help = 'CSV column format { fqdn, rdns, hop_number, ip, mac_address, mac_vendor, port, protocol, os, script, service, version } (default: ip-fqdn-port-protocol-service-version)', default = 'ip-fqdn-port-protocol-service-state-version')
output_grp.add_argument('-S', '--script', help = 'Adds the script column in output, alias for -f "ip-fqdn-port-protocol-service-version-script"', action = 'store_const', const = 'ip-fqdn-port-protocol-service-version-script')
output_grp.add_argument('-d', '--delimiter', help = 'CSV output delimiter (default ";"). Ex: -d ","', default = ';')
output_grp.add_argument('-n', '--no-newline', help = 'Do not insert a newline between each host. By default, a newline is added for better readability', action = 'store_true', default = False)
Expand All @@ -81,7 +81,7 @@
p_port_header = re.compile(r'^(?P<port>PORT)\s+(?P<state>STATE)\s+(?P<service>SERVICE)\s+(?P<reason>REASON\s*)?(?P<version>VERSION$)?')

#-- Port finding
p_port_without_reason = re.compile(r'^(?P<number>[\d]+)\/(?P<protocol>tcp|udp)\s+(?:open|open\|filtered)\s+(?P<service>[\w\S]*)(?:\s*(?P<version>.*))?$')
p_port_without_reason = re.compile(r'^(?P<number>[\d]+)\/(?P<protocol>tcp|udp)\s+(?P<state>open|open\|filtered)\s+(?P<service>[\w\S]*)(?:\s*(?P<version>.*))?$')
p_port_with_reason = re.compile(r'^(?P<number>[\d]+)\/(?P<protocol>tcp|udp)\s+(?:open|open\|filtered)\s+(?P<service>[\w\S]*)\s+(?P<reason>.* ttl [\d]+)\s*(?:\s*(?P<version>.*))$')

#-- Script output finding
Expand Down Expand Up @@ -206,6 +206,15 @@ def get_port_service_list(self):
result.append(port.get_service())
return result

def get_port_state_list(self):
if not(self.get_port_list()):
return ['']
else:
result = []
for port in self.get_port_list():
result.append(port.get_state())
return result

def get_port_version_list(self):
if not(self.get_port_list()):
return ['']
Expand Down Expand Up @@ -254,10 +263,11 @@ def set_network_distance(self, network_distance):
self.network_distance = network_distance

class Port:
def __init__(self, number, protocol, service='', version='', script=''):
def __init__(self, number, protocol, service='', state='', version='', script=''):
self.number = number
self.protocol = protocol
self.service = service
self.state = state
self.version = version
self.script = script

Expand All @@ -266,6 +276,9 @@ def get_number(self):

def get_protocol(self):
return self.protocol

def get_state(self):
return self.state

def get_service(self):
return self.service
Expand All @@ -279,6 +292,9 @@ def get_script(self):
def set_service(self, service):
self.service = service

def set_state(self, state):
self.state = state

def set_version(self, version):
self.version = version

Expand Down Expand Up @@ -325,7 +341,7 @@ def split_grepable_match(raw_string):
# remove potential leading and trailing slashes on version
version = version.strip('/')

new_port = Port(number, protocol, service, version)
new_port = Port(number, protocol, service, state, version)

current_host.add_port(new_port)

Expand Down Expand Up @@ -409,9 +425,10 @@ def parse(fd):
number = str(port.group('number'))
protocol = str(port.group('protocol'))
service = str(port.group('service'))
state = str(port.group('state'))
version = str(port.group('version'))

new_port = Port(number, protocol, service, version)
new_port = Port(number, protocol, service, state, version)

last_host.add_port(new_port)

Expand Down Expand Up @@ -539,7 +556,7 @@ def is_format_valid(fmt):

@rtype : True or False
"""
supported_format_objects = [ 'fqdn', 'rdns', 'hop_number', 'ip', 'mac_address', 'mac_vendor', 'port', 'protocol', 'os', 'script', 'service', 'version' ]
supported_format_objects = [ 'fqdn', 'rdns', 'hop_number', 'ip', 'mac_address', 'mac_vendor', 'port', 'protocol', 'os', 'script', 'service', 'version', 'state' ]
unknown_items = []

for fmt_object in fmt.split('-'):
Expand Down Expand Up @@ -572,6 +589,7 @@ def formatted_item(host, format_item):
'port': host.get_port_number_list(),
'protocol': host.get_port_protocol_list(),
'service': host.get_port_service_list(),
'state': host.get_port_state_list(),
'version': host.get_port_version_list(),
'script': host.get_port_script_list()
}
Expand Down Expand Up @@ -676,4 +694,4 @@ def main():
return

if __name__ == "__main__":
main()
main()