stormlibpp 0.6.2__tar.gz → 0.6.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stormlibpp
-Version: 0.6.2
+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.2 → stormlibpp-0.6.4}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "stormlibpp"
-version = "0.6.2"
+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.2 → 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.2"
+__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.2 → stormlibpp-0.6.4}/src/stormlibpp/errors.py

@@ -8,6 +8,10 @@ class StormSyntaxError(Exception):
     """There was a syntax error in Storm code."""
 
 
+class StormRaiseError(Exception):
+    """There was a syntax error in Storm code."""
+
+
 class StormPkgError(Exception):
     """An error in a StormPkg."""
 
@@ -23,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."""
 
@@ -40,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.2 → 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.2 → 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.2 → stormlibpp-0.6.4}/src/stormlibpp/import.py

@@ -21,6 +21,18 @@ from .output import OUTP, handle_msg
 from .stormcli import start_storm_cli
 
 
+def endswith(text, items):
+    for item in items:
+        if text.endswith(item):
+            return True
+    return False
+
+
+def csv_genr(fd):
+    for row in csv.reader(fd):
+        yield row
+
+
 def json_genr(fd):
     # TODO - Support nested key to start with
     data = json.load(fd)
@@ -40,9 +52,15 @@ def txt_genr(fd):
         yield row.strip()
 
 
-def csv_genr(fd):
-    for row in csv.reader(fd):
-        yield row
+async def import_storm_text(core, text, stormopts, print_skips):
+        async for msg in core.storm(text, opts=stormopts):
+            handle_msg(msg, print_skips=print_skips)
+    
+
+async def import_storml_file(core, storm_script, stormopts, print_skips):
+    with open(storm_script, "r") as fd:
+        for line in txt_genr(fd):
+            await import_storm_text(core, line, stormopts, print_skips)
 
 
 class Importer:
@@ -226,13 +244,9 @@ async def main(argv: list[str]):
                 dirs.sort()  # NOTE - Ensures the next iteration of dirs is in order.
                 for file in sorted(files):
                     fullpath = os.path.join(dir, file)
-                    if file.endswith(".storm"):
+                    if endswith(file, (".storm", ".storml")):
                         storm_scripts.append(fullpath)
-                    elif (
-                        file.endswith(".json")
-                        or file.endswith(".txt")
-                        or file.endswith(".csv")
-                    ):
+                    elif endswith(file, (".json", ".txt", ".csv")):
                         data_files.append(fullpath)
         else:
             print(f"{path} doesn't exist!")
@@ -255,9 +269,12 @@ async def main(argv: list[str]):
                         debug=args.debug,
                     ).add_data()
                 else:
-                    async for msg in core.storm(text, opts=stormopts):
-                        # TODO - Optionally use hide* args
-                        handle_msg(msg, print_skips=print_skips)
+                    if storm_script.endswith(".storml"):
+                        # TODO - This will wind up opening and closing the file twice.
+                        # Do we want that? Maybe we do because we won't get here much?
+                        await import_storml_file(core, storm_script, stormopts, print_skips)
+                    else:
+                       await import_storm_text(core, text, stormopts, print_skips)
 
             if args.cli:
                 await start_storm_cli(core, outp=OUTP, opts=args)

{stormlibpp-0.6.2 → stormlibpp-0.6.4}/src/stormlibpp/output.py

@@ -8,6 +8,8 @@ from the Storm CLI and modified it to work in standalone methods.
 import synapse.lib.node as s_node
 import synapse.lib.output as s_output
 
+from .errors import StormRaiseError
+
 
 OUTP = s_output.stdout
 
@@ -16,7 +18,7 @@ def print_node_prop(name, valu):
     OUTP.printf(f"        {name} = {valu}")
 
 
-async def handleErr(mesg):
+def handle_err(mesg, storm_raise=True):
     err = mesg[1]
     if err[0] == "BadSyntax":
         pos = err[1].get("at", None)
@@ -38,6 +40,10 @@ async def handleErr(mesg):
             OUTP.printf(f'{" " * pos}^')
             OUTP.printf(f"Syntax Error: {mesg}")
             return
+    elif err[0] == "StormRaise" and storm_raise:
+        errname = err[1].get("errname", "")
+        if errname == "stormlibpp:exit":
+            raise StormRaiseError(f"{errname}: {err[1].get('mesg', err[0])}")
 
     text = err[1].get("mesg", err[0])
     OUTP.printf(f"ERROR: {text}")
@@ -48,6 +54,7 @@ def handle_msg(
     hideprops: bool = False,
     hidetags: bool = False,
     print_skips: list[str] = [],
+    print_fini: bool = True
 ):
     mtyp = mesg[0]
 
@@ -119,7 +126,7 @@ def handle_msg(
         count = sum(len(e[2]) for e in edit.get("edits", ()))
         OUTP.printf("." * count, addnl=False)
 
-    elif mtyp == "fini":
+    elif mtyp == "fini" and print_fini:
         took = mesg[1].get("took")
         took = max(took, 1)
         count = mesg[1].get("count")
@@ -138,4 +145,4 @@ def handle_msg(
         OUTP.printf(f"WARNING: {warn}")
 
     elif mtyp == "err":
-        handleErr(mesg)
+        handle_err(mesg)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stormlibpp
-Version: 0.6.2
+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.2/src/stormlibpp.egg-info/requires.txt

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