synapse 2.202.0__py311-none-any.whl → 2.203.0__py311-none-any.whl

synapse/tests/test_lib_stormlib_stats.py

@@ -242,7 +242,7 @@ class StatsTest(s_test.SynTest):
                 $tally.inc(foo, 1)
                 $tally.inc(bar, 2)
                 $tally.inc(baz, 3)
-                return($tally.sorted(reverse=$lib.true))
+                return($tally.sorted(reverse=(true)))
             '''
             vals = await core.callStorm(q)
             self.eq(vals, [('baz', 3), ('bar', 2), ('foo', 1)])
@@ -252,7 +252,7 @@ class StatsTest(s_test.SynTest):
                 $tally.inc(foo, 1)
                 $tally.inc(bar, 2)
                 $tally.inc(baz, 3)
-                return($tally.sorted(byname=$lib.true))
+                return($tally.sorted(byname=(true)))
             '''
             vals = await core.callStorm(q)
             self.eq(vals, [('bar', 2), ('baz', 3), ('foo', 1)])
@@ -262,11 +262,21 @@ class StatsTest(s_test.SynTest):
                 $tally.inc(foo, 1)
                 $tally.inc(bar, 2)
                 $tally.inc(baz, 3)
-                return($tally.sorted(byname=$lib.true, reverse=$lib.true))
+                return($tally.sorted(byname=(true), reverse=(true)))
             '''
             vals = await core.callStorm(q)
             self.eq(vals, [('foo', 1), ('baz', 3), ('bar', 2)])
 
+            q = '''
+                $tally = $lib.stats.tally()
+                $tally.inc(foo, 1)
+                $tally.inc(bar, 1)
+                $tally.inc(foo, 1)
+                return($tally.sorted(reverse=true)) // String coercion to true
+            '''
+            vals = await core.callStorm(q)
+            self.eq(vals, [('foo', 2), ('bar', 1)])
+
             tally = s_stormlib_stats.StatTally()
             await tally.inc('foo')
 

synapse/tests/test_lib_stormlib_stix.py

@@ -1,9 +1,9 @@
 import copy
-import json
 
 import synapse.exc as s_exc
 import synapse.common as s_common
 
+import synapse.lib.json as s_json
 import synapse.lib.stormlib.stix as s_stix
 
 import synapse.tests.utils as s_test
@@ -39,12 +39,12 @@ class StormLibStixTest(s_test.SynTest):
     def getTestBundle(self, name):
         path = self.getTestFilePath('stix_export', name)
         with open(path, 'r') as fd:
-            return json.load(fd)
+            return s_json.load(fd)
 
     def setTestBundle(self, name, bund):
         path = self.getTestFilePath('stix_export', name)
         with open(path, 'w') as fd:
-            json.dump(bund, fd, sort_keys=True, indent=2)
+            s_json.dump(bund, fd, sort_keys=True, indent=True)
 
     def reqValidStix(self, item):
         resp = s_stix.validateStix(item)
@@ -188,7 +188,7 @@ class StormLibStixTest(s_test.SynTest):
             self.isin('Error validating bundle', resp.get('mesg'))
 
             self.len(14, bund.get('objects'))
-            self.isin(s_stix.SYN_STIX_EXTENSION_ID, json.dumps(bund))
+            self.isin(s_stix.SYN_STIX_EXTENSION_ID, s_json.dumps(bund).decode())
             nodes = await core.nodes('yield $lib.stix.lift($bundle)', {'vars': {'bundle': bund}})
             self.len(10, nodes)
 
@@ -217,7 +217,7 @@ class StormLibStixTest(s_test.SynTest):
             self.reqValidStix(bund_noext)
             nodes = await core.nodes('yield $lib.stix.lift($bundle)', {'vars': {'bundle': bund_noext}})
             self.len(0, nodes)
-            self.notin(s_stix.SYN_STIX_EXTENSION_ID, json.dumps(bund_noext))
+            self.notin(s_stix.SYN_STIX_EXTENSION_ID, s_json.dumps(bund_noext).decode())
 
             # test some sad paths...
             self.none(await core.callStorm('return($lib.stix.export.bundle().add($lib.true))'))

synapse/tests/test_lib_stormtypes.py

@@ -1,7 +1,6 @@
 import re
 import bz2
 import gzip
-import json
 import base64
 import struct
 import asyncio
@@ -16,6 +15,7 @@ from unittest import mock
 import synapse.exc as s_exc
 import synapse.common as s_common
 
+import synapse.lib.json as s_json
 import synapse.lib.time as s_time
 import synapse.lib.storm as s_storm
 import synapse.lib.hashset as s_hashset
@@ -585,7 +585,7 @@ class StormTypesTest(s_test.SynTest):
             self.eq(0x01020304, await core.callStorm('return($lib.trycast(inet:ipv4, 1.2.3.4).1)'))
 
             # trycast/cast a property instead of a form/type
-            flow = json.loads(s_test_files.getAssetStr('attack_flow/CISA AA22-138B VMWare Workspace (Alt).json'))
+            flow = s_json.loads(s_test_files.getAssetStr('attack_flow/CISA AA22-138B VMWare Workspace (Alt).json'))
             opts = {'vars': {'flow': flow}}
             self.true(await core.callStorm('return($lib.trycast(it:mitre:attack:flow:data, $flow).0)', opts=opts))
             self.false(await core.callStorm('return($lib.trycast(it:mitre:attack:flow:data, {}).0)'))
@@ -1502,7 +1502,7 @@ class StormTypesTest(s_test.SynTest):
         async with self.getTestCore() as core:
 
             foo = {'a': 'ohhai'}
-            ghstr = json.dumps(foo)
+            ghstr = s_json.dumps(foo).decode()
             valu = s_common.guid()
             n2 = s_common.guid()
 
@@ -6232,7 +6232,7 @@ words\tword\twrd'''
 
             self.eq({
                 'file:count': 9,
-                'size:bytes': 651,
+                'size:bytes': 646,
             }, await core.callStorm('return($lib.axon.metrics())'))
 
             bin_buf = b'\xbb/$\xc0A\xf1\xbf\xbc\x00_\x82v4\xf6\xbd\x1b'

synapse/tests/test_lib_structlog.py

@@ -1,9 +1,10 @@
 import io
-import json
 import time
 import logging
 
 import synapse.common as s_common
+
+import synapse.lib.json as s_json
 import synapse.lib.structlog as s_structlog
 
 import synapse.tests.utils as s_test
@@ -46,7 +47,7 @@ class StructLogTest(s_test.SynTest):
 
         # There is a trailing \n on the stream
         raw_mesgs = [m for m in data.split('\n') if m]
-        mesgs = [json.loads(m) for m in raw_mesgs]
+        mesgs = [s_json.loads(m) for m in raw_mesgs]
         self.len(5, mesgs)
 
         mesg = mesgs[0]
@@ -83,10 +84,8 @@ class StructLogTest(s_test.SynTest):
         self.eq(erfo.get('args'), (1, 0))
         self.eq(erfo.get('buffer'), "b'vertex'")
 
-        mesg = mesgs[4]
         rawm = raw_mesgs[4]
-        self.isin(r'Unicode is cool for \u7a0b\u5e8f\u5458!', rawm)
-        self.eq(mesg.get('message'), 'Unicode is cool for 程序员!')
+        self.isin('"message":"Unicode is cool for 程序员!"', rawm)
 
         logger.removeHandler(handler)
 
@@ -105,7 +104,7 @@ class StructLogTest(s_test.SynTest):
 
         # There is a trailing \n on the stream
         raw_mesgs = [m for m in data.split('\n') if m]
-        mesgs = [json.loads(m) for m in raw_mesgs]
+        mesgs = [s_json.loads(m) for m in raw_mesgs]
         self.len(1, mesgs)
         ptime = time.strptime(mesgs[0].get('time'), datefmt)
         self.eq(now.tm_year, ptime.tm_year)

synapse/tests/test_lib_view.py

@@ -906,6 +906,14 @@ class ViewTest(s_t_utils.SynTest):
             with self.raises(s_exc.BadState):
                 await core.callStorm('return($lib.view.get().insertParentFork().iden)')
 
+            pname = view01.parent.info.get('name')
+            vdef = await view01.insertParentFork(visi.iden)
+            self.eq(vdef.get('name'), f'inserted fork of {pname}')
+
+            piden = view03.parent.iden
+            vdef = await view03.insertParentFork(visi.iden)
+            self.eq(vdef.get('name'), f'inserted fork of {piden}')
+
     async def test_view_children(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_model_base.py

@@ -413,3 +413,35 @@ class BaseTest(s_t_utils.SynTest):
             self.eq('bottles.', nodes[0].get('type'))
             self.eq(1706832000000, nodes[0].get('time'))
             self.len(1, await core.nodes('meta:aggregate -> meta:aggregate:type:taxonomy'))
+
+    async def test_model_feed(self):
+
+        async with self.getTestCore() as core:
+            nodes = await core.nodes('''[
+                meta:feed=*
+                    :name="woot (foo bar baz)"
+                    :type=foo.bar.baz
+                    :source={[ meta:source=* :name=woot ]}
+                    :url=https://v.vtx.lk/slack
+                    :query="Hi There"
+                    :opts=({"foo": "bar"})
+                    :period=(2024,2025)
+                    :latest=2025
+                    :offset=17
+                    :cursor=FooBar
+            ]''')
+            self.len(1, nodes)
+            self.nn(nodes[0].get('source'))
+
+            self.eq(nodes[0].get('name'), 'woot (foo bar baz)')
+            self.eq(nodes[0].get('type'), 'foo.bar.baz.')
+            self.eq(nodes[0].get('url'), 'https://v.vtx.lk/slack')
+            self.eq(nodes[0].get('query'), 'Hi There')
+            self.eq(nodes[0].get('opts'), {"foo": "bar"})
+            self.eq(nodes[0].get('period'), (1704067200000, 1735689600000))
+            self.eq(nodes[0].get('latest'), 1735689600000)
+            self.eq(nodes[0].get('offset'), 17)
+            self.eq(nodes[0].get('cursor'), 'FooBar')
+
+            self.len(1, await core.nodes('meta:feed -> meta:source +:name=woot'))
+            self.len(1, await core.nodes('meta:feed -> meta:feed:type:taxonomy'))

synapse/tests/test_model_infotech.py

@@ -1,9 +1,9 @@
-import json
 import hashlib
 
 import synapse.exc as s_exc
 import synapse.common as s_common
 
+import synapse.lib.json as s_json
 import synapse.lib.const as s_const
 import synapse.lib.scrape as s_scrape
 
@@ -1954,7 +1954,7 @@ class InfotechModelTest(s_t_utils.SynTest):
             # Test 2.2->2.3 and 2.3->2.2 conversions
             filename = s_t_files.getAssetPath('cpedata.json')
             with open(filename, 'r') as fp:
-                cpedata = json.load(fp)
+                cpedata = s_json.load(fp)
 
             for (_cpe22, _cpe23) in cpedata:
                 # Convert cpe22 -> cpe23

synapse/tests/test_telepath.py

@@ -1,6 +1,5 @@
 import os
 import ssl
-import json
 import socket
 import asyncio
 import logging

synapse/tests/test_tools_cryo_cat.py

@@ -1,10 +1,11 @@
 import io
-import json
 
 import msgpack
 
 import unittest.mock as mock
 
+import synapse.exc as s_exc
+
 import synapse.lib.msgpack as s_msgpack
 import synapse.tests.utils as s_t_utils
 import synapse.tools.cryo.cat as s_cryocat
@@ -34,7 +35,7 @@ class CryoCatTest(s_t_utils.SynTest):
             argv = ['--ingest', '--jsonl', cryourl]
             inp = io.StringIO('{"foo: "bar"}\n[]\n')
             with self.redirectStdin(inp):
-                with self.raises(json.decoder.JSONDecodeError):
+                with self.raises(s_exc.BadJsonText):
                     retn, outp = await self.execToolMain(s_cryocat.main, argv)
 
             # Happy path msgpack ingest
@@ -74,7 +75,7 @@ class CryoCatTest(s_t_utils.SynTest):
 
             argv = ['--offset', '0', '--jsonl', '--size', '2', '--omit-offset', cryourl]
             retn, outp = await self.execToolMain(s_cryocat.main, argv)
-            self.true(outp.expect('[null, {"key": 0}]\n[null, {"key": 1}]\n'))
+            self.true(outp.expect('[null,{"key":0}]\n[null,{"key":1}]\n'))
 
             argv = ['--offset', '0', '--size', '20', cryourl]
             retn, outp = await self.execToolMain(s_cryocat.main, argv)

synapse/tests/test_tools_docker_validate.py

@@ -1,10 +1,12 @@
 import base64
-import json
+
 import unittest.mock as mock
 
 import cryptography.hazmat.primitives.serialization as c_serialization
 
+import synapse.lib.json as s_json
 import synapse.lib.certdir as s_certdir
+
 import synapse.tests.utils as s_t_utils
 import synapse.tools.docker.validate as s_t_d_validate
 
@@ -48,7 +50,7 @@ class TestDockerValidate(s_t_utils.SynTest):
             # getCosignSignature
             outp = self.getTestOutp()
             with mock.patch('subprocess.run') as patch:
-                test_stdout = json.dumps(test_resp).encode()
+                test_stdout = s_json.dumps(test_resp)
                 mock_stdout = mock.MagicMock(stdout=test_stdout)
                 patch.return_value = mock_stdout
                 ret = s_t_d_validate.getCosignSignature(outp, 'hehe/haha:tag')

synapse/tests/test_tools_feed.py

@@ -1,4 +1,3 @@
-import json
 import hashlib
 
 from unittest import mock
@@ -6,6 +5,7 @@ from unittest import mock
 import synapse.exc as s_exc
 import synapse.common as s_common
 
+import synapse.lib.json as s_json
 import synapse.lib.msgpack as s_msgpack
 
 import synapse.tools.feed as s_feed
@@ -33,7 +33,7 @@ class FeedTest(s_t_utils.SynTest):
                 with s_common.genfile(jsonlfp) as fd:
                     for i in range(20):
                         pode = (('test:int', i), {})
-                        _ = fd.write(json.dumps(pode).encode() + b'\n')
+                        _ = fd.write(s_json.dumps(pode, newline=True))
 
                 argv = ['--cortex', curl,
                         '--format', 'syn.nodes',
@@ -138,3 +138,31 @@ class FeedTest(s_t_utils.SynTest):
 
             nodes = await core.nodes('test:int', opts={'view': oldview})
             self.len(0, nodes)
+
+    async def test_synnodes_json(self):
+        async with self.getTestCore() as core:
+
+            await self.addCreatorDeleterRoles(core)
+
+            host, port = await core.dmon.listen('tcp://127.0.0.1:0/')
+
+            curl = f'tcp://icanadd:secret@{host}:{port}/'
+
+            with self.getTestDir() as dirn:
+
+                jsonfp = s_common.genpath(dirn, 'podes.json')
+                with s_common.genfile(jsonfp) as fd:
+                    podes = [(('test:int', ii), {}) for ii in range(20)]
+                    s_json.dump(podes, fd)
+
+                argv = ['--cortex', curl,
+                        '--format', 'syn.nodes',
+                        '--modules', 'synapse.tests.utils.TestModule',
+                        '--chunksize', '3',
+                        jsonfp]
+
+                outp = self.getTestOutp()
+                self.eq(await s_feed.main(argv, outp=outp), 0)
+
+            nodes = await core.nodes('test:int')
+            self.len(20, nodes)

synapse/tests/test_tools_genpkg.py

@@ -65,7 +65,7 @@ class GenPkgTest(s_test.SynTest):
             ymlpath = s_common.genpath(dirname, 'files', 'stormpkg', 'badcmdname.yaml')
             await s_genpkg.main((ymlpath,))
 
-        with self.raises(s_exc.BadArg):
+        with self.raises(s_exc.MustBeJsonSafe):
             ymlpath = s_common.genpath(dirname, 'files', 'stormpkg', 'badjsonpkg.yaml')
             await s_genpkg.main((ymlpath,))
 

synapse/tests/test_tools_healthcheck.py

@@ -1,9 +1,10 @@
-import json
 import asyncio
 import logging
 
 import unittest.mock as mock
 
+import synapse.lib.json as s_json
+
 import synapse.tests.utils as s_t_utils
 
 import synapse.tools.healthcheck as s_t_healthcheck
@@ -25,7 +26,7 @@ class HealthcheckTest(s_t_utils.SynTest):
 
             retn = await s_t_healthcheck.main(argv, outp)
             self.eq(retn, 0)
-            resp = json.loads(str(outp))
+            resp = s_json.loads(str(outp))
             self.isinstance(resp, dict)
 
             mod = core.modules.get('synapse.tests.utils.TestModule')  # type: s_t_utils.TestModule
@@ -34,7 +35,7 @@ class HealthcheckTest(s_t_utils.SynTest):
             outp.clear()
             retn = await s_t_healthcheck.main(argv, outp)
             self.eq(retn, 1)
-            resp = json.loads(str(outp))
+            resp = s_json.loads(str(outp))
             self.isinstance(resp, dict)
 
             # Sad paths
@@ -47,7 +48,7 @@ class HealthcheckTest(s_t_utils.SynTest):
             outp.clear()
             retn = await s_t_healthcheck.main(['-c', curl, '-t', '0.4'], outp)
             self.eq(retn, 1)
-            resp = json.loads(str(outp))
+            resp = s_json.loads(str(outp))
             self.eq(resp.get('components')[0].get('name'), 'error')
             m = 'Timeout getting health information from cell.'
             self.eq(resp.get('components')[0].get('mesg'), m)
@@ -60,7 +61,7 @@ class HealthcheckTest(s_t_utils.SynTest):
             await root.setPasswd('secret')
             retn = await s_t_healthcheck.main(['-c', f'tcp://root:newp@127.0.0.1:{port}/cortex', '-t', '0.4'], outp)
             self.eq(retn, 1)
-            resp = json.loads(str(outp))
+            resp = s_json.loads(str(outp))
             self.eq(resp.get('components')[0].get('name'), 'error')
             m = 'Synapse error encountered.'
             self.eq(resp.get('components')[0].get('mesg'), m)
@@ -72,7 +73,7 @@ class HealthcheckTest(s_t_utils.SynTest):
             outp.clear()
             retn = await s_t_healthcheck.main(['-c', f'tcp://visi:secret@127.0.0.1:{port}/cortex', '-t', '0.4'], outp)
             self.eq(retn, 1)
-            resp = json.loads(str(outp))
+            resp = s_json.loads(str(outp))
             self.eq(resp.get('components')[0].get('name'), 'error')
             m = 'Synapse error encountered.'
             self.eq(resp.get('components')[0].get('mesg'), m)
@@ -85,7 +86,7 @@ class HealthcheckTest(s_t_utils.SynTest):
             outp.clear()
             retn = await s_t_healthcheck.main(['-c', curl, '-t', '0.4'], outp)
             self.eq(retn, 1)
-            resp = json.loads(str(outp))
+            resp = s_json.loads(str(outp))
             self.eq(resp.get('components')[0].get('name'), 'error')
             m = 'Unable to connect to cell'
             self.isin(m, resp.get('components')[0].get('mesg'))

synapse/tests/test_utils.py

@@ -1,12 +1,12 @@
 import os
 import time
-import json
 import logging
 import unittest
 
 import synapse.common as s_common
 
 import synapse.lib.base as s_base
+import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.certdir as s_certdir
 
@@ -126,7 +126,7 @@ class TestUtils(s_t_utils.SynTest):
         self.notin('notthere', mesgs)
 
         with self.getLoggerStream('synapse.tests.test_utils', 'Test Message') as stream:
-            thr = logathing(json.dumps({'mesg': 'Test Message'}))
+            thr = logathing(s_json.dumps({'mesg': 'Test Message'}).decode())
             self.true(stream.wait(10))
             thr.join()
 

synapse/tests/utils.py

@@ -21,13 +21,11 @@ import io
 import os
 import sys
 import copy
-import json
 import math
 import types
 import shutil
 import typing
 import asyncio
-import hashlib
 import inspect
 import logging
 import tempfile
@@ -59,6 +57,7 @@ import synapse.lib.cell as s_cell
 import synapse.lib.coro as s_coro
 import synapse.lib.cmdr as s_cmdr
 import synapse.lib.hive as s_hive
+import synapse.lib.json as s_json
 import synapse.lib.task as s_task
 import synapse.lib.const as s_const
 import synapse.lib.layer as s_layer
@@ -101,7 +100,7 @@ def deguidify(x):
 
 def jsonlines(text: str):
     lines = [k for k in text.split('\n') if k]
-    return [json.loads(line) for line in lines]
+    return [s_json.loads(line) for line in lines]
 
 async def waitForBehold(core, events):
     async for mesg in core.behold():
@@ -457,6 +456,7 @@ testmodel = {
             ('tick', ('test:time', {}), {}),
             ('hehe', ('str', {}), {}),
             ('ndefs', ('array', {'type': 'ndef'}), {}),
+            ('somestr', ('test:str', {}), {}),
         )),
 
         ('test:migr', {}, (

synapse/tools/autodoc.py

@@ -1,6 +1,5 @@
 import sys
 import copy
-import json
 import asyncio
 import logging
 import argparse
@@ -13,6 +12,7 @@ import synapse.common as s_common
 import synapse.cortex as s_cortex
 import synapse.telepath as s_telepath
 
+import synapse.lib.json as s_json
 import synapse.lib.storm as s_storm
 import synapse.lib.config as s_config
 import synapse.lib.output as s_output
@@ -262,7 +262,7 @@ def processTypes(rst, dochelp, types):
                         rst.addLines(f' * {key}: ``{valu}``')
                         continue
                     lines = [f' * {key}:\n', '  ::\n\n']
-                    json_lines = json.dumps(valu, indent=1, sort_keys=True)
+                    json_lines = s_json.dumps(valu, indent=True, sort_keys=True).decode()
                     json_lines = ['   ' + line for line in json_lines.split('\n')]
                     lines.extend(json_lines)
                     lines.append('\n')
@@ -810,7 +810,7 @@ async def docConfdefs(ctor):
                 data = {k: v for k, v in conf.items() if k not in (
                     'description', 'default', 'type', 'hideconf', 'hidecmdl',
                 )}
-                parts = json.dumps(data, sort_keys=True, indent=2).split('\n')
+                parts = s_json.dumps(data, sort_keys=True, indent=True).decode().split('\n')
                 lines.append('    ::')
                 lines.append('\n')
                 lines.extend([f'      {p}' for p in parts])

synapse/tools/changelog.py

@@ -476,7 +476,7 @@ async def gen(opts: argparse.Namespace,
     if opts.verbose:
         outp.printf('Validating data against schema')
 
-    s_schemas._reqChanglogSchema(data)
+    s_schemas._reqChangelogSchema(data)
 
     if opts.verbose:
         outp.printf('Saving the following information:')
@@ -835,7 +835,7 @@ async def format(opts: argparse.Namespace,
 
         files_processed.append(fp)
 
-        s_schemas._reqChanglogSchema(data)
+        s_schemas._reqChangelogSchema(data)
 
         data.setdefault('prs', [])
         prs = data.get('prs')

synapse/tools/cryo/cat.py

@@ -1,5 +1,4 @@
 import sys
-import json
 import pprint
 import asyncio
 import argparse
@@ -7,6 +6,7 @@ import logging
 
 import synapse.telepath as s_telepath
 
+import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.msgpack as s_msgpack
 
@@ -50,14 +50,14 @@ async def main(argv, outp=s_output.stdout):
                     await tank.puts(items)
                     return 0
 
-                items = [json.loads(line) for line in sys.stdin]
+                items = [s_json.loads(line) for line in sys.stdin]
                 await tank.puts(items)
                 return 0
 
             async for item in tank.slice(opts.offset, opts.size):
 
                 if opts.jsonl:
-                    outp.printf(json.dumps(item[1], sort_keys=True))
+                    outp.printf(s_json.dumps(item[1], sort_keys=True).decode())
 
                 elif opts.msgpack:
                     sys.stdout.buffer.write(s_msgpack.en(item[1]))

synapse/tools/csvtool.py

@@ -1,6 +1,5 @@
 import csv
 import sys
-import json
 import asyncio
 import contextlib
 
@@ -12,6 +11,7 @@ import synapse.telepath as s_telepath
 import synapse.lib.cmd as s_cmd
 import synapse.lib.base as s_base
 import synapse.lib.cmdr as s_cmdr
+import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.version as s_version
 
@@ -114,8 +114,7 @@ async def runCsvImport(opts, outp, text, stormopts):
                     outp.printf(repr(mesg))
 
                 if logfd is not None:
-                    byts = json.dumps(mesg).encode('utf8')
-                    logfd.write(byts + b'\n')
+                    logfd.write(s_json.dumps(mesg, newline=True))
 
         if opts.cli:
             await s_cmdr.runItemCmdr(core, outp, True)

synapse/tools/docker/validate.py

@@ -1,7 +1,6 @@
 import os
 import re
 import sys
-import json
 import base64
 import pprint
 import argparse
@@ -11,6 +10,7 @@ import synapse.exc as s_exc
 import synapse.data as s_data
 import synapse.common as s_common
 
+import synapse.lib.json as s_json
 import synapse.lib.output as s_outp
 import synapse.lib.certdir as s_certdir
 
@@ -50,8 +50,8 @@ def getCosignSignature(outp, image):
 
     blob = proc.stdout
     try:
-        sigd = json.loads(blob)
-    except json.JSONDecodeError as e:
+        sigd = s_json.loads(blob)
+    except s_exc.BadJsonText as e:
         outp.printf(f'Error decoding blob: {blob}: {e}')
         return None
     if not isinstance(sigd, dict):
@@ -104,8 +104,8 @@ def checkCosignSignature(outp, pubk_byts, image_to_verify):
         except subprocess.CalledProcessError as e:  # pragma: no cover
             outp.printf(f'Error calling {" ".join(args)}: {e}')
             return None
-        blob = json.loads(proc.stdout.decode())
-        outp.printf(f'Cosign output:')
+        blob = s_json.loads(proc.stdout)
+        outp.printf('Cosign output:')
         outp.printf(pprint.pformat(blob))
         return True
 

synapse/tools/feed.py

@@ -11,6 +11,7 @@ import synapse.cortex as s_cortex
 import synapse.telepath as s_telepath
 
 import synapse.lib.cmdr as s_cmdr
+import synapse.lib.json as s_json
 import synapse.lib.output as s_output
 import synapse.lib.msgpack as s_msgpack
 import synapse.lib.version as s_version
@@ -24,7 +25,7 @@ def getItems(*paths):
     items = []
     for path in paths:
         if path.endswith('.json'):
-            item = s_common.jsload(path)
+            item = s_json.jsload(path)
             if not isinstance(item, list):
                 item = [item]
             items.append((path, item))