synapse 2.135.0__py38-none-any.whl → 2.136.0__py38-none-any.whl

synapse/cortex.py

@@ -82,6 +82,7 @@ import synapse.lib.stormlib.project as s_stormlib_project  # NOQA
 import synapse.lib.stormlib.version as s_stormlib_version  # NOQA
 import synapse.lib.stormlib.ethereum as s_stormlib_ethereum  # NOQA
 import synapse.lib.stormlib.modelext as s_stormlib_modelext  # NOQA
+import synapse.lib.stormlib.compression as s_stormlib_compression  # NOQA
 import synapse.lib.stormlib.notifications as s_stormlib_notifications  # NOQA
 
 logger = logging.getLogger(__name__)

synapse/lib/ast.py

@@ -1322,7 +1322,7 @@ class LiftTag(LiftOper):
 
     async def lift(self, runt, path):
 
-        tag = await tostr(await self.kids[0].compute(runt, path))
+        tag = await self.kids[0].compute(runt, path)
 
         if len(self.kids) == 3:
 
@@ -1403,7 +1403,7 @@ class LiftTagTag(LiftOper):
 
     async def lift(self, runt, path):
 
-        tagname = await tostr(await self.kids[0].compute(runt, path))
+        tagname = await self.kids[0].compute(runt, path)
 
         node = await runt.snap.getNodeByNdef(('syn:tag', tagname))
         if node is None:
@@ -1448,7 +1448,7 @@ class LiftFormTag(LiftOper):
         if not runt.model.form(form):
             raise self.kids[0].addExcInfo(s_exc.NoSuchForm.init(form))
 
-        tag = await tostr(await self.kids[1].compute(runt, path))
+        tag = await self.kids[1].compute(runt, path)
 
         if len(self.kids) == 4:
 
@@ -2507,7 +2507,18 @@ class HasTagPropCond(Cond):
     async def getCondEval(self, runt):
 
         async def cond(node, path):
-            tag, name = await self.kids[0].compute(runt, path)
+            tag = await self.kids[0].compute(runt, path)
+            name = await self.kids[1].compute(runt, path)
+
+            if tag == '*':
+                return any(name in props for props in node.tagprops.values())
+
+            if '*' in tag:
+                reobj = s_cache.getTagGlobRegx(tag)
+                for tagname, props in node.tagprops.items():
+                    if reobj.fullmatch(tagname) and name in props:
+                        return True
+
             return node.hasTagProp(tag, name)
 
         return cond
@@ -2707,11 +2718,12 @@ class TagPropCond(Cond):
 
     async def getCondEval(self, runt):
 
-        cmpr = await self.kids[1].compute(runt, None)
+        cmpr = await self.kids[2].compute(runt, None)
 
         async def cond(node, path):
 
-            tag, name = await self.kids[0].compute(runt, path)
+            tag = await self.kids[0].compute(runt, path)
+            name = await self.kids[1].compute(runt, path)
 
             prop = runt.model.getTagProp(name)
             if prop is None:
@@ -2719,7 +2731,7 @@ class TagPropCond(Cond):
                 raise self.kids[0].addExcInfo(s_exc.NoSuchTagProp(name=name, mesg=mesg))
 
             # TODO cache on (cmpr, valu) for perf?
-            valu = await self.kids[2].compute(runt, path)
+            valu = await self.kids[3].compute(runt, path)
 
             ctor = prop.type.getCmprCtor(cmpr)
             if ctor is None:
@@ -3086,16 +3098,71 @@ class TagName(Value):
         if self.isconst:
             return self.constval
 
+        if not isinstance(self.kids[0], Const):
+            valu = await self.kids[0].compute(runt, path)
+            valu = await s_stormtypes.toprim(valu)
+
+            if not isinstance(valu, str):
+                mesg = 'Invalid value type for tag name, tag names must be strings.'
+                raise s_exc.BadTypeValu(mesg=mesg)
+
+            normtupl = await runt.snap.getTagNorm(valu)
+            return normtupl[0]
+
         vals = []
         for kid in self.kids:
             part = await kid.compute(runt, path)
             if part is None:
                 mesg = f'Null value from var ${kid.name} is not allowed in tag names.'
                 raise kid.addExcInfo(s_exc.BadTypeValu(mesg=mesg))
