fix(extraports): added support for extra ports, fixes #40

Author: savon-noir

libnmap/objects/host.py

@@ -463,35 +463,13 @@ def id(self):
         return self.address
 
     @property
-    def extraports_state(self):
+    def extraports(self):
         """
-        dictionnary containing state and amount of extra ports scanned
-        for which a common state, usually, closed was discovered.
+        Returns a list of NmapExtraPort objects
 
-        :return: dict with keys 'state' and 'count' or None
+        :return: list of NmapExtraPort objects
         """
-        rval = None
-        _xports = self._extras.get('extraports', None)
-
-        if _xports is not None:
-            rval = {'state': _xtrports['state'], 'count': _xtrports['count']}
-
-        return rval
-
-    @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' or None
-        """
-        r = self._extras.get("extraports", {})
-
-        if r is None:
-            return None
-
-        return r.get("reasons", None)
+        return self._extraports
 
     def get_dict(self):
         """

libnmap/objects/service.py

@@ -388,7 +388,7 @@ def __init__(self, xdict):
         self._reasons = xdict.get('reasons', [])
 
     @property
-    def count(self):
+    def extra_count(self):
         """
            Accessor for the number of extraports
 
@@ -397,7 +397,7 @@ def count(self):
         return int(self._count)
 
     @property
-    def state(self):
+    def extra_state(self):
         """
            Accessor for the state of extraports listed
 
@@ -406,11 +406,11 @@ def state(self):
         return self._state
 
     @property
-    def reason(self):
+    def extra_reasons(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 {}
+        return self._reasons

libnmap/parser.py

@@ -391,10 +391,6 @@ def _parse_xml_ports(cls, scanports_data):
             elif xservice.tag == "extraports":
                 extraports = cls.__parse_extraports(xservice)
                 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
@@ -477,10 +473,8 @@ def __parse_extraports(cls, extraports_data):
         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
+        rdict["state"] = extraports_dict.get("state", None)
+        rdict["count"] = extraports_dict.get("count", None)
         for xelt in xelement:
             if xelt.tag == "extrareasons":
                 extrareasons_dict = cls.__format_attributes(xelt)