fixed issue savon-noir#28

savon-noir · savon-noir · commit 1042db15d95d · 2014-05-14T19:18:47.000+02:00
diff --git a/libnmap/objects/service.py b/libnmap/objects/service.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 from libnmap.diff import NmapDiff
+from libnmap.objects.os import CPE
 
 
 class NmapService(object):
@@ -37,6 +38,11 @@ def __init__(self, portid, protocol='tcp', state=None,
         self._state = state if state is not None else {}
         self._service = service if service is not None else {}
 
+        self._cpelist = []
+        for _cpe in service['cpelist']:
+            _cpeobj = CPE(_cpe)
+            self._cpelist.append(_cpeobj)
+
         self._owner = ''
         if owner is not None and 'name' in owner:
             self._owner = owner['name']
@@ -199,14 +205,21 @@ def banner(self):
 
             :return: string
         """
-        notrelevant = ['name', 'method', 'conf']
+        notrelevant = ['name', 'method', 'conf', 'cpelist']
         b = ''
         if 'method' in self._service and self._service['method'] == "probed":
             b = " ".join([k + ": " + self._service[k]
                           for k in self._service.keys()
                               if k not in notrelevant])
         return b
 
+    @property
+    def cpelist(self):
+        """
+            Accessor for list of CPE for this particular service
+        """
+        return self._cpelist
+
     @property
     def scripts_results(self):
         """
diff --git a/libnmap/parser.py b/libnmap/parser.py
@@ -394,7 +394,7 @@ def _parse_xml_port(cls, scanport_data):
             if xport.tag == 'state':
                 _state = cls.__format_attributes(xport)
             elif xport.tag == 'service':
-                _service = cls.__format_attributes(xport)
+                _service = cls.__parse_service(xport)
             elif xport.tag == 'owner':
                 _owner = cls.__format_attributes(xport)
             elif xport.tag == 'script':
@@ -415,6 +415,20 @@ def _parse_xml_port(cls, scanport_data):
                             _service_extras)
         return nport
 
+    @classmethod
+    def __parse_service(cls, xserv):
+        """
+            Parse <service> tag to manage CPE object
+        """
+        _service = cls.__format_attributes(xserv)
+        _cpelist = []
+        for _servnode in xserv:
+            if _servnode.tag == 'cpe':
+                _cpe_string = _servnode.text
+                _cpelist.append(_cpe_string)
+        _service['cpelist'] = _cpelist
+        return _service
+
     @classmethod
     def __parse_extraports(cls, extraports_data):
         """
diff --git a/libnmap/test/test_fp.py b/libnmap/test/test_fp.py
@@ -15,6 +15,7 @@ def setUp(self):
                 { 'file': "%s/%s" % (fdir, 'files/1_hosts_down.xml'), 'os': 0}]
         self.flist = self.flist_full
         self.flist_os =  {'nv6': {'file': "%s/%s" % (fdir, 'files/full_sudo6.xml'), 'os': 0},
+                'fullscan': { 'file': "%s/%s" % (fdir, 'files/fullscan.xml'), 'os': 0},
                 'nv5': { 'file': "%s/%s" % (fdir, 'files/os_scan5.xml'), 'os': 0}}
 
     def test_fp(self):
@@ -114,9 +115,17 @@ def test_fpv5(self):
         self.assertEqual(h1.os.fingerprint, fpval)
         self.assertEqual(h1.os.fingerprints, fparray)
 
+    def test_cpeservice(self):
+        cpelist = ['cpe:/a:openbsd:openssh:5.9p1','cpe:/o:linux:linux_kernel']
+        rep = NmapParser.parse_fromfile(self.flist_os['fullscan']['file'])
+        h1 = rep.hosts.pop()
+        s = h1.services[0]
+        self.assertEqual(s.cpelist[0].cpestring, cpelist[0])
+        self.assertEqual(s.cpelist[1].cpestring, cpelist[1])
+        
 
 if __name__ == '__main__':
     test_suite = ['test_fp', 'test_fpv6', 'test_osmatches_new', 'test_osclasses_new',
-            'test_fpv5', 'test_osmatches_old']
+            'test_fpv5', 'test_osmatches_old', 'test_cpeservice']
     suite = unittest.TestSuite(map(TestNmapFP, test_suite))
     test_result = unittest.TextTestRunner(verbosity=2).run(suite)
