added flexability to searching targets in db

Author: bamhm182

src/synack/plugins/db.py

@@ -326,7 +326,25 @@ def find_ports(self, port=None, protocol=None, source=None, ip=None, **kwargs):
 
     def find_targets(self, **kwargs):
         session = self.Session()
-        targets = session.query(Target).filter_by(**kwargs).all()
+        query = session.query(Target)
+
+        filters = list()
+
+        for key, value in kwargs.items():
+            if hasattr(Target, key):
+                if kwargs.get('like'):
+                    filters.append(getattr(Target, key).like(f'%{value}%'))
+                else:
+                    filters.append(getattr(Target, key) == value)
+
+        if filters:
+            if kwargs.get('or'):
+                query = query.filter(sa.or_(*filters))
+            else:
+                query = query.filter(sa.and_(*filters))
+    
+        targets = query.all()
+
         session.expunge_all()
         session.close()
         return targets

src/synack/plugins/targets.py

@@ -281,6 +281,7 @@ def get_scope_host(self, target=None, **kwargs):
                         pass
 
             scope.discard(None)
+            scope = list(scope)
 
             if len(scope) > 0:
                 if self._state.use_scratchspace: