Merge pull request #9 from CybercentreCanada/hotfix/post_search

Hotfix/post search

assemblyline_client/v4_client/module/search/__init__.py

@@ -1,3 +1,5 @@
+import json
+
 from assemblyline_client.v4_client.common.utils import SEARCHABLE, ClientError, api_path
 from assemblyline_client.v4_client.module.search.facet import Facet
 from assemblyline_client.v4_client.module.search.fields import Fields
@@ -26,14 +28,12 @@ def _do_search(self, bucket, query, **kwargs):
  if isinstance(filters, str):
  filters = [filters]
 
- filters = [('filters', fq) for fq in filters]
+ kwargs['filters'] = filters
 
- kwargs = {k: v for k, v in kwargs.items() if v is not None and k != 'filters'}
+ kwargs = {k: v for k, v in kwargs.items() if v is not None}
  kwargs['query'] = query
- if filters is not None:
- kwargs['params_tuples'] = filters
- path = api_path('search', bucket, **kwargs)
- return self._connection.get(path)
+ path = api_path('search', bucket)
+ return self._connection.post(path, data=json.dumps(kwargs))
 
  def alert(self, query, filters=None, fl=None, offset=0, rows=25, sort=None, timeout=None):
  """\

assemblyline_client/v4_client/module/user.py

@@ -68,7 +68,7 @@ def delete(self, username, fav_type, name):
 
 Throws a Client exception if the user does not exist.
 """
- return self._connection.delete(api_path('user', 'favorites', username, fav_type), data=name)
+ return self._connection.delete(api_path('user', 'favorites', username, fav_type), json=name)
 
  def update(self, username, favorites):
  """\

test/test_help.py

@@ -21,4 +21,4 @@ def test_constants(client):
 
 def test_tos(client):
  res = client.help.tos()
- assert res is None
+ assert res is None or isinstance(res, str)

test/test_service.py

@@ -29,7 +29,7 @@ def test_add_service(datastore, client):
 
  # Cleanup so the new service does not interfere with other tests
  datastore.service_delta.delete('ResultSample')
- datastore.service.delete_matching('name:ResultSample')
+ datastore.service.delete_by_query('name:ResultSample')
  datastore.service.commit()
  datastore.service_delta.commit()