stormlibpp 0.6.3__tar.gz → 0.6.4__tar.gz

{stormlibpp-0.6.3 → stormlibpp-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stormlibpp
-Version: 0.6.3
+Version: 0.6.4
 Summary: The stormlibpp Python package
 Author: John Gorman
 License: MIT License
@@ -29,6 +29,7 @@ Project-URL: Documentation, https://gormo.co/stormlibpp/
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: synapse>=2.139.0
 
 # stormlibpp
 

{stormlibpp-0.6.3 → stormlibpp-0.6.4}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "stormlibpp"
-version = "0.6.3"
+version = "0.6.4"
 description = "The stormlibpp Python package"
 readme = "README.md"
 requires-python = ">=3.11"
 
 # Fill in dependencies here.
 dependencies = [
-    "synapse==2.139.0"
+    "synapse>=2.139.0"
 ]
 
 [[project.authors]]

{stormlibpp-0.6.3 → stormlibpp-0.6.4}/src/stormlibpp/__init__.py

@@ -46,7 +46,7 @@ that can be used for testing other tools. It creates a user (``test``) with pass
 script will support custom Cortex configuration.
 """
 
-__version__ = "0.6.3"
+__version__ = "0.6.4"
 
 # TODO - Do we want to change this to only import submods, or do we even need that?
 from . import errors

{stormlibpp-0.6.3 → stormlibpp-0.6.4}/src/stormlibpp/errors.py

@@ -27,6 +27,7 @@ class StormPkgResolveError(StormPkgError):
 class StormPkgBadDefError(StormPkgError):
     """The package proto's directory for a StormPkg could not be resolved."""
 
+
 class StormPkgSyntaxError(StormPkgError, StormSyntaxError):
     """The Storm code defined in a StormPkg has a syntax error."""
 
@@ -44,3 +45,7 @@ class HttpCortexNotImplementedError(s_exc.SynErr, NotImplementedError):
 
     Wraps ``synapse.exc.SynErr`` so this can be caught by builtin Synapse tools.
     """
+
+
+class HttpCortexJsonError(HttpCortexError):
+    """Unable to parse JSON response from Synapse with HttpCortex."""

{stormlibpp-0.6.3 → stormlibpp-0.6.4}/src/stormlibpp/hstorm.py

@@ -23,9 +23,6 @@ import argparse
 import getpass
 import sys
 
-import synapse.lib.output as s_output
-import synapse.tools.storm as s_storm
-
 from .httpcore import HttpCortex
 from .output import OUTP
 from .stormcli import start_storm_cli

{stormlibpp-0.6.3 → stormlibpp-0.6.4}/src/stormlibpp/httpcore.py

@@ -13,6 +13,7 @@ import synapse.lib.msgpack as s_msgpack
 
 from .errors import (
     HttpCortexError,
+    HttpCortexJsonError,
     HttpCortexLoginError,
     HttpCortexNotImplementedError,
 )
@@ -248,17 +249,41 @@ class HttpCortex:
 
         try:
             async with self.sess.get(url, json=data, ssl=self.ssl_verify) as resp:
-                async for byts, _ in resp.content.iter_chunks():
+                buf = b""
+                async for byts, chunkend in resp.content.iter_chunks():
                     if not byts:
                         break
 
-                    data = json.loads(byts)
+                    buf += byts
+                    if not chunkend:
+                        continue
+
+                    try:
+                        data = json.loads(byts)
+                    except json.JSONDecodeError as err:
+                        # HACK - This is the only way I found to fix a bug - may require reworking.
+                        # TODO - Add a retry count here or something to not get stuck in loop?
+                        # Since we're chunking the response, occasionally we get part of a JSON
+                        # doc instead of all of it, which will cause this error. Try reading more
+                        # chunks until there's a readable JSON doc.
+                        if "Unterminated string starting at" in str(err):
+                            continue
+                        else:
+                            raise err
+
                     if tuplify:
                         yield s_msgpack.deepcopy(data)
                     else:
                         yield data
 
+        except json.JSONDecodeError as err:
+            raise HttpCortexJsonError(
+                f"Malformed JSON response from {self.url}: {err}\nDoc:\n{err.doc}", err
+            ) from err
+
         except Exception as err:
+            if isinstance(err, KeyboardInterrupt) or isinstance(err, SystemExit):
+                raise err
             raise HttpCortexError(
                 f"Unable to execute storm on {self.url}: {err}", err
             ) from err

{stormlibpp-0.6.3 → stormlibpp-0.6.4}/src/stormlibpp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stormlibpp
-Version: 0.6.3
+Version: 0.6.4
 Summary: The stormlibpp Python package
 Author: John Gorman
 License: MIT License
@@ -29,6 +29,7 @@ Project-URL: Documentation, https://gormo.co/stormlibpp/
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: synapse>=2.139.0
 
 # stormlibpp
 

stormlibpp-0.6.4/src/stormlibpp.egg-info/requires.txt

@@ -0,0 +1 @@
+synapse>=2.139.0

stormlibpp-0.6.3/src/stormlibpp.egg-info/requires.txt

@@ -1 +0,0 @@
-synapse==2.139.0