added extraports support. TODO: review host.diff and serialization

savon-noir · savon-noir · commit a13d8443137d · 2014-04-04T17:55:19.000+02:00
diff --git a/libnmap/objects/host.py b/libnmap/objects/host.py
@@ -495,6 +495,28 @@ def id(self):
         """
         return self.address
 
+    @property
+    def extraports_state(self):
+        """
+            dictionnary containing state and amount of extra ports scanned
+            for which a common state, usually, closed was discovered.
+
+            :return: dict with keys 'state' and 'count'
+        """
+        _xtrports = self._extras['extraports']
+        return {'state': _xtrports['state'], 'count': _xtrports['count']}
+
+    @property
+    def extraports_reasons(self):
+        """
+            dictionnary containing reasons why extra ports scanned
+            for which a common state, usually, closed was discovered.
+
+            :return: array of dict containing keys 'state' and 'count'
+        """
+        _xtrports = self._extras['extraports']
+        return self._extras['extraports']['reasons']
+
     def get_dict(self):
         """
             Return a dict representation of the object.
diff --git a/libnmap/parser.py b/libnmap/parser.py
@@ -252,8 +252,10 @@ def _parse_xml_host(cls, scanhost_data):
                 for hostname in cls.__parse_hostnames(xh):
                     _hostnames.append(hostname)
             elif xh.tag == 'ports':
-                for port in cls._parse_xml_ports(xh):
+                ports_dict = cls._parse_xml_ports(xh)
+                for port in ports_dict['ports']:
                     _services.append(port)
+                _host_extras['extraports'] = ports_dict['extraports']
             elif xh.tag == 'status':
                 _status = cls.__format_attributes(xh)
             elif xh.tag == 'address':
@@ -319,15 +321,18 @@ def _parse_xml_ports(cls, scanports_data):
 
         xelement = cls.__format_element(scanports_data)
 
-        ports = []
+        rdict = {'ports': [], 'extraports': None}
         for xservice in xelement:
             if xservice.tag == 'port':
                 nport = cls._parse_xml_port(xservice)
-                ports.append(nport)
+                rdict['ports'].append(nport)
+            elif xservice.tag == 'extraports':
+                extraports = cls.__parse_extraports(xservice)
+                rdict['extraports'] = extraports
             #else:
             #    print "struct port unknown attr: %s value: %s" %
             #           (h.tag, h.get(h.tag))
-        return ports
+        return rdict
 
     @classmethod
     def _parse_xml_port(cls, scanport_data):
@@ -377,6 +382,32 @@ def _parse_xml_port(cls, scanport_data):
                             _service_extras)
         return nport
 
+    @classmethod
+    def __parse_extraports(cls, extraports_data):
+        """
+            Private method parsing the data from extra scanned ports.
+            X extraports were in state "closed" server returned "conn-refused"
+            tag: <extraports>
+
+            :param extraports_data: XML data for extraports
+            :type extraports_data: xml.ElementTree.Element or a string
+
+            :return: python dict with following keys: state, count, reason
+        """
+        rdict = {'state': '', 'count': '', 'reasons': []}
+        xelement = cls.__format_element(extraports_data)
+        extraports_dict = cls.__format_attributes(xelement)
+
+        if 'state' in extraports_dict:
+            rdict['state'] = extraports_dict
+        if 'count' in extraports_dict:
+            rdict['count'] = extraports_dict
+        for xelt in xelement:
+            if xelt.tag == 'extrareasons':
+                extrareasons_dict = cls.__format_attributes(xelt)
+                rdict['reasons'].append(extrareasons_dict)
+        return rdict
+
     @classmethod
     def __parse_script(cls, script_data):
         """
diff --git a/libnmap/test/test_host.py b/libnmap/test/test_host.py
@@ -173,6 +173,16 @@ def test_host_api(self):
         self.assertEqual(len(h2.get_open_ports()), 3)
         self.assertEqual(h2.get_service(22, "tcp").state, "open")
 
+    def test_extra_ports(self):
+        h1 = NmapParser.parse(host1)
+        h2 = NmapParser.parse(host2)
+
+        self.assertEqual(h1.extraports_state['state'], {'count': '995', 'state': 'WILLY_WONCKA'})
+        self.assertEqual(h1.extraports_reasons, [{'reason': 'conn-refused', 'count': '995'}])
+
+        self.assertEqual(h2.extraports_state['state'], {'count': '995', 'state': 'closed'})
+        self.assertEqual(h2.extraports_reasons, [{'reason': 'conn-refused', 'count': '995'}])
+
     def test_diff_host(self):
         h1 = NmapParser.parse(host1)
         h2 = NmapParser.parse(host2)
diff --git a/libnmap/test/test_parser.py b/libnmap/test/test_parser.py
@@ -125,7 +125,8 @@ def test_class_parser(self):
             NmapParser.parse(s)
 
     def test_class_ports_parser(self):
-        plist = NmapParser.parse(self.ports_string)
+        pdict = NmapParser.parse(self.ports_string)
+        plist = pdict['ports']
         self.assertEqual(len(plist), 4)
         self.assertEqual(sorted([p.port for p in plist]),
                          sorted([22, 25, 9929, 80]))
