fixed serialization issue

savon-noir · savon-noir · commit 9ac2885821bd · 2014-05-12T16:17:15.000+02:00
diff --git a/libnmap/parser.py b/libnmap/parser.py
@@ -225,6 +225,7 @@ def parse_fromdict(cls, rdict):
                     slist.append(NmapService(portid=s[cname]['_portid'],
                                              protocol=s[cname]['_protocol'],
                                              state=s[cname]['_state'],
+                                             owner=s[cname]['_owner'],
                                              service=s[cname]['_service']))
 
                 nh = NmapHost(starttime=h['__NmapHost__']['_starttime'],
diff --git a/libnmap/reportjson.py b/libnmap/reportjson.py
@@ -1,13 +1,18 @@
 #!/usr/bin/env python
 import json
 from libnmap.objects import NmapHost, NmapService, NmapReport
+from libnmap.objects.os import *
 from libnmap.parser import NmapParser
 
 
 class ReportEncoder(json.JSONEncoder):
     def default(self, obj):
         otype = {'NmapHost': NmapHost,
-                 'NmapOSFingerprint': NmapHost.NmapOSFingerprint,
+                 'NmapOSFingerprint': NmapOSFingerprint,
+                 'NmapOSMatch': NmapOSMatch,
+                 'NmapOSClass': NmapOSClass,
+                 'CPE': CPE,
+                 'OSFPPortUsed': OSFPPortUsed,
                  'NmapService': NmapService,
                  'NmapReport': NmapReport}
         if isinstance(obj, tuple(otype.values())):
