make the API a class

pymisp/api.py

@@ -6,99 +6,72 @@
 
 import requests
 
-from apikey import key
+class PyMISP(object):
 
-URL=None
+    def __init__(self, url, key, out_type = 'json'):
-URL_TMPL = None
+        self.url = url
-URL_XML_DOWNLOAD = None
+        self.key = key
-URL_XML_DOWNLOAD_TMPL = None
+        self.out_type = out_type
-OUTPUT_TYPE = 'json'
+        self.rest = self.url + '/{}'
-
-def init_server(url, key):
-    global URL
-    global URL_TMPL
-    global URL_XML_DOWNLOAD
-    global URL_XML_DOWNLOAD_TMPL
-    URL = 'https://misp.circl.lu/events'
-    URL_TMPL = URL + '/{}'
-    URL_XML_DOWNLOAD = URL + '/xml/download'
-    URL_XML_DOWNLOAD_TMPL = URL_XML_DOWNLOAD + '/{}'
 
 
-def __prepare_session(output_type=OUTPUT_TYPE):
+    def __prepare_session(self, force_out=None):
         """
             Prepare the headers of the session
         """
+        if force_out is not None:
+            out = force_out
+        else:
+            out = self.out_type
         session = requests.Session()
-    session.headers.update({'Authorization': key,
+        session.headers.update({'Authorization': self.key,
-        'Accept': 'application/' + output_type})
+            'Accept': 'application/' + out})
         return session
 
-################ REST API ################
 
-# supports JSON and XML output
+    ################ REST API ################
 
-def get_index():
+    def get_index(self):
         """
             Return the index.
 
             Warning, there's a limit on the number of results
         """
-    session = __prepare_session()
+        session = self.__prepare_session()
-    return session.get(URL, verify=False)
+        return session.get(self.url, verify=False)
 
-def get_event(event_id):
+    def get_event(self, event_id):
         """
             Get an event
         """
-    session = __prepare_session()
+        session = self.__prepare_session()
-    return session.get(URL_TMPL.format(event_id), verify=False)
+        return session.get(self.rest.format(event_id), verify=False)
 
-def add_event(event):
+    def add_event(self, event):
         """
             Add a new event
         """
-    session = __prepare_session()
+        session = self.__prepare_session()
-    return session.post(URL, data=event, verify=False)
+        return session.post(self.url, data=event, verify=False)
 
-def update_event(event_id, event):
+    def update_event(self, event_id, event):
         """
             Update an event
         """
-    session = __prepare_session()
+        session = self.__prepare_session()
-    return session.post(URL_TMPL.format(event_id), data=event, verify=False)
+        return session.post(self.rest.format(event_id), data=event,
+                verify=False)
 
-def delete_event(event_id):
+    def delete_event(self, event_id):
         """
             Delete an event
         """
-    session = __prepare_session()
+        session = self.__prepare_session()
-    return session.delete(URL_TMPL.format(event_id), verify=False)
+        return session.delete(self.rest.format(event_id), verify=False)
 
-##########################################
+    ######### REST Search #########
 
-############### Export ###############
+    def __prepare_rest_search(self, values, not_values):
-
-# XML and Json
-
-
-def download_all():
-    """
-        Download all event from the instance
-    """
-    session = __prepare_session()
-    return session.get(URL_XML_DOWNLOAD, verify=False)
-
-def download(event_id):
-    """
-        Download one event in XML
-    """
-    session = __prepare_session()
-    return session.get(URL_XML_DOWNLOAD_TMPL.format(event_id), verify=False)
-
-######### REST Search #########
-
-def __prepare_rest_search(values, not_values):
         """
             Prepare a search
         """
@@ -119,18 +92,18 @@ def __prepare_rest_search(values, not_values):
                 to_return += '&&!'.join(not_values)
         return to_return
 
-URL_SEARCH_TMPL = 'https://misp.circl.lu/events/restSearch/download/{}/{}/{}/{}/{}'
+    def search(self, values=None, not_values=None, type_attribute=None,
-
-
-# NOTE: searching by tags works, not the other options
-def search(values=None, not_values=None, type_attribute=None,
             category=None, org=None, tags=None, not_tags=None):
-    v = __prepare_rest_search(values, not_values).replace('/', '|')
+        """
-    t = __prepare_rest_search(tags, not_tags).replace(':', ';')
+            Search via the Rest API
-    if len(v) == 0:
+        """
-        v = 'null'
+        search = self.url + '/events/restSearch/download/{}/{}/{}/{}/{}'
-    if len(t) == 0:
+        val = self.__prepare_rest_search(values, not_values).replace('/', '|')
-        t = 'null'
+        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:
@@ -138,15 +111,39 @@ def search(values=None, not_values=None, type_attribute=None,
         if org is None:
             org = 'null'
 
-    session = __prepare_session()
+        session = self.__prepare_session()
-    return session.get(URL_SEARCH_TMPL.format(v, type_attribute,
+        return session.get(search.format(val, type_attribute,
-        category, org, t), verify=False)
+            category, org, tag), verify=False)
 
-##########################################
+    def get_attachement(self, event_id):
+        """
+            Get attachement of an event (not sample)
+        """
+        attach = self.url + '/attributes/downloadAttachment/download/{}'
+        session = self.__prepare_session()
+        return session.get(attach.format(event_id), verify=False)
 
-if __name__ == '__main__':
-    r = search(tags='OSINT')
-    print unicode(r.json())
 
-    #r = get_index()
+    ############### Export ###############
-    #print r.text
+
+    def download_all(self):
+        """
+            Download all event from the instance
+        """
+        xml = self.url + '/xml/download'
+        session = self.__prepare_session('xml')
+        return session.get(xml, verify=False)
+
+    def download(self, event_id, with_attachement=False):
+        """
+            Download one event in XML
+        """
+        template = self.url +  '/events/xml/download/{}/{}'
+        if with_attachement:
+            a = 'true'
+        else:
+            a = 'false'
+        session = self.__prepare_session('xml')
+        return session.get(template.format(event_id, a), verify=False)
+
+    ##########################################