2.3.0: support for blobs and sharing with other users

Author: psrok1

Diff for: setup.py

@@ -6,7 +6,7 @@
     from distutils.core import setup
 
 setup(name="mwdblib",
-      version="2.2.2",
+      version="2.3.0",
       description="malwaredb API bindings for Python",
       author="psrok1",
       package_dir={'mwdblib': 'src'},

Diff for: src/__init__.py

@@ -1,92 +1,2 @@
-import itertools
-import json
-
-import requests
-
+from .core import Malwarecage
 from .api import MalwarecageAPI
-from .obj import MalwarecageObject
-from .file import MalwarecageFile
-from .config import MalwarecageConfig
-from .blob import MalwarecageBlob
-
-
-class Malwarecage(object):
-    def __init__(self, api=None):
-        self.api = api or MalwarecageAPI()
-
-    def login(self, username, password):
-        result = self.api.post("auth/login", json={
-            "login": username,
-            "password": password
-        }, noauth=True)
-        self.api.set_api_key(result["token"])
-
-    def _recent(self, endpoint):
-        try:
-            for page in itertools.count(start=1):
-                result = self.api.get(endpoint, params={"page": page})
-                key = endpoint+"s"
-                if key not in result or len(result[key]) == 0:
-                    return
-                for obj in result[key]:
-                    yield MalwarecageObject.create(self.api, obj)
-        except requests.exceptions.HTTPError as e:
-            if e.response.status_code >= 500:
-                raise e
-
-    def recent_objects(self):
-        return self._recent("object")
-
-    def recent_files(self):
-        return self._recent("file")
-
-    def recent_configs(self):
-        return self._recent("config")
-
-    def recent_blobs(self):
-        return self._recent("blob")
-
-    def query(self, hash):
-        result = self.api.get("object/{}".format(hash))
-        return MalwarecageObject.create(self.api, result)
-
-    def query_file(self, hash):
-        result = self.api.get("file/{}".format(hash))
-        return MalwarecageFile(self.api, result)
-
-    def query_config(self, hash):
-        result = self.api.get("config/{}".format(hash))
-        return MalwarecageConfig(self.api, result)
-
-    def query_blob(self, hash):
-        result = self.api.get("blob/{}".format(hash))
-        return MalwarecageConfig(self.api, result)
-
-    def search(self, query):
-        result = self.api.post("search", json={"query": query})
-        for file in result:
-            yield MalwarecageObject.create(self.api, file)
-
-    def upload_file(self, name, content, parent=None, metakeys=None):
-        parent = parent or "root"
-        result = self.api.post("file/{}".format(parent), data={
-            'metakeys': json.dumps({'metakeys': metakeys or []})
-        }, files={'file': (name, content)})
-        return MalwarecageFile(self.api, result)
-
-    def upload_config(self, family, cfg, parent=None):
-        parent = parent or "root"
-        result = self.api.put("config/{}".format(parent), json={
-            "family": family,
-            "cfg": cfg
-        })
-        return MalwarecageConfig(self.api, result)
-
-    def upload_blob(self, name, type, content, parent=None):
-        parent = parent or "root"
-        result = self.api.put("blob/{}".format(parent), json={
-            "blob_name": name,
-            "blob_type": type,
-            "content": content
-        })
-        return MalwarecageBlob(self.api, result)

Diff for: src/api.py

@@ -1,3 +1,6 @@
+import base64
+import json
+
 try:
     from urlparse import urljoin
 except ImportError:
@@ -22,6 +25,11 @@ def set_api_key(self, api_key):
         self.api_key = api_key
         self.session.headers.update({'Authorization': 'Bearer {}'.format(self.api_key)})
 
+    def logged_user(self):
+        if self.api_key is None:
+            return None
+        return json.loads(base64.b64decode(self.api_key.split(".")[1]+"=="))["login"]
+
     def request(self, method, url, noauth=False, raw=False, *args, **kwargs):
         # Check if authenticated yet
         if not noauth and self.api_key is None:

Diff for: src/blob.py

@@ -1,4 +1,4 @@
-from .obj import MalwarecageObject, lazy_property
+from .object import MalwarecageObject, lazy_property
 
 
 class MalwarecageBlob(MalwarecageObject):
@@ -16,6 +16,27 @@ def blob_size(self):
     def blob_type(self):
         return self.data.get("blob_type")
 
+    @property
+    def name(self):
+        """
+        Alias for blob_name property
+        """
+        return self.blob_name
+
+    @property
+    def size(self):
+        """
+        Alias for blob_size property
+        """
+        return self.blob_size
+
+    @property
+    def type(self):
+        """
+        Alias for blob_type property
+        """
+        return self.blob_type
+
     @lazy_property()
     def content(self):
         return self.data.get("content")

Diff for: src/config.py

@@ -1,4 +1,4 @@
-from .obj import MalwarecageObject, lazy_property
+from .object import MalwarecageObject, lazy_property
 
 
 class MalwarecageConfig(MalwarecageObject):