polyswarm-api 3.5.1__tar.gz → 3.6.0__tar.gz

{polyswarm-api-3.5.1/src/polyswarm_api.egg-info → polyswarm-api-3.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyswarm-api
-Version: 3.5.1
+Version: 3.6.0
 Summary: Client library to simplify interacting with the PolySwarm consumer API
 Home-page: https://github.com/polyswarm/polyswarm-api
 Author: PolySwarm Developers

{polyswarm-api-3.5.1 → polyswarm-api-3.6.0}/setup.py

@@ -9,7 +9,7 @@ with open('README.md', 'r') as readme:
 
 setup(
     name='polyswarm-api',
-    version='3.5.1',
+    version='3.6.0',
     description='Client library to simplify interacting with the PolySwarm consumer API',
     long_description=long_description,
     long_description_content_type='text/markdown',

{polyswarm-api-3.5.1 → polyswarm-api-3.6.0}/src/polyswarm_api/__init__.py

@@ -1,5 +1,5 @@
 # https://www.python.org/dev/peps/pep-0008/#module-level-dunder-names
-__version__ = '3.5.1'
+__version__ = '3.6.0'
 __release_url__ = 'https://api.github.com/repos/polyswarm/polyswarm-api/releases/latest'
 
 from . import api

{polyswarm-api-3.5.1 → polyswarm-api-3.6.0}/src/polyswarm_api/api.py

@@ -245,7 +245,7 @@ class PolyswarmAPI(object):
                                                          scan_config=scan_config,
                                                          community=self.community).result()
             instance.upload_file(artifact)
-            return resources.ArtifactInstance.update(self, id=instance.id).result()
+            return resources.ArtifactInstance.update(self, id=instance.id, community=self.community).result()
         else:
             raise exceptions.InvalidValueException('Artifacts should be a path to a file or a LocalArtifact instance')
 
@@ -716,11 +716,25 @@ class PolyswarmAPI(object):
                                                      vm_slug=vm_slug,
                                                      network_enabled=network_enabled).result()
             task.upload_file(artifact)
-            return resources.SandboxTask.update_file(self, id=task.id).result()
+            return resources.SandboxTask.update_file(self, id=task.id, community=self.community).result()
         else:
             raise exceptions.InvalidValueException(
                 'Artifacts should be a path to a file or a LocalArtifact instance')
 
+    def sandbox_url(self, url, provider_slug, vm_slug, browser=None):
+        logger.info('Sandboxing url in provider %s vm %s', provider_slug, vm_slug)
+        artifact = resources.LocalArtifact.from_content(self, url, artifact_name=url, artifact_type='URL')
+        task = resources.SandboxTask.create_file(self,
+                                                 artifact_name=url,
+                                                 artifact_type="URL",
+                                                 community=self.community,
+                                                 provider_slug=provider_slug,
+                                                 vm_slug=vm_slug,
+                                                 browser=browser,
+                                                 network_enabled=True).result()
+        task.upload_file(artifact)
+        return resources.SandboxTask.update_file(self, id=task.id, community=self.community).result()
+
     def sandbox_providers(self):
         """
         List sandboxes available in polyswarm.

{polyswarm-api-3.5.1 → polyswarm-api-3.6.0}/src/polyswarm_api/resources.py

@@ -307,7 +307,10 @@ class ArtifactInstance(core.BaseJsonResource, core.Hashable):
         self.votes = [Vote(v, api=api, scanfile=self) for v in content.get('votes', [])]
         self.window_closed = content.get('window_closed')
         self.polyscore = float(content['polyscore']) if content.get('polyscore') is not None else None
-        self.permalink = settings.DEFAULT_PERMALINK_BASE + '/' + str(self.hash) + '/' + str(self.id)
+        if content.get('permalink'):
+            self.permalink = content.get('permalink')
+        else:
+            self.permalink = settings.DEFAULT_PERMALINK_BASE + '/' + str(self.hash) + '/' + str(self.id)
 
         self._malicious_assertions = None
         self._benign_assertions = None

{polyswarm-api-3.5.1 → polyswarm-api-3.6.0/src/polyswarm_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: polyswarm-api
-Version: 3.5.1
+Version: 3.6.0
 Summary: Client library to simplify interacting with the PolySwarm consumer API
 Home-page: https://github.com/polyswarm/polyswarm-api
 Author: PolySwarm Developers