Merge pull request ivre#362 from p-l-/searchnonexistent

DB: add .searchnonexistent() method to replace a broken hack

ivre/db/mongo.py

@@ -384,6 +384,10 @@ def _flt_and(cond1, cond2):
     def flt_or(*args):
         return {'$or': args} if len(args) > 1 else args[0]
 
+    @staticmethod
+    def searchnonexistent():
+        return {'_id': 0}
+
     @staticmethod
     def searchobjectid(oid, neg=False):
         """Filters records by their ObjectID.  `oid` can be a single or many

ivre/db/postgres.py

@@ -2083,6 +2083,10 @@ def getscan(self, scanid, archive=False):
         return self.db.execute(select([ScanFile])\
                                .where(ScanFile.sha256 == scanid)).fetchone()
 
+    @staticmethod
+    def searchnonexistent():
+        return NmapFilter(main=False)
+
     @staticmethod
     def _searchobjectid(oid, neg=False):
         if len(oid) == 1:

ivre/webutils.py

@@ -216,7 +216,7 @@ def get_anonymized_user():
 
 QUERIES = {
     'full': lambda: db.nmap.flt_empty,
-    'noaccess': lambda: db.nmap.searchid(0),
+    'noaccess': lambda: db.nmap.searchnonexistent(),
     'category': lambda cat: db.nmap.searchcategory(cat.split(',')),
 }
 

tests/tests.py

@@ -302,6 +302,9 @@ def host_stored_test(line):
         self.assertEqual(res, 0)
         archives_count = int(out)
 
+        count = ivre.db.db.nmap.count(ivre.db.db.nmap.searchnonexistent())
+        self.assertEqual(count, 0)
+
         # Is the test case OK?
         self.assertGreater(hosts_count, 0)
         self.check_value("nmap_get_count", hosts_count)