Finnaly NmapRepport.save() work + backend.get/getall() seems to work need to write test

bmx0r · bmx0r · commit 1abccd6fc4cd · 2013-05-09T14:25:33.000+02:00
modified:   ../.gitignore
	modified:   plugins/mongodb.py
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,41 @@
-*.pyc
+*.py[cod]
+*.swp
 *~
-build*
+*.lock
+*.DS_Store
+*.swp
+*.out
+*.sqlite3
+*~
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+lib
+lib64
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+.swp
diff --git a/libnmap/plugins/mongodb.py b/libnmap/plugins/mongodb.py
@@ -3,7 +3,8 @@
 from pymongo import MongoClient
 from bson.objectid import ObjectId
 
-from libnmap.reportjson import ReportDecoder, ReportEncoder
+from libnmap.reportjson import ReportEncoder
+from libnmap.parser import NmapParser
 from libnmap.plugins.backendplugin import NmapBackendPlugin
 
 
@@ -27,16 +28,36 @@ def insert(self, report):
             raise
         return id
 
-    def get(self, report_id=None):
-        rid = report_id
-        if report_id is not None and isinstance(report_id, str):
-            rid = ObjectId(report_id)
+    def get(self, str_report_id=None):
+        """get return a NmapReport object
+        """
+        rid = str_report_id
+        nmapreport = None
+        if str_report_id is not None and isinstance(str_report_id, str):
+            rid = ObjectId(str_report_id)
 
         if isinstance(rid, ObjectId):
+            #get a specific report by mongo's id
             r = self.collection.find({'_id': rid})
-        else:
-            r = self.collection.find()
-        return r
+            if r is not None:
+                #search by id means only one in the iterator
+                record = r[0]
+                #remove mongo's id
+                del record['_id']
+                nmapreport = NmapParser.parse_fromdict(record)
+        return nmapreport
+
+    def getall(self, dict_filter=None):
+        """return a list of all NmapReport saved in the backend
+           TODO : add a filter capability
+        """
+        nmapreportList = []
+        r = self.collection.find()
+        for report in r:
+            del report['_id']
+            nmapreport = NmapParser.parse_fromdict(report)
+            nmapreportList.append(nmapreport)
+        return nmapreportList
 
     def delete(self, report_id=None):
         if report_id is not None and isinstance(report_id, str):
