From 59254c8246cd1570b57340863e0d7cf35bc8028b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Mon, 16 Feb 2015 14:31:29 +0100
Subject: [PATCH] Use JSON POST to do the search

---
 pymisp/api.py | 51 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/pymisp/api.py b/pymisp/api.py
index 7df517f..b7bf979 100644
--- a/pymisp/api.py
+++ b/pymisp/api.py
@@ -3,6 +3,8 @@
 
 """ Python API using the REST interface of MISP """
 
+import json
+import datetime
 import requests
 
 
@@ -46,6 +48,15 @@ class PyMISP(object):
              'content-type': 'text/' + out})
         return session
 
+    def __query(self, session, path, query):
+        if query.get('error') is not None:
+            return query
+        url = self.rest.format(path)
+        query = {'request': query}
+        print json.dumps(query)
+        r = session.post(url, data=json.dumps(query))
+        return r.json()
+
     # ############### REST API ################
 
     def get_index(self):
@@ -121,7 +132,8 @@ class PyMISP(object):
         return to_return
 
     def search(self, values=None, not_values=None, type_attribute=None,
-               category=None, org=None, tags=None, not_tags=None):
+               category=None, org=None, tags=None, not_tags=None, date_from=None,
+               date_to=None):
         """
             Search via the Rest API
 
@@ -132,25 +144,36 @@ class PyMISP(object):
             :param org: Org reporting the event
             :param tags: Tags to search for
             :param not_tags: Tags *not* to search for
+            :param date_from: First date
+            :param date_to: Last date
 
         """
-        search = self.url + '/restSearch/download/{}/{}/{}/{}/{}'
         val = self.__prepare_rest_search(values, not_values).replace('/', '|')
         tag = self.__prepare_rest_search(tags, not_tags).replace(':', ';')
-        if len(val) == 0:
-            val = 'null'
-        if len(tag) == 0:
-            tag = 'null'
-        if type_attribute is None:
-            type_attribute = 'null'
-        if category is None:
-            category = 'null'
-        if org is None:
-            org = 'null'
+        query = {}
+        if len(val) != 0:
+            query['value'] = val
+        if len(tag) != 0:
+            query['tags'] = tag
+        if type_attribute is not None:
+            query['type'] = type_attribute
+        if category is not None:
+            query['category'] = category
+        if org is not None:
+            query['org'] = org
+        if date_from is not None:
+            if isinstance(date_from, datetime.date) or isinstance(date_to, datetime.datetime):
+                query['from'] = date_from.strftime('%Y-%m-%d')
+            else:
+                query['from'] = date_from
+        if date_to is not None:
+            if isinstance(date_to, datetime.date) or isinstance(date_to, datetime.datetime):
+                query['to'] = date_to.strftime('%Y-%m-%d')
+            else:
+                query['to'] = date_to
 
         session = self.__prepare_session()
-        return session.get(search.format(val, type_attribute,
-                                         category, org, tag))
+        return self.__query(session, 'restSearch/download', query)
 
     def get_attachement(self, event_id):
         """