Changeset 3903

Timestamp:

01/06/09 20:55:16 (4 years ago)

Author:

gpolo

Message:

* Fixed services_scanned;
* Removed setter for num_services and services_scanned;
* Misc code layout changes.

Files:

• branch/nmapparser/NmapParser.py (modified) (12 diffs)

branch/nmapparser/NmapParser.py

@@ -36 +36 @@
 
 class HostInfo(object):
-    def __init__(self, id):
+    def __init__(self, host_id):
         self.osclass = []
         self.osmatch = []
@@ -53 +53 @@
 
         # Umit extension
-        self.id = id
+        self.id = host_id
         self.comment = ''
 
@@ -80 +80 @@
             raise Exception("Id was not set yet.")
 
-    def set_id(self, id):
+    def set_id(self, host_id):
         try:
-            self._id = int(id)
+            self._id = int(host_id)
         except (TypeError, ValueError):
             raise Exception("Invalid id! It must represent an integer, "
-                    "received %r" % id)
+                    "received %r" % host_id)
 
     # VENDOR
@@ -147 +147 @@
 
     def get_open_ports(self):
-        open = 0
+        open_count = 0
         for port in self.ports:
             if port['state'] == 'open':
-                open += 1
-
-        return open
+                open_count += 1
+
+        return open_count
 
     def get_filtered_ports(self):
-        filtered = 0
+        filtered_count = 0
         for port in self.ports:
             if port['state'] == 'filtered':
-                filtered += 1
+                filtered_count += 1
         for extra in self.extraports:
             if extra["state"] == 'filtered':
-                filtered += int(extra["count"])
-
-        return filtered
+                filtered_count += int(extra["count"])
+
+        return filtered_count
 
     def get_closed_ports(self):
-        closed = 0
+        closed_count = 0
         for port in self.ports:
             if port['state'] == 'closed':
-                closed+=1
+                closed_count += 1
         for extra in self.extraports:
             if extra["state"] == 'closed':
-                closed += int(extra['count'])
-
-        return closed
+                closed_count += int(extra['count'])
+
+        return closed_count
 
     def get_scanned_ports(self):
@@ -324 +324 @@
         self.nmap['scaninfo'].append(info)
 
-    def get_services_scanned (self):
-        if self._services_scanned == None:
-            return self._services_scanned
-
-        services = []
-        for scan in self.nmap.get('scaninfo', []):
-            services.append(scan['services'])
-
-        self._services_scanned = ','.join(services)
-        return self._services_scanned
-
-    def set_services_scanned (self, services_scanned):
-        self._services_scanned = services_scanned
-
-    def get_nmap_command (self):
+    def get_services_scanned(self):
+        services = [scan['services'] for scan in self.nmap.get('scaninfo', [])]
+        return ','.join(services)
+
+    def get_nmap_command(self):
         return self._verify_output_options(self.nmap['nmaprun'].get('args', ''))
 
@@ -344 +334 @@
         self.nmap['nmaprun']['args'] = self._verify_output_options(command)
 
-    def get_scan_type (self):
-        types = []
-        for t in self.nmap.get('scaninfo', []):
-            types.append(t['type'])
-        return types
+    def get_scan_type(self):
+        return [stype['type'] for stype in self.nmap.get('scaninfo', [])]
 
     def get_protocol (self):
-        protocols = []
-        for proto in self.nmap.get('scaninfo', []):
-            protocols.append(proto['protocol'])
-        return protocols
-
-    def get_num_services (self):
-        if self._num_services == None:
-            return self._num_services
-
+        return [proto['protocol'] for proto in self.nmap.get('scaninfo', [])]
+
+    def get_num_services(self):
         num = 0
-        for n in self.nmap.get('scaninfo', []):
-            num += int(n['numservices'])
-
-        self._num_services = num
-        return self._num_services
-
-    def set_num_services (self, num_services):
-        self._num_services = num_services
+        for sinfo in self.nmap.get('scaninfo', []):
+            num += int(sinfo['numservices'])
+
+        return num
 
     def get_date(self):
@@ -388 +365 @@
 
     def get_open_ports(self):
-        ports = 0
-
-        for h in self.nmap.get('hosts', []):
-            ports += h.get_open_ports()
-
-        return ports
+        open_count = 0
+        for host in self.nmap.get('hosts', []):
+            open_count += host.get_open_ports()
+
+        return open_count
 
     def get_filtered_ports(self):
-        ports = 0
-
-        for h in self.nmap.get('hosts', []):
-            ports += h.get_filtered_ports()
-
-        return ports
+        filtered_count = 0
+        for host in self.nmap.get('hosts', []):
+            filtered_count += host.get_filtered_ports()
+
+        return filtered_count
 
     def get_closed_ports(self):
-        ports = 0
-        
-        for h in self.nmap['hosts']:
-            ports += h.get_closed_ports()
-
-        return ports
+        closed_count = 0
+        for host in self.nmap['hosts']:
+            closed_count += host.get_closed_ports()
+
+        return closed_count
 
     def get_formated_date(self):
@@ -419 +393 @@
                                       str(date[4]).zfill(2))
 
-    def get_scanner (self):
+    def get_scanner(self):
         return self.nmap['nmaprun'].get('scanner', '')
 
@@ -502 +476 @@
         return self.nmap['runstats']['finished'].get('time', 0)
 
-    def set_finish_epoch_time(self, time):
-        self.nmap['runstats']['finished']['time'] = int(time)
+    def set_finish_epoch_time(self, epoch_time):
+        self.nmap['runstats']['finished']['time'] = int(epoch_time)
 
     def get_scan_name(self):
@@ -520 +494 @@
 
     def _verify_output_options(self, command):
-        found = re.findall ('(-o[XGASN]{1}) {0,1}', command)
-        splited = command.split (' ')
+        found = re.findall('(-o[XGASN]{1}) {0,1}', command)
+        splited = command.split(' ')
 
         if found:
             for option in found:
                 pos = splited.index(option)
-                del(splited[pos+1])
-                del(splited[pos])
+                del splited[pos+1]
+                del splited[pos]
 
         return ' '.join(splited)
@@ -547 +521 @@
     verbose_level = property(get_verbose_level, set_verbose_level)
     scaninfo = property(get_scaninfo, set_scaninfo)
-    services_scanned = property(get_services_scanned, set_services_scanned)
+    services_scanned = property(get_services_scanned)
     nmap_command = property(get_nmap_command, set_nmap_command)
     scan_type = property(get_scan_type)
     protocol = property(get_protocol)
-    num_services = property(get_num_services, set_num_services)
+    num_services = property(get_num_services)
     date = property(get_date, set_date)
     open_ports = property(get_open_ports)
@@ -575 +549 @@
     start = property(get_start, set_start)
     scan_name = property(get_scan_name, set_scan_name)
-
-    _num_services = None
-    _services_scanned = None