-            vals.append(await tostr(part))
+
+            part = await tostr(part)
+            partnorm = await runt.snap.getTagNorm(part)
+            vals.append(partnorm[0])
 
         return '.'.join(vals)
 
+    async def computeTagArray(self, runt, path, excignore=()):
+
+        if self.isconst:
+            return (self.constval,)
+
+        if not isinstance(self.kids[0], Const):
+            tags = []
+            vals = await self.kids[0].compute(runt, path)
+            vals = await s_stormtypes.toprim(vals)
+
+            if not isinstance(vals, (tuple, list, set)):
+                vals = (vals,)
+
+            for valu in vals:
+                try:
+                    if not isinstance(valu, str):
+                        mesg = 'Invalid value type for tag name, tag names must be strings.'
+                        raise s_exc.BadTypeValu(mesg=mesg)
+
+                    normtupl = await runt.snap.getTagNorm(valu)
+                    if normtupl is None:
+                        continue
+
+                    tags.append(normtupl[0])
+                except excignore:
+                    pass
+            return tags
+
+        vals = []
+        for kid in self.kids:
+            part = await kid.compute(runt, path)
+            if part is None:
+                mesg = f'Null value from var ${kid.name} is not allowed in tag names.'
+                raise kid.addExcInfo(s_exc.BadTypeValu(mesg=mesg))
+
+            part = await tostr(part)
+            partnorm = await runt.snap.getTagNorm(part)
+            vals.append(partnorm[0])
+
+        return ('.'.join(vals),)
+
 class TagMatch(TagName):
     '''
     Like TagName, but can have asterisks
@@ -3105,6 +3172,32 @@ class TagMatch(TagName):
         # TODO support vars with asterisks?
         return any('*' in kid.valu for kid in self.kids if isinstance(kid, Const))
 
+    async def compute(self, runt, path):
+
+        if self.isconst:
+            return self.constval
+
+        if not isinstance(self.kids[0], Const):
+            valu = await self.kids[0].compute(runt, path)
+            valu = await s_stormtypes.toprim(valu)
+
+            if not isinstance(valu, str):
+                mesg = 'Invalid value type for tag name, tag names must be strings.'
+                raise s_exc.BadTypeValu(mesg=mesg)
+
+            return valu
+
+        vals = []
+        for kid in self.kids:
+            part = await kid.compute(runt, path)
+            if part is None:
+                mesg = f'Null value from var ${kid.name} is not allowed in tag names.'
+                raise s_exc.BadTypeValu(mesg=mesg)
+
+            vals.append(await tostr(part))
+
+        return '.'.join(vals)
+
 class Const(Value):
 
     def __init__(self, astinfo, valu, kids=()):
@@ -3756,27 +3849,15 @@ class EditTagAdd(Edit):
         async for node, path in genr:
 
             try:
-                names = await self.kids[oper_offset].compute(runt, path)
-                names = await s_stormtypes.toprim(names)
+                names = await self.kids[oper_offset].computeTagArray(runt, path, excignore=excignore)
             except excignore:
                 yield node, path
                 await asyncio.sleep(0)
                 continue
 
-            if not isinstance(names, tuple):
-                names = (names,)
-
             for name in names:
 
                 try:
-                    if name is None:
-                        raise self.addExcInfo(s_exc.BadTypeValu(mesg='Null tag names are not allowed.'))
-
-                    normtupl = await runt.snap.getTagNorm(name)
-                    if normtupl is None:
-                        continue
-
-                    name, info = normtupl
                     parts = name.split('.')
 
                     runt.layerConfirm(('node', 'tag', 'add', *parts))
@@ -3802,26 +3883,15 @@ class EditTagDel(Edit):
 
         async for node, path in genr:
 
-            names = await self.kids[0].compute(runt, path)
-            names = await s_stormtypes.toprim(names)
-
-            if not isinstance(names, tuple):
-                names = (names,)
+            names = await self.kids[0].computeTagArray(runt, path, excignore=(s_exc.BadTypeValu,))
 
             for name in names:
 
-                # special case for backward compatibility
-                if name:
-                    normtupl = await runt.snap.getTagNorm(name)
-                    if normtupl is None:
-                        continue
-
-                    name, info = normtupl
-                    parts = name.split('.')
+                parts = name.split('.')
 
-                    runt.layerConfirm(('node', 'tag', 'del', *parts))
+                runt.layerConfirm(('node', 'tag', 'del', *parts))
 
-                    await node.delTag(name)
+                await node.delTag(name)
 
             yield node, path
 
@@ -3847,11 +3917,6 @@ class EditTagPropSet(Edit):
             valu = await self.kids[2].compute(runt, path)
             valu = await s_stormtypes.tostor(valu)
 
-            normtupl = await runt.snap.getTagNorm(tag)
-            if normtupl is None:
-                continue
-
-            tag, info = normtupl
             tagparts = tag.split('.')
 
             # for now, use the tag add perms
@@ -3881,13 +3946,6 @@ class EditTagPropDel(Edit):
         async for node, path in genr:
 
             tag, prop = await self.kids[0].compute(runt, path)
-
-            normtupl = await runt.snap.getTagNorm(tag)
-            if normtupl is None:
-                continue
-
-            tag, info = normtupl
-
             tagparts = tag.split('.')
 
             # for now, use the tag add perms

synapse/lib/cell.py

@@ -884,6 +884,11 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
             'type': 'object',
             'hidecmdl': True,
         },
+        'https:parse:proxy:remoteip': {
+            'description': 'Enable the HTTPS server to parse X-Forwarded-For and X-Real-IP headers to determine requester IP addresses.',
+            'type': 'boolean',
+            'default': False,
+        },
         'backup:dir': {
             'description': 'A directory outside the service directory where backups will be saved. Defaults to ./backups in the service storage directory.',
             'type': 'string',
@@ -2584,7 +2589,10 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
 
             sslctx = self.initSslCtx(certpath, pkeypath)
 
-        serv = self.wapp.listen(port, address=addr, ssl_options=sslctx)
+        kwargs = {
+            'xheaders': self.conf.reqConfValu('https:parse:proxy:remoteip')
+        }
+        serv = self.wapp.listen(port, address=addr, ssl_options=sslctx, **kwargs)
         self.httpds.append(serv)
         return list(serv._sockets.values())[0].getsockname()
 

synapse/lib/layer.py

@@ -3250,6 +3250,15 @@ class Layer(s_nexus.Pusher):
             oldv, oldt = tp_dict.get(prop, (None, None))
             if oldv is not None:
 
+                if stortype == STOR_TYPE_IVAL:
+                    valu = (min(*oldv, *valu), max(*oldv, *valu))
+
+                elif stortype == STOR_TYPE_MINTIME:
+                    valu = min(valu, oldv)
+
+                elif stortype == STOR_TYPE_MAXTIME:
+                    valu = max(valu, oldv)
+
                 if valu == oldv and stortype == oldt:
                     return ()
 

synapse/lib/parser.py

@@ -56,6 +56,7 @@ terminalEnglishMap = {
     'EXPRNEG': '-',
     'EXPRPLUS': '+',
     'EXPRPOW': '**',
+    'EXPRTAGSEGNOVAR': 'non-variable tag segment',
     'EXPRTIMES': '*',
     'FOR': 'for',
     'FORMATSTRING': 'backtick-quoted format string',
@@ -84,8 +85,8 @@ terminalEnglishMap = {
     'SETTAGOPER': '?',
     'SINGLEQUOTEDSTRING': 'single-quoted string',
     'SWITCH': 'switch',
+    'TAGSEGNOVAR': 'non-variable tag segment',
     'TRY': 'try',
-    'TAGMATCH': 'tag name potentially with asterisks',
     'TRIPLEQUOTEDSTRING': 'triple-quoted string',
     'TRYSET': '?=',
     'TRYSETPLUS': '?+=',
@@ -98,6 +99,7 @@ terminalEnglishMap = {
     'WHILE': 'while',
     'WHITETOKN': 'An unquoted string terminated by whitespace',
     'WILDCARD': '*',
+    'WILDTAGSEGNOVAR': 'tag segment potentially with asterisks',
     'YIELD': 'yield',
     '_ARRAYCONDSTART': '*[',
     '_COLONDOLLAR': ':$',
@@ -111,21 +113,21 @@ terminalEnglishMap = {
     '_EDGEN2FINI': ')-',
     '_ELSE': 'else',
     '_EMBEDQUERYSTART': '${',
+    '_EXPRCOLONNOSPACE': ':',
     '_EMIT': 'emit',
     '_FINI': 'fini',
     '_HASH': '#',
-    '_EXPRHASH': '#',
     '_HASHSPACE': '#',
-    '_EXPRHASHSPACE': '#',
     '_INIT': 'init',
     '_LEFTJOIN': '<+-',
     '_LEFTPIVOT': '<-',
     '_LPARNOSPACE': '(',
+    '_MATCHHASH': '#',
+    '_MATCHHASHSPACE': '#',
     '_RETURN': 'return',
     '_RIGHTJOIN': '-+>',
     '_RIGHTPIVOT': '->',
     '_STOP': 'stop',
-    '_TAGSEGNOVAR': 'tag segment potentially with asterisks',
     '_WALKNPIVON1': '-->',
     '_WALKNPIVON2': '<--',
     '$END': 'end of input',
@@ -404,25 +406,6 @@ class AstConverter(lark.Transformer):
 
         return argv
 
-    @classmethod
-    def _tagsplit(cls, astinfo, tag):
-
-        if '$' not in tag:
-            return [s_ast.Const(astinfo, tag)]
-
-        kids = []
-        segs = tag.split('.')
-
-        for seg in segs:
-
-            if seg[0] == '$':
-                kids.append(s_ast.VarValue(astinfo, kids=[s_ast.Const(astinfo, seg[1:])]))
-                continue
-
-            kids.append(s_ast.Const(astinfo, seg))
-
-        return kids
-
     @lark.v_args(meta=True)
     def varderef(self, meta, kids):
         assert kids and len(kids) in (3, 4)
@@ -435,22 +418,6 @@ class AstConverter(lark.Transformer):
             newkid = self._convert_child(kids[2])
         return s_ast.VarDeref(astinfo, kids=(kids[0], newkid))
 
-    @lark.v_args(meta=True)
-    def tagname(self, meta, kids):
-        assert kids and len(kids) == 1
-        astinfo = self.metaToAstInfo(meta)
-        kid = kids[0]
-        if not isinstance(kid, lark.lexer.Token):
-            return self._convert_child(kid)
-
-        valu = kid.value
-        if '*' in valu:
-            mesg = f"Invalid wildcard usage in tag {valu}"
-            self.raiseBadSyntax(mesg, astinfo)
-
-        kids = self._tagsplit(astinfo, valu)
-        return s_ast.TagName(astinfo, kids=kids)
-
     @lark.v_args(meta=True)
     def switchcase(self, meta, kids):
 
@@ -639,7 +606,6 @@ terminalClassMap = {
     'HEXNUMBER': lambda astinfo, x: s_ast.Const(astinfo, s_ast.parseNumber(x)),
     'BOOL': lambda astinfo, x: s_ast.Bool(astinfo, x == 'true'),
     'SINGLEQUOTEDSTRING': lambda astinfo, x: s_ast.Const(astinfo, x[1:-1]),  # drop quotes
-    'TAGMATCH': lambda astinfo, x: s_ast.TagMatch(astinfo, kids=AstConverter._tagsplit(astinfo, x)),
     'NONQUOTEWORD': massage_vartokn,
     'VARTOKN': massage_vartokn,
     'EXPRVARTOKN': massage_vartokn,
@@ -734,6 +700,8 @@ ruleClassMap = {
     'stormcmd': lambda astinfo, kids: s_ast.CmdOper(astinfo, kids=kids if len(kids) == 2 else (kids[0], s_ast.Const(astinfo, tuple()))),
     'stormfunc': s_ast.Function,
     'tagcond': s_ast.TagCond,
+    'tagname': s_ast.TagName,
+    'tagmatch': s_ast.TagMatch,
     'tagprop': s_ast.TagProp,
     'tagvalu': s_ast.TagValue,
     'tagpropvalu': s_ast.TagPropValue,

synapse/lib/storm.lark

@@ -123,10 +123,10 @@ opervarlist: varlist "=" _valu
 
 // Pivots
 _formpivot: formpivot_pivottotags | formpivot_jointags | formpivot_pivotout | formpivot_
-formpivot_pivottotags: _RIGHTPIVOT (ALLTAGS | _tagmatch | _tagmatchwithspace)
-formpivot_jointags: _RIGHTJOIN (ALLTAGS | _tagmatch | _tagmatchwithspace)
+formpivot_pivottotags: _RIGHTPIVOT (ALLTAGS | tagmatch)
+formpivot_jointags: _RIGHTJOIN (ALLTAGS | tagmatch)
 // The special symbol that indicates to pivot to syn:tag nodes
-ALLTAGS.2: /#(?=\/[\/\*]|\s|$|\})/
+ALLTAGS.3: /#(?=\/[\/\*]|\s|$|\})/
 
 formpivot_pivotout:    _RIGHTPIVOT "*"
 formpivot_:            _RIGHTPIVOT ABSPROP
@@ -194,8 +194,6 @@ lifttagtag:(_HASH | _HASHSPACE) tagname [_cmpr _valu]
 liftbytag: (tagname | tagnamewithspace) [_cmpr _valu]
 liftbytagprop: (tagprop | tagpropwithspace) [_cmpr _valu]
 liftbyformtagprop: formtagprop [_cmpr _valu]
-tagname: _tagmatch
-tagnamewithspace: _tagmatchwithspace -> tagname
 tagprop: tagname _COLONNOSPACE (BASEPROP | _varvalu)
 tagpropwithspace: tagnamewithspace _COLONNOSPACE (BASEPROP | _varvalu) -> tagprop
 formtagprop: ((PROPS | UNIVNAME) | _DEREF _varvalu) tagname _COLONNOSPACE (BASEPROP | _varvalu)
@@ -228,16 +226,20 @@ EQNOSPACE: /(?<!\s)=(?!\s)/
 cmdrargs: _cmdrargv (EQNOSPACE? _cmdrargv)*
 _cmdrargv: baresubquery | DOUBLEQUOTEDSTRING | SINGLEQUOTEDSTRING | CMDRTOKN | CMDOPT (EQNOSPACE (CMDRTOKN | SINGLEQUOTEDSTRING | DOUBLEQUOTEDSTRING | baresubquery))?
 
-// A tag with either a variable reference or a tag name potentially with asterisks
-_tagmatch: _HASH (_varvalu | TAGMATCH)
+// A tag with either a variable reference or tag name segments without asterisks
+tagname: _HASH (_varvalu | _tagsegs)
+tagnamewithspace: _HASHSPACE (_varvalu | _tagsegs) -> tagname
 _HASH.2: /(?<!\s)#/
-
-_tagmatchwithspace: _HASHSPACE (_varvalu | TAGMATCH)
 _HASHSPACE.2: /(?<=\s)#/
+_tagsegs:  TAGSEGNOVAR ( "." (TAGSEGNOVAR | "$" varvalue))*
+TAGSEGNOVAR: /[\w]+/
 
 // A tag name with asterisks or $var as segment after the first segment
-TAGMATCH:  _TAGSEGNOVAR ( "." (_TAGSEGNOVAR | "$" VARTOKN))*
-_TAGSEGNOVAR: /[\w*]+/
+tagmatch: (_MATCHHASH | _MATCHHASHSPACE) (_varvalu | _wildtagsegs)
+_MATCHHASH.3: /(?<!\s)#/
+_MATCHHASHSPACE.3: /(?<=\s)#/
+_wildtagsegs:  WILDTAGSEGNOVAR ( "." (WILDTAGSEGNOVAR | "$" varvalue))*
+WILDTAGSEGNOVAR: /[\w*]+/
 
 // A comparison operator
 _cmpr: "*" BYNAME | CMPR | CMPROTHER | EQSPACE | EQNOSPACE | TRYSET | SETTAGOPER
@@ -260,9 +262,8 @@ _basevalu: _argvalu | baresubquery
 _valu: _basevalu | NONQUOTEWORD
 
 evalvalu: _valu
-exprdict: "{" ((_exprvalu | VARTOKN)  ":" (_exprvalu | VARTOKN) ("," (_exprvalu | VARTOKN) ":" (_exprvalu | VARTOKN))* ","? )? "}"
+exprdict: "{" ((_exprvalu | VARTOKN)  (":" | _EXPRCOLONNOSPACE) (_exprvalu | VARTOKN) ("," (_exprvalu | VARTOKN) (":" | _EXPRCOLONNOSPACE) (_exprvalu | VARTOKN))* ","? )? "}"
 exprlist: "[" ((_exprvalu | VARTOKN) ("," (_exprvalu | VARTOKN))* ","? )? "]"
-
 // Just like _valu, but doesn't allow valu lists or unquoted strings or queries
 _exprvalu: NUMBER | HEXNUMBER | BOOL | exprlist | exprdict | _exprvarvalu | exprrelpropvalu
     | exprunivpropvalu | exprtagvalu | exprtagpropvalu | TRIPLEQUOTEDSTRING | DOUBLEQUOTEDSTRING
@@ -286,18 +287,17 @@ EXPRUNIVNAME.2: /(?<=^|[\s\|\{\(\[+=-])\.[a-z_][a-z0-9_]*([:.][a-z0-9_]+)*/
 
 exprtagvalu: exprtagname -> tagvalu
     | exprtagnamewithspace -> tagvalu
-exprtagname: _exprtagmatch -> tagname
-_exprtagmatch: _EXPRHASH (_varvalu | TAGMATCH)
-_EXPRHASH.2: /(?<!\s)#/
 
-exprtagnamewithspace: _exprtagmatchwithspace -> tagname
-_exprtagmatchwithspace: _EXPRHASHSPACE (_varvalu | TAGMATCH)
-_EXPRHASHSPACE.2: /(?<=\s)#/
+exprtagname: _HASH (_exprvarvalu | _exprtagsegs) -> tagname
+exprtagnamewithspace: _HASHSPACE (_exprvarvalu | _exprtagsegs) -> tagname
+_exprtagsegs:  EXPRTAGSEGNOVAR ( "." (EXPRTAGSEGNOVAR | "$" exprvarvalue))*
+EXPRTAGSEGNOVAR: /[\w]+/
 
 exprtagpropvalu: exprtagprop -> tagpropvalu
     | exprtagpropwithspace -> tagpropvalu
-exprtagprop: exprtagname _COLONNOSPACE (BASEPROP | _exprvarvalu) -> tagprop
-exprtagpropwithspace: exprtagnamewithspace _COLONNOSPACE (BASEPROP | _exprvarvalu) -> tagprop
+exprtagprop: exprtagname _EXPRCOLONNOSPACE (BASEPROP | _exprvarvalu) -> tagprop
+exprtagpropwithspace: exprtagnamewithspace _EXPRCOLONNOSPACE (BASEPROP | _exprvarvalu) -> tagprop
+_EXPRCOLONNOSPACE.2: /(?<!\s):/
 
 _exprvarvalu: "$" _exprvarvaluatom
 _exprvarvaluatom: exprvarvalue | exprvarderef | exprfunccall
@@ -372,11 +372,11 @@ relpropvalue:   relprop | univprop
 abspropcond:  ABSPROPNOUNIV _cmpr _valu
 hasabspropcond: ABSPROPNOUNIV
 
-tagpropcond:  (tagprop | tagpropwithspace) _cmpr _valu
-hastagpropcond: (tagprop | tagpropwithspace)
+tagpropcond: tagmatch _COLONNOSPACE (BASEPROP | _varvalu)  _cmpr _valu
+hastagpropcond: tagmatch _COLONNOSPACE (BASEPROP | _varvalu)
 
-tagvalucond:  (_tagmatch | _tagmatchwithspace) _cmpr _valu
-tagcond: (_tagmatch | _tagmatchwithspace)
+tagvalucond: tagmatch _cmpr _valu
+tagcond: tagmatch
 
 condsubq: "{" query "}" [ _cmpr _valu]
 arraycond: relprop _ARRAYCONDSTART _safe_cmpr _valu "]"

synapse/lib/storm_format.py

@@ -39,6 +39,7 @@ TerminalPygMap = {
     'EXPRNEG': p_t.Operator,
     'EXPRPLUS': p_t.Operator,
     'EXPRPOW': p_t.Operator,
+    'EXPRTAGSEGNOVAR': p_t.Name,
     'EXPRTIMES': p_t.Operator,
     'FOR': p_t.Keyword,
     'FORMATSTRING': p_t.Literal.String,
@@ -67,7 +68,7 @@ TerminalPygMap = {
     'SETTAGOPER': p_t.Operator,
     'SINGLEQUOTEDSTRING': p_t.Literal.String,
     'SWITCH': p_t.Keyword,
-    'TAGMATCH': p_t.Name,
+    'TAGSEGNOVAR': p_t.Name,
     'TRIPLEQUOTEDSTRING': p_t.Literal.String,
     'TRYSET': p_t.Operator,
     'TRYSETMINUS': p_t.Operator,
@@ -80,6 +81,7 @@ TerminalPygMap = {
     'WHILE': p_t.Keyword,
     'WHITETOKN': p_t.Literal.String,
     'WILDCARD': p_t.Name,
+    'WILDTAGSEGNOVAR': p_t.Name,
     'YIELD': p_t.Keyword,
     '_ARRAYCONDSTART': p_t.Punctuation,
     '_COLONDOLLAR': p_t.Punctuation,
@@ -94,20 +96,20 @@ TerminalPygMap = {
     '_ELSE': p_t.Keyword,
     '_EMBEDQUERYSTART': p_t.Punctuation,
     '_EMIT': p_t.Keyword,
+    '_EXPRCOLONNOSPACE': p_t.Punctuation,
     '_FINI': p_t.Keyword,
     '_HASH': p_t.Punctuation,
-    '_EXPRHASH': p_t.Punctuation,
     '_HASHSPACE': p_t.Punctuation,
-    '_EXPRHASHSPACE': p_t.Punctuation,
     '_INIT': p_t.Keyword,
     '_LEFTJOIN': p_t.Punctuation,
     '_LEFTPIVOT': p_t.Punctuation,
     '_LPARNOSPACE': p_t.Punctuation,
+    '_MATCHHASH': p_t.Punctuation,
+    '_MATCHHASHSPACE': p_t.Punctuation,
     '_RETURN': p_t.Keyword,
     '_RIGHTJOIN': p_t.Punctuation,
     '_RIGHTPIVOT': p_t.Punctuation,
     '_STOP': p_t.Keyword,
-    '_TAGSEGNOVAR': p_t.Name,
     '_WALKNPIVON1': p_t.Punctuation,
     '_WALKNPIVON2': p_t.Punctuation,
     '$END': p_t.Punctuation,