synapse 2.219.0__tar.gz → 2.221.0__tar.gz

{synapse-2.219.0/synapse.egg-info → synapse-2.221.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse
-Version: 2.219.0
+Version: 2.221.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License-Expression: Apache-2.0
@@ -28,7 +28,6 @@ Requires-Dist: regex>=2022.9.11
 Requires-Dist: PyYAML<6.1.0,>=5.4
 Requires-Dist: aiohttp<4.0,>=3.10.0
 Requires-Dist: aiohttp-socks<0.11.0,>=0.9.0
-Requires-Dist: aioimaplib<1.2.0,>=1.1.0
 Requires-Dist: aiosmtplib<3.1.0,>=3.0.0
 Requires-Dist: prompt_toolkit<3.1.0,>=3.0.29
 Requires-Dist: lark==1.2.2

{synapse-2.219.0 → synapse-2.221.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'synapse'
-version = '2.219.0'
+version = '2.221.0'
 authors = [
     { name = 'The Vertex Project LLC', email = 'root@vertex.link'},
 ]
@@ -32,7 +32,6 @@ dependencies = [
     'PyYAML>=5.4,<6.1.0',
     'aiohttp>=3.10.0,<4.0',
     'aiohttp-socks>=0.9.0,<0.11.0',
-    'aioimaplib>=1.1.0,<1.2.0',
     'aiosmtplib>=3.0.0,<3.1.0',
     'prompt_toolkit>=3.0.29,<3.1.0',
     'lark==1.2.2',
@@ -86,9 +85,9 @@ include-package-data = true
 'synapse' = [
     'data/*.mpk',
     'data/certs/**',
+    'data/lark/*.lark',
     'data/attack-flow/**',
     'data/jsonschemas/**',
-    'lib/storm.lark',
     'tests/files/**',
     'vendor/*/LICENSE'
 ]

{synapse-2.219.0 → synapse-2.221.0}/synapse/data/__init__.py

@@ -29,5 +29,9 @@ def getJSON(name):
     with s_datfile.openDatFile(f'synapse.data/{name}.json') as fd:
         return s_json.load(fd)
 
+def getLark(name):
+    with s_datfile.openDatFile(f'synapse.data.lark/{name}.lark') as larkf:
+        return larkf.read().decode()
+
 def path(*names):
     return s_common.genpath(dirname, *names)

synapse-2.221.0/synapse/data/lark/imap.lark

@@ -0,0 +1,8 @@
+UNQUOTED_CHAR: /(?!\r|\n|\\"|\\\\)./
+QUOTED_SPECIALS: "\"" | "\\"
+
+QUOTED_CHAR: /(?!\r|\n|\\|\")./
+quoted: "\"" (QUOTED_CHAR | "\\" QUOTED_SPECIALS)* "\""
+unquoted: UNQUOTED_CHAR+
+_string: quoted | unquoted
+input: (_string " ")* _string

{synapse-2.219.0 → synapse-2.221.0}/synapse/exc.py

@@ -216,6 +216,8 @@ class DupEdgeType(SynErr):
 
 class FileExists(SynErr): pass
 
+class ImapError(SynErr): pass
+
 class InconsistentStorage(SynErr):
     '''
     Stored persistent data is inconsistent

{synapse-2.219.0 → synapse-2.221.0}/synapse/lib/json.py

@@ -88,12 +88,13 @@ def _dumps(obj, sort_keys=False, indent=False, default=None, newline=False):
         mesg = 'Object of type bytes is not JSON serializable'
         raise s_exc.MustBeJsonSafe(mesg=mesg)
 
-    # Raw strings have to be double-quoted. This is because the default behavior for `yyjson.Document`
-    #  is to attempt to parse the string as a serialized JSON string into objects, so we escape string
-    # values so we can get the JSON encoded string as output.
     if isinstance(obj, str) and obj not in ('null', 'true', 'false'):
-        # TODO in 3xx convert this into obj = f'''"{obj.replace('"', '\\"')}"'''
-        obj = ''.join(('"', obj.replace('"', '\\"'), '"'))
+        # Raw strings have to be double-quoted. This is because the default behavior for `yyjson.Document` is to attempt
+        # to parse the string as a serialized JSON string into objects. Instead of trying to manually escape the string,
+        # we wrap it in a list, serialize it, and then strip off the leading/trailing [] so we can get the JSON encoded
+        # string as output.
+        doc = yyjson.Document([obj], default=default, flags=rflags)
+        return doc.dumps(flags=wflags)[1:-1].encode()
 
     doc = yyjson.Document(obj, default=default, flags=rflags)
     return doc.dumps(flags=wflags).encode()

{synapse-2.219.0 → synapse-2.221.0}/synapse/lib/layer.py

@@ -3352,6 +3352,98 @@ class Layer(s_nexus.Pusher):
         _, changes = await self.saveNodeEdits(nodeedits, meta)
         return bool(changes[0][2])
 
+    async def delStorNode(self, buid, meta):
+        '''
+        Delete all node information in this layer.
+
+        Deletes props, tagprops, tags, n1edges, n2edges, nodedata, and node valu.
+        '''
+        sode = self._getStorNode(buid)
+        if sode is None:
+            return False
+
+        formname = sode.get('form')
+
+        edits = []
+        nodeedits = []
+
+        for propname, propvalu in sode.get('props', {}).items():
+            edits.append(
+                (EDIT_PROP_DEL, (propname, *propvalu), ())
+            )
+
+        for tagname, tprops in sode.get('tagprops', {}).items():
+            for propname, propvalu in tprops.items():
+                edits.append(
+                    (EDIT_TAGPROP_DEL, (tagname, propname, *propvalu), ())
+                )
+
+        for tagname, tagvalu in sode.get('tags', {}).items():
+            edits.append(
+                (EDIT_TAG_DEL, (tagname, tagvalu), ())
+            )
+
+        # EDIT_NODE_DEL will delete all nodedata and n1 edges if there is a valu in the sode
+        if (valu := sode.get('valu')):
+            edits.append(
+                (EDIT_NODE_DEL, valu, ())
+            )
+        else:
+            async for item in self.iterNodeData(buid):
+                edits.append(
+                    (EDIT_NODEDATA_DEL, item, ())
+                )
+                await asyncio.sleep(0)
+
+            async for edge in self.iterNodeEdgesN1(buid):
+                edits.append(
+                    (EDIT_EDGE_DEL, edge, ())
+                )
+                await asyncio.sleep(0)
+
+        nodeedits.append((buid, formname, edits))
+
+        n2edges = {}
+        n1iden = s_common.ehex(buid)
+        async for verb, n2iden in self.iterNodeEdgesN2(buid):
+            n2edges.setdefault(n2iden, []).append((verb, n1iden))
+            await asyncio.sleep(0)
+
+        n2forms = {}
+        @s_cache.memoize()
+        def getN2Form(n2iden):
+            buid = s_common.uhex(n2iden)
+            if (form := n2forms.get(buid)) is not None: # pragma: no cover
+                return form
+
+            n2sode = self._getStorNode(buid)
+            form = n2sode.get('form')
+            n2forms[buid] = form
+            return form
+
+        changed = False
+
+        async def batchEdits(size=1000):
+            if len(nodeedits) < size:
+                return changed
+
+            _, changes = await self.saveNodeEdits(nodeedits, meta)
+
+            nodeedits.clear()
+
+            if changed: # pragma: no cover
+                return changed
+
+            return bool(changes[0][2])
+
+        for n2iden, edges in n2edges.items():
+            edits = [(EDIT_EDGE_DEL, edge, ()) for edge in edges]
+            nodeedits.append((s_common.uhex(n2iden), getN2Form(n2iden), edits))
+
+            changed = await batchEdits()
+
+        return await batchEdits(size=1)
+
     async def delStorNodeProp(self, buid, prop, meta):
         pprop = self.core.model.reqProp(prop)
 
@@ -3365,6 +3457,48 @@ class Layer(s_nexus.Pusher):
         _, changes = await self.saveNodeEdits(nodeedits, meta)
         return bool(changes[0][2])
 
+    async def delNodeData(self, buid, meta, name=None):
+        '''
+        Delete nodedata from a node in this layer. If name is not specified, delete all nodedata.
+        '''
+        sode = self._getStorNode(buid)
+        if sode is None: # pragma: no cover
+            return False
+
+        edits = []
+        if name is None:
+            async for item in self.iterNodeData(buid):
+                edits.append((EDIT_NODEDATA_DEL, item, ()))
+                await asyncio.sleep(0)
+
+        elif await self.hasNodeData(buid, name):
+            edits.append((EDIT_NODEDATA_DEL, (name, None), ()))
+
+        if not edits:
+            return False
+
+        nodeedits = [(buid, sode.get('form'), edits)]
+
+        _, changes = await self.saveNodeEdits(nodeedits, meta)
+        return bool(changes[0][2])
+
+    async def delEdge(self, n1buid, verb, n2buid, meta):
+        sode = self._getStorNode(n1buid)
+        if sode is None: # pragma: no cover
+            return False
+
+        if not await self.hasNodeEdge(n1buid, verb, n2buid): # pragma: no cover
+            return False
+
+        edits = [
+            (EDIT_EDGE_DEL, (verb, s_common.ehex(n2buid)), ())
+        ]
+
+        nodeedits = [(n1buid, sode.get('form'), edits)]
+
+        _, changes = await self.saveNodeEdits(nodeedits, meta)
+        return bool(changes[0][2])
+
     async def storNodeEdits(self, nodeedits, meta):
 
         saveoff, results = await self.saveNodeEdits(nodeedits, meta)

{synapse-2.219.0 → synapse-2.221.0}/synapse/lib/link.py

@@ -18,34 +18,6 @@ import synapse.lib.msgpack as s_msgpack
 READSIZE = 16 * s_const.mebibyte
 MAXWRITE = 64 * s_const.mebibyte
 
-async def connect(host, port, ssl=None, hostname=None, linkinfo=None):
-    '''
-    Async connect and return a Link().
-    '''
-    info = {'host': host, 'port': port, 'ssl': ssl, 'hostname': hostname, 'tls': bool(ssl)}
-    if linkinfo is not None:
-        info.update(linkinfo)
-
-    ssl = info.get('ssl')
-    hostname = info.get('hostname')
-
-    reader, writer = await asyncio.open_connection(host, port, ssl=ssl, server_hostname=hostname)
-    return await Link.anit(reader, writer, info=info)
-
-async def listen(host, port, onlink, ssl=None):
-    '''
-    Listen on the given host/port and fire onlink(Link).
-
-    Returns a server object that contains the listening sockets
-    '''
-    async def onconn(reader, writer):
-        info = {'tls': bool(ssl)}
-        link = await Link.anit(reader, writer, info=info)
-        link.schedCoro(onlink(link))
-
-    server = await asyncio.start_server(onconn, host=host, port=port, ssl=ssl)
-    return server
-
 async def unixlisten(path, onlink):
     '''
     Start an PF_UNIX server listening on the given path.
@@ -247,30 +219,9 @@ class Link(s_base.Base):
         offs = 0
         size = len(byts)
 
-        async with self._txlock:
-
-            while offs < size:
-
-                self.writer.write(byts[offs:offs + MAXWRITE])
-                offs += MAXWRITE
-
-                await self.writer.drain()
-
-    async def tx(self, mesg):
-        '''
-        Async transmit routine which will wait for writer drain().
-        '''
-        if self.isfini:
-            raise s_exc.IsFini()
-
-        offs = 0
-        byts = s_msgpack.en(mesg)
-        size = len(byts)
-
         async with self._txlock:
 
             try:
-
                 while offs < size:
 
                     self.writer.write(byts[offs:offs + MAXWRITE])
@@ -287,6 +238,16 @@ class Link(s_base.Base):
 
                 raise
 
+    async def tx(self, mesg):
+        '''
+        Async transmit routine which will wait for writer drain().
+        '''
+        if self.isfini:
+            raise s_exc.IsFini()
+
+        byts = await self.pack(mesg)
+        await self.send(byts)
+
     def txfini(self):
         self.sock.shutdown(1)
 
@@ -353,6 +314,44 @@ class Link(s_base.Base):
 
     def feed(self, byts):
         '''
-        Used by Plex() to unpack bytes.
+        Used by rx() to unpack messages from bytes.
         '''
         return self.unpk.feed(byts)
+
+    async def pack(self, mesg):
+        '''
+        Used by tx() to pack messages into bytes
+        '''
+        return s_msgpack.en(mesg)
+
+async def connect(host, port, ssl=None, hostname=None, linkinfo=None, linkcls=Link):
+    '''
+    Async connect and return a <linkcls>.
+    '''
+    assert issubclass(linkcls, Link)
+
+    info = {'host': host, 'port': port, 'ssl': ssl, 'hostname': hostname, 'tls': bool(ssl)}
+    if linkinfo is not None:
+        info.update(linkinfo)
+
+    ssl = info.get('ssl')
+    hostname = info.get('hostname')
+
+    reader, writer = await asyncio.open_connection(host, port, ssl=ssl, server_hostname=hostname)
+    return await linkcls.anit(reader, writer, info=info)
+
+async def listen(host, port, onlink, ssl=None, linkcls=Link):
+    '''
+    Listen on the given host/port and fire onlink(<linkcls>).
+
+    Returns a server object that contains the listening sockets
+    '''
+    assert issubclass(linkcls, Link)
+
+    async def onconn(reader, writer):
+        info = {'tls': bool(ssl)}
+        link = await linkcls.anit(reader, writer, info=info)
+        link.schedCoro(onlink(link))
+
+    server = await asyncio.start_server(onconn, host=host, port=port, ssl=ssl)
+    return server

{synapse-2.219.0 → synapse-2.221.0}/synapse/lib/parser.py

@@ -6,16 +6,16 @@ import lark  # type: ignore
 import regex  # type: ignore
 
 import synapse.exc as s_exc
+import synapse.data as s_data
 import synapse.common as s_common
 
 import synapse.lib.ast as s_ast
 import synapse.lib.coro as s_coro
 import synapse.lib.cache as s_cache
-import synapse.lib.datfile as s_datfile
 
 # TL;DR:  *rules* are the internal nodes of an abstract syntax tree (AST), *terminals* are the leaves
 
-# Note: this file is coupled strongly to synapse/lib/storm.lark.  Any changes to that file will probably require
+# Note: this file is coupled strongly to synapse/data/lark/storm.lark.  Any changes to that file will probably require
 # changes here
 
 # For easier-to-understand syntax errors
@@ -475,9 +475,7 @@ class AstConverter(lark.Transformer):
         kids[0].reverseLift(astinfo)
         return kids[0]
 
-with s_datfile.openDatFile('synapse.lib/storm.lark') as larkf:
-    _grammar = larkf.read().decode()
-
+_grammar = s_data.getLark('storm')
 LarkParser = lark.Lark(_grammar, regex=True, start=['query', 'lookup', 'cmdrargs', 'evalvalu', 'search'],
                        maybe_placeholders=False, propagate_positions=True, parser='lalr')
 

{synapse-2.219.0 → synapse-2.221.0}/synapse/lib/rstorm.py

@@ -1,8 +1,12 @@
 import os
+import sys
 import copy
+import shlex
 import pprint
 import logging
+import argparse
 import contextlib
+import subprocess
 import collections
 
 import vcr
@@ -25,7 +29,7 @@ import synapse.tools.storm as s_storm
 import synapse.tools.genpkg as s_genpkg
 
 
-re_directive = regex.compile(r'^\.\.\s(storm.*|[^:])::(?:\s(.*)$|$)')
+re_directive = regex.compile(r'^\.\.\s(shell.*|storm.*|[^:])::(?:\s(.*)$|$)')
 
 logger = logging.getLogger(__name__)
 
@@ -48,7 +52,6 @@ class OutPutRst(s_output.OutPutStr):
 
         return s_output.OutPutStr.printf(self, mesg, addnl)
 
-
 class StormOutput(s_cmds_cortex.StormCmd):
     '''
     Produce standard output from a stream of storm runtime messages.
@@ -329,6 +332,8 @@ class StormRst(s_base.Base):
         self.core = None
 
         self.handlers = {
+            'shell': self._handleShell,
+            'shell-env': self._handleShellEnv,
             'storm': self._handleStorm,
             'storm-cli': self._handleStormCli,
             'storm-pkg': self._handleStormPkg,
@@ -596,6 +601,64 @@ class StormRst(s_base.Base):
             raise s_exc.NoSuchCtor(mesg=f'Failed to get callback "{text}"', ctor=text)
         self.context['storm-vcr-callback'] = cb
 
+    async def _handleShell(self, text):
+        '''
+        Execute shell with the supplied arguments.
+        '''
+        parser = argparse.ArgumentParser(add_help=False)
+        parser.add_argument('--include-stderr', action='store_true', help='Include stderr in output.')
+        parser.add_argument('--hide-query', action='store_true', help='Do not include the command in the output.')
+        parser.add_argument('--fail-ok', action='store_true', help='Non-zero return values are non-fatal.')
+        opts, args = parser.parse_known_args(shlex.split(text))
+
+        # Remove any command line arguments
+        query = text
+        query = query.replace('--include-stderr', '')
+        query = query.replace('--hide-query', '')
+        query = query.replace('--fail-ok', '')
+        query = query.strip()
+
+        env = self.context.get('shell-env')
+
+        stderr = None
+        if opts.include_stderr:
+            stderr = subprocess.STDOUT
+
+        proc = subprocess.run(args, stdout=subprocess.PIPE, stderr=stderr, env=env, text=True)
+        if proc.returncode != 0 and not opts.fail_ok:
+            mesg = f'Error when executing shell directive: {text} (rv: {proc.returncode})'
+            raise s_exc.SynErr(mesg=mesg)
+
+        self._printf('::\n\n')
+
+        if not opts.hide_query:
+            self._printf(f'  {query}\n\n')
+
+        for line in proc.stdout.splitlines():
+            self._printf(f'  {line}\n')
+
+        self._printf('\n\n')
+
+    async def _handleShellEnv(self, text):
+        '''
+        Env to use in subsequent shell queries.
+
+        Args:
+            text (str): [KEY=VALUE ...]
+                Note: No arguments will reset the shell environment.
+        '''
+        text = text.strip()
+        if not text:
+            return self.context.pop('shell-env')
+
+        env = {}
+
+        for item in text.split(' '):
+            key, val = item.split('=')
+            env[key] = val
+
+        self.context['shell-env'] = env
+
     async def _readline(self, line):
 
         match = re_directive.match(line)

{synapse-2.219.0 → synapse-2.221.0}/synapse/lib/snap.py

@@ -1123,22 +1123,30 @@ class Snap(s_base.Base):
             mesg = f'No property named "{full}".'
             raise s_exc.NoSuchProp(mesg=mesg)
 
-        if isinstance(valu, dict) and isinstance(prop.type, s_types.Guid) and cmpr == '=':
-            if prop.isform:
-                if (node := await self._getGuidNodeByDict(prop, valu)) is not None:
-                    yield node
-                return
+        if isinstance(valu, dict) and isinstance(prop.type, s_types.Guid) and cmpr in ('=', '?='):
+            excignore = ()
+            if cmpr == '?=':
+                excignore = (s_exc.BadTypeValu,)
 
-            fname = prop.type.name
-            if (form := prop.modl.form(fname)) is None:
-                mesg = f'The property "{full}" type "{fname}" is not a form and cannot be lifted using a dictionary.'
-                raise s_exc.BadTypeValu(mesg=mesg)
+            try:
+                if prop.isform:
+                    if (node := await self._getGuidNodeByDict(prop, valu)) is not None:
+                        yield node
+                    return
 
-            if (node := await self._getGuidNodeByDict(form, valu)) is None:
-                return
+                fname = prop.type.name
+                if (form := prop.modl.form(fname)) is None:
+                    mesg = f'The property "{full}" type "{fname}" is not a form and cannot be lifted using a dictionary.'
+                    raise s_exc.BadTypeValu(mesg=mesg)
 
-            norm = False
-            valu = node.ndef[1]
+                if (node := await self._getGuidNodeByDict(form, valu)) is None:
+                    return
+
+                norm = False
+                valu = node.ndef[1]
+
+            except excignore:
+                return
 
         if norm:
             cmprvals = prop.type.getStorCmprs(cmpr, valu)

{synapse-2.219.0 → synapse-2.221.0}/synapse/lib/storm.py

@@ -5796,6 +5796,7 @@ class IntersectCmd(Cmd):
         it:mitre:attack:group*in=(G0006, G0007) | intersect { -> it:mitre:attack:technique }
     '''
     name = 'intersect'
+    readonly = True
 
     def getArgParser(self):
         pars = Cmd.getArgParser(self)

{synapse-2.219.0 → synapse-2.221.0}/synapse/lib/stormhttp.py

@@ -90,7 +90,7 @@ class LibHttp(s_stormtypes.Lib):
     For APIs that accept an ssl_opts argument, the dictionary may contain the following values::
 
         ({
-            'verify': <bool> - Perform SSL/TLS verification. Is overridden by the ssl_verify argument.
+            'verify': <boolean> - Perform SSL/TLS verification. Is overridden by the ssl_verify argument.
             'client_cert': <str> - PEM encoded full chain certificate for use in mTLS.
             'client_key': <str> - PEM encoded key for use in mTLS. Alternatively, can be included in client_cert.
             'ca_cert': <str> - A PEM encoded full chain CA certificate for use when verifying the request.
@@ -116,9 +116,9 @@ class LibHttp(s_stormtypes.Lib):
                        'default': None},
                       {'name': 'timeout', 'type': 'int', 'desc': 'Total timeout for the request in seconds.',
                        'default': 300},
-                      {'name': 'allow_redirects', 'type': 'bool', 'desc': 'If set to false, do not follow redirects.',
+                      {'name': 'allow_redirects', 'type': 'boolean', 'desc': 'If set to false, do not follow redirects.',
                        'default': True},
-                      {'name': 'proxy', 'type': ['bool', 'str'],
+                      {'name': 'proxy', 'type': ['boolean', 'str'],
                        'desc': 'Configure proxy usage. See $lib.inet.http help for additional details.', 'default': True},
                       {'name': 'ssl_opts', 'type': 'dict',
                        'desc': 'Optional SSL/TLS options. See $lib.inet.http help for additional details.',
@@ -141,7 +141,7 @@ class LibHttp(s_stormtypes.Lib):
                        'default': None},
                       {'name': 'timeout', 'type': 'int', 'desc': 'Total timeout for the request in seconds.',
                        'default': 300},
-                      {'name': 'allow_redirects', 'type': 'bool', 'desc': 'If set to false, do not follow redirects.',
+                      {'name': 'allow_redirects', 'type': 'boolean', 'desc': 'If set to false, do not follow redirects.',
                        'default': True},
                       {'name': 'fields', 'type': 'list',
                        'desc': 'A list of info dictionaries containing the name, value or sha256, '
@@ -150,7 +150,7 @@ class LibHttp(s_stormtypes.Lib):
                                'and the corresponding file will be uploaded as the value for '
                                'the field.',
                        'default': None},
-                      {'name': 'proxy', 'type': ['bool', 'str'],
+                      {'name': 'proxy', 'type': ['boolean', 'str'],
                        'desc': 'Configure proxy usage. See $lib.inet.http help for additional details.', 'default': True},
                       {'name': 'ssl_opts', 'type': 'dict',
                        'desc': 'Optional SSL/TLS options. See $lib.inet.http help for additional details.',
@@ -170,9 +170,9 @@ class LibHttp(s_stormtypes.Lib):
                        'default': None},
                       {'name': 'timeout', 'type': 'int', 'desc': 'Total timeout for the request in seconds.',
                        'default': 300, },
-                      {'name': 'allow_redirects', 'type': 'bool', 'desc': 'If set to true, follow redirects.',
+                      {'name': 'allow_redirects', 'type': 'boolean', 'desc': 'If set to true, follow redirects.',
                        'default': False},
-                      {'name': 'proxy', 'type': ['bool', 'str'],
+                      {'name': 'proxy', 'type': ['boolean', 'str'],
                        'desc': 'Configure proxy usage. See $lib.inet.http help for additional details.', 'default': True},
                       {'name': 'ssl_opts', 'type': 'dict',
                        'desc': 'Optional SSL/TLS options. See $lib.inet.http help for additional details.',
@@ -196,7 +196,7 @@ class LibHttp(s_stormtypes.Lib):
                        'default': None},
                       {'name': 'timeout', 'type': 'int', 'desc': 'Total timeout for the request in seconds.',
                        'default': 300},
-                      {'name': 'allow_redirects', 'type': 'bool', 'desc': 'If set to false, do not follow redirects.',
+                      {'name': 'allow_redirects', 'type': 'boolean', 'desc': 'If set to false, do not follow redirects.',
                        'default': True},
                       {'name': 'fields', 'type': 'list',
                        'desc': 'A list of info dictionaries containing the name, value or sha256, '
@@ -205,7 +205,7 @@ class LibHttp(s_stormtypes.Lib):
                                'and the corresponding file will be uploaded as the value for '
                                'the field.',
                        'default': None},
-                      {'name': 'proxy', 'type': ['bool', 'str'],
+                      {'name': 'proxy', 'type': ['boolean', 'str'],
                        'desc': 'Configure proxy usage. See $lib.inet.http help for additional details.', 'default': True},
                       {'name': 'ssl_opts', 'type': 'dict',
                        'desc': 'Optional SSL/TLS options. See $lib.inet.http help for additional details.',
@@ -226,7 +226,7 @@ class LibHttp(s_stormtypes.Lib):
                        'default': 300},
                       {'name': 'params', 'type': 'dict', 'desc': 'Optional parameters which may be passed to the connection request.',
                        'default': None},
-                      {'name': 'proxy', 'type': ['bool', 'str'],
+                      {'name': 'proxy', 'type': ['boolean', 'str'],
                        'desc': 'Configure proxy usage. See $lib.inet.http help for additional details.', 'default': True},
                       {'name': 'ssl_opts', 'type': 'dict',
                        'desc': 'Optional SSL/TLS options. See $lib.inet.http help for additional details.',

{synapse-2.219.0 → synapse-2.221.0}/synapse/lib/stormlib/aha.py

@@ -50,7 +50,7 @@ class AhaLib(s_stormtypes.Lib):
                               'desc': 'The AHA service information dictionary, or ``(null))``.', }}},
         {'name': 'list', 'desc': 'Enumerate all of the AHA services.',
          'type': {'type': 'function', '_funcname': '_methAhaList', 'args': (),
-                  'returns': {'name': 'Yields', 'type': 'list',
+                  'returns': {'name': 'yields', 'type': 'list',
                               'desc': 'The AHA service dictionaries.', }}},
         {'name': 'callPeerApi', 'desc': '''Call an API on all peers (leader and mirrors) of an AHA service and yield the responses from each.
 
@@ -91,7 +91,7 @@ class AhaLib(s_stormtypes.Lib):
                         '''},
                   ),
                   'returns': {'name': 'yields', 'type': 'list',
-                             'desc': 'Yields the results of the API calls as tuples of (svcname, (ok, info)).', }}},
+                              'desc': 'Yields the results of the API calls as tuples of (svcname, (ok, info)).', }}},
         {'name': 'callPeerGenr', 'desc': '''Call a generator API on all peers (leader and mirrors) of an AHA service and yield the responses from each.
 
         Examples:
@@ -124,7 +124,7 @@ class AhaLib(s_stormtypes.Lib):
                        '''},
                   ),
                   'returns': {'name': 'yields', 'type': 'list',
-                             'desc': 'Yields the results of the API calls as tuples containing (svcname, (ok, info)).', }}}
+                              'desc': 'Yields the results of the API calls as tuples containing (svcname, (ok, info)).', }}}
 
     )
     _storm_lib_path = ('aha',)