Merge remote-tracking branch 'origin/master' into es

savon-noir · savon-noir · commit ceb532eb073e · 2014-11-22T18:35:11.000Z
diff --git a/libnmap/objects/host.py b/libnmap/objects/host.py
@@ -40,13 +40,16 @@ def __init__(self, starttime='', endtime='', address=None, status=None,
         self._ipv4_addr = None
         self._ipv6_addr = None
         self._mac_addr = None
+        self._vendor = None
         for addr in address:
             if addr['addrtype'] == "ipv4":
                 self._ipv4_addr = addr['addr']
             elif addr['addrtype'] == 'ipv6':
                 self._ipv6_addr = addr['addr']
             elif addr['addrtype'] == 'mac':
                 self._mac_addr = addr['addr']
+            if 'vendor' in addr:
+                self._vendor = addr['vendor']
 
         self._main_address = self._ipv4_addr or self._ipv6_addr or ''
         self._address = address
@@ -147,8 +150,10 @@ def address(self, addrdict):
             self._ipv4_addr = addrdict['addr']
         elif addrdict['addrtype'] == 'ipv6':
             self._ipv6_addr = addrdict['addr']
-        if addrdict['addrtype'] == 'mac':
+        elif addrdict['addrtype'] == 'mac':
             self._mac_addr = addrdict['addr']
+        if 'vendor' in addrdict:
+            self._vendor = addrdict['vendor']
 
         self._main_address = self._ipv4_addr or self._ipv6_addr or ''
         self._address = addrdict
@@ -171,6 +176,15 @@ def mac(self):
         """
         return self._mac_addr or ''
 
+    @property
+    def vendor(self):
+        """
+            Accessor for the vendor attribute of the scanned host
+
+            :return: string (vendor) of empty string if no vendor defined
+        """
+        return self._vendor or ''
+
     @property
     def ipv6(self):
         """
@@ -316,7 +330,7 @@ def os_fingerprint(self):
         """
         rval = ''
         if self.os is not None:
-            rval = self.os.fingerprints.join("\n")
+            rval = "\n".join(self.os.fingerprints)
         return rval
 
     def os_ports_used(self):
@@ -434,9 +448,13 @@ 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'
+            :return: dict with keys 'state' and 'count' or None
         """
-        _xtrports = self._extras['extraports']
+        _xtrports = self._extras.get('extraports', None)
+
+        if _xtrports is None:
+            return None
+
         return {'state': _xtrports['state'], 'count': _xtrports['count']}
 
     @property
@@ -445,9 +463,11 @@ 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'
+            :return: array of dict containing keys 'state' and 'count' or None
         """
-        return self._extras['extraports']['reasons']
+        r = self._extras.get('extraports', {})
+
+        return r.get('reasons', None)
 
     def get_dict(self):
         """
diff --git a/libnmap/objects/service.py b/libnmap/objects/service.py
@@ -64,7 +64,7 @@ def __init__(self, portid, protocol='tcp', state=None,
         if 'servicefp' in self._service:
             self._servicefp = self._service['servicefp']
         if 'tunnel' in self._service:
-            self._servicefp = self._service['tunnel']
+            self._tunnel = self._service['tunnel']
 
         self._service_extras = []
         if service_extras is not None:
@@ -177,12 +177,21 @@ def reason_ttl(self):
     @property
     def service(self):
         """
-            Accessor for service dictionnary.
+            Accessor for service name.
 
-            :return: dict or None
+            :return: string or empty
         """
         return self._service['name'] if 'name' in self._service else ''
 
+    @property
+    def service_dict(self):
+        """
+            Accessor for service dictionary.
+
+            :return: dict or None
+        """
+        return self._service
+
     def open(self):
         """
             Tells if the port was open or not
diff --git a/libnmap/test/test_service.py b/libnmap/test/test_service.py
@@ -160,6 +160,11 @@
     <owner name="edwige"/>
 </port>"""
 
+port_tunnel = """
+<port protocol="tcp" portid="443">
+    <state state="open" reason="syn-ack" reason_ttl="64"/>
+    <service name="https" method="probed" tunnel="ssl" conf="10"/>
+</port>"""
 
 class TestNmapService(unittest.TestCase):
     def setUp(self):
@@ -243,6 +248,10 @@ def test_owner(self):
         serviceowner = NmapParser.parse(port_owner)
         self.assertEqual(serviceowner.owner, "edwige")
 
+    def test_tunnel(self):
+        servicetunnel = NmapParser.parse(port_tunnel)
+        self.assertEqual(servicetunnel.tunnel, "ssl")
+
 
 if __name__ == '__main__':
     test_suite = ['test_port_state_changed', 'test_port_state_unchanged',
