temporary fix for issue40

Author: savon-noir

libnmap/objects/__init__.py

@@ -2,6 +2,6 @@
 
 from libnmap.objects.host import NmapHost
 from libnmap.objects.report import NmapReport
-from libnmap.objects.service import NmapService
+from libnmap.objects.service import NmapService, NmapExtraPort
 
-__all__ = ["NmapReport", "NmapHost", "NmapService"]
+__all__ = ['NmapReport', 'NmapHost', 'NmapService', 'NmapExtraPort']

libnmap/objects/host.py

@@ -38,6 +38,7 @@ def __init__(
         self._status = status if status is not None else {}
         self._services = services if services is not None else []
         self._extras = extras if extras is not None else {}
+        self._extraports = self._extras.get('extraports', None)
         self._osfingerprinted = False
         self.os = None
         if "os" in self._extras:
@@ -469,12 +470,13 @@ def extraports_state(self):
 
         :return: dict with keys 'state' and 'count' or None
         """
-        _xtrports = self._extras.get("extraports", None)
+        rval = None
+        _xports = self._extras.get('extraports', None)
 
-        if _xtrports is None:
-            return None
+        if _xports is not None:
+            rval = {'state': _xtrports['state'], 'count': _xtrports['count']}
 
-        return {"state": _xtrports["state"], "count": _xtrports["count"]}
+        return rval
 
     @property
     def extraports_reasons(self):

libnmap/objects/service.py

@@ -366,3 +366,51 @@ def diff(self, other):
         :return: NmapDiff object
         """
         return NmapDiff(self, other)
+
+
+class NmapExtraPort(object):
+    """
+        NmapExtraPort is an object which documents unlisted ports/services
+        which are possibly closed, filtered, ignored,...
+    """
+    def __init__(self, xdict):
+        """
+            Constructor
+            :param xdict: python dict containing the following structure:
+                          {
+                             'state': <str>,
+                             'count': <int>,
+                             'reasons': [{'reason': <str>, 'count' <int>}]
+                          }
+        """
+        self._count = xdict.get('count', 0)
+        self._state = xdict.get('state', 'unknown')
+        self._reasons = xdict.get('reasons', [])
+
+    @property
+    def count(self):
+        """
+           Accessor for the number of extraports
+
+           :return: int
+        """
+        return int(self._count)
+
+    @property
+    def state(self):
+        """
+           Accessor for the state of extraports listed
+
+           :return: string
+        """
+        return self._state
+
+    @property
+    def reason(self):
+        """
+           Return the first reason available for the extraport listed.
+
+           :return: dict, empty if no extraports reason available
+        """
+
+        return self.reasons[0] if len(self.reasons) else {}

libnmap/parser.py

@@ -8,10 +8,8 @@
         import xml.etree.cElementTree as ET
     except ImportError:
         import xml.etree.ElementTree as ET
-
 from xml.etree.ElementTree import iselement as et_iselement
-
-from libnmap.objects import NmapHost, NmapReport, NmapService
+from libnmap.objects import NmapHost, NmapService, NmapReport, NmapExtraPort
 
 
 class NmapParser(object):
@@ -385,17 +383,18 @@ def _parse_xml_ports(cls, scanports_data):
 
         xelement = cls.__format_element(scanports_data)
 
-        rdict = {"ports": [], "extraports": None}
+        rdict = {'ports': [], 'extraports': []}
         for xservice in xelement:
             if xservice.tag == "port":
                 nport = cls._parse_xml_port(xservice)
                 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))
+                rdict['extraports'].append(extraports)
+            # DEBUG REMOVE ME    
+            else:
+               print "struct port unknown attr: %s value: %s" %
+                      (h.tag, h.get(h.tag))
         return rdict
 
     @classmethod
@@ -485,8 +484,9 @@ def __parse_extraports(cls, extraports_data):
         for xelt in xelement:
             if xelt.tag == "extrareasons":
                 extrareasons_dict = cls.__format_attributes(xelt)
-                rdict["reasons"].append(extrareasons_dict)
-        return rdict
+                rdict['reasons'].append(extrareasons_dict)
+        robj = NmapExtraPort(rdict)
+        return robj
 
     @classmethod
     def __parse_script_table(cls, script_table):