fixed bug with sqlite on py3

savon-noir · savon-noir · commit bd60f1f88468 · 2014-06-29T00:29:35.000+02:00
diff --git a/libnmap/plugins/backendpluginFactory.py b/libnmap/plugins/backendpluginFactory.py
@@ -28,5 +28,5 @@ def create(cls, plugin_name="mongodb", **kwargs):
                 try:
                     backendplugin = classobj(**kwargs)
                 except Exception as error:
-                    print("Cannot create Backend: {0}".format(error))
+                    raise Exception("Cannot create Backend: {0}".format(error))
         return backendplugin
diff --git a/libnmap/plugins/mongodb.py b/libnmap/plugins/mongodb.py
@@ -36,8 +36,7 @@ def insert(self, report):
         try:
             oid = self.collection.insert(json.loads(j))
         except:
-            print("MONGODB cannot insert")
-            raise
+            raise Exception("Failed to insert nmap object in MongoDB")
         return str(oid)
 
     def get(self, str_report_id=None):
diff --git a/libnmap/plugins/s3.py b/libnmap/plugins/s3.py
@@ -88,8 +88,7 @@ def insert(self, report):
             strjsonnmapreport = json.dumps(report, cls=ReportEncoder)
             mykey.set_contents_from_string(strjsonnmapreport)
         except:
-            print("Bucket cannot insert")
-            raise
+            raise Exception("Failed to add nmap object in s3 bucket")
         return str(oid)
 
     def get(self, str_report_id=None):
@@ -108,7 +107,7 @@ def get(self, str_report_id=None):
                 nmapreportjson = json.loads(mykey.get_contents_as_string())
                 nmapreport = NmapParser.parse_fromdict(nmapreportjson)
             except S3ResponseError:
-                print("Not Found")
+                pass
         return nmapreport
 
     def getall(self, dict_filter=None):
diff --git a/libnmap/plugins/sql.py b/libnmap/plugins/sql.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from sqlalchemy import create_engine
 from sqlalchemy.schema import Column
-from sqlalchemy.types import Integer, DateTime, Text
+from sqlalchemy.types import Integer, DateTime, LargeBinary
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
@@ -53,15 +53,17 @@ class Reports(Base):
 
         id = Column('report_id', Integer, primary_key=True)
         inserted = Column('inserted', DateTime(), default='now')
-        report_json = Column('report_json', Text(convert_unicode=True))
+        report_json = Column('report_json', LargeBinary())
 
         def __init__(self, obj_NmapReport):
             self.inserted = datetime.fromtimestamp(obj_NmapReport.endtime)
-            self.report_json = json.dumps(obj_NmapReport,
-                                          cls=ReportEncoder)
+            dumped_json = json.dumps(obj_NmapReport,
+                                     cls=ReportEncoder)
+            self.report_json = bytes(dumped_json.encode('UTF-8'))
 
         def decode(self):
-            nmap_report_obj = json.loads(self.report_json,
+            json_decoded = self.report_json.decode('utf-8')
+            nmap_report_obj = json.loads(json_decoded,
                                          cls=ReportDecoder)
             return nmap_report_obj
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34
+envlist = py27,py32
 [testenv]
 deps=nose
      pymongo
