synapse 2.135.0__py37-none-any.whl → 2.136.0__py37-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of synapse might be problematic. Click here for more details.
- synapse/cortex.py +1 -0
- synapse/lib/ast.py +106 -48
- synapse/lib/cell.py +9 -1
- synapse/lib/layer.py +9 -0
- synapse/lib/parser.py +8 -40
- synapse/lib/storm.lark +25 -25
- synapse/lib/storm_format.py +6 -4
- synapse/lib/stormlib/compression.py +176 -0
- synapse/lib/stormlib/graph.py +2 -0
- synapse/lib/stormtypes.py +14 -12
- synapse/lib/types.py +4 -1
- synapse/lib/version.py +2 -2
- synapse/tests/test_cortex.py +38 -4
- synapse/tests/test_lib_grammar.py +64 -64
- synapse/tests/test_lib_httpapi.py +53 -1
- synapse/tests/test_lib_layer.py +20 -0
- synapse/tests/test_lib_rstorm.py +1 -1
- synapse/tests/test_lib_storm.py +5 -5
- synapse/tests/test_lib_stormlib_compression.py +61 -0
- synapse/tests/test_lib_stormlib_model.py +1 -1
- synapse/tests/test_lib_stormtypes.py +3 -3
- synapse/tests/test_lib_trigger.py +1 -1
- synapse/tests/test_lib_types.py +4 -2
- {synapse-2.135.0.dist-info → synapse-2.136.0.dist-info}/METADATA +4 -5
- {synapse-2.135.0.dist-info → synapse-2.136.0.dist-info}/RECORD +28 -26
- {synapse-2.135.0.dist-info → synapse-2.136.0.dist-info}/LICENSE +0 -0
- {synapse-2.135.0.dist-info → synapse-2.136.0.dist-info}/WHEEL +0 -0
- {synapse-2.135.0.dist-info → synapse-2.136.0.dist-info}/top_level.txt +0 -0
|
@@ -673,10 +673,10 @@ _ParseResults = [
|
|
|
673
673
|
'Query: [SetVarOper: [Const: foo, DollarExpr: [ExprNode: [Const: 5, Const: -, UnaryExprNode: [Const: -, UnaryExprNode: [Const: -, VarValue: [Const: foo]]]]]]]',
|
|
674
674
|
'Query: [SetVarOper: [Const: foo, DollarExpr: [ExprNode: [Const: 5, Const: +, UnaryExprNode: [Const: -, VarValue: [Const: foo]]]]]]',
|
|
675
675
|
'Query: [SetVarOper: [Const: foo, DollarExpr: [ExprNode: [Const: 5, Const: +, UnaryExprNode: [Const: -, UnaryExprNode: [Const: -, VarValue: [Const: foo]]]]]]]',
|
|
676
|
-
'Query: [SetVarOper: [Const: foo, DollarExpr: [TagPropValue: [TagProp: [VarValue: [Const: tag], VarValue: [Const: tagprop]]]]]]',
|
|
677
|
-
'Query: [LiftTagProp: [TagProp: [VarValue: [Const: tag], VarValue: [Const: tagprop]]]]',
|
|
678
|
-
'Query: [LiftTagProp: [TagProp: [VarValue: [Const: tag], VarValue: [Const: tagprop]], Const: =, VarValue: [Const: valu]]]',
|
|
679
|
-
'Query: [EditTagPropSet: [TagProp: [VarValue: [Const: tag], VarValue: [Const: tagprop]], Const: =, VarValue: [Const: valu]]]',
|
|
676
|
+
'Query: [SetVarOper: [Const: foo, DollarExpr: [TagPropValue: [TagProp: [TagName: [VarValue: [Const: tag]], VarValue: [Const: tagprop]]]]]]',
|
|
677
|
+
'Query: [LiftTagProp: [TagProp: [TagName: [VarValue: [Const: tag]], VarValue: [Const: tagprop]]]]',
|
|
678
|
+
'Query: [LiftTagProp: [TagProp: [TagName: [VarValue: [Const: tag]], VarValue: [Const: tagprop]], Const: =, VarValue: [Const: valu]]]',
|
|
679
|
+
'Query: [EditTagPropSet: [TagProp: [TagName: [VarValue: [Const: tag]], VarValue: [Const: tagprop]], Const: =, VarValue: [Const: valu]]]',
|
|
680
680
|
'Query: [VarEvalOper: [FuncCall: [VarDeref: [VarValue: [Const: lib], Const: print], CallArgs: [FormatString: [Const: ip=, FuncCall: [VarDeref: [VarValue: [Const: node], Const: repr], CallArgs: [], CallKwargs: []], Const: asn=, RelPropValue: [Const: asn], Const: .seen=, UnivPropValue: [Const: .seen], Const: foo=, TagValue: [TagName: [Const: foo]], Const: , ExprNode: [RelPropValue: [Const: asn], Const: =, Const: 5]]], CallKwargs: []]]]',
|
|
681
681
|
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 45.79.131.138], FormPivot: [AbsProp: inet:flow], isjoin=False, FiltOper: [Const: -, OrCond: [RelPropCond: [RelPropValue: [RelProp: [Const: dst:port]], Const: =, Const: 444], RelPropCond: [RelPropValue: [RelProp: [Const: dst:port]], Const: =, Const: 80]]]]',
|
|
682
682
|
'Query: [LiftPropBy: [Const: media:news, Const: =, Const: 0c7f7267d3b62432cb0d7d0e9d3108a4], N1Walk: [Const: refs, Const: inet:ipv4]]',
|
|
@@ -694,7 +694,7 @@ _ParseResults = [
|
|
|
694
694
|
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], EditPropSet: [UnivProp: [Const: .test:univ], Const: =, Const: 0], Return: [DollarExpr: [ExprNode: [UnivPropValue: [Const: .test:univ], Const: <, ExprNode: [DollarExpr: [Const: 4], Const: -, DollarExpr: [Const: 1]]]]]]',
|
|
695
695
|
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], EditTagPropSet: [TagProp: [TagName: [Const: foo], Const: score], Const: =, Const: 1], Return: [DollarExpr: [ExprNode: [TagPropValue: [TagProp: [TagName: [Const: foo], Const: score]], Const: <, ExprNode: [DollarExpr: [Const: 4], Const: -, DollarExpr: [Const: 1]]]]]]',
|
|
696
696
|
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], EditTagAdd: [TagName: [Const: foo], Const: =, DollarExpr: [Const: 0]], Return: [DollarExpr: [ExprNode: [TagValue: [TagName: [Const: foo]], Const: <, ExprNode: [DollarExpr: [Const: 4], Const: -, DollarExpr: [Const: 1]]]]]]',
|
|
697
|
-
'Query: [SetVarOper: [Const: p, Const: bar], EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], EditTagAdd: [TagName: [Const: foo
|
|
697
|
+
'Query: [SetVarOper: [Const: p, Const: bar], EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], EditTagAdd: [TagName: [Const: foo, Const: bar], Const: =, DollarExpr: [Const: 0]], Return: [DollarExpr: [ExprNode: [TagValue: [TagName: [Const: foo, VarValue: [Const: p]]], Const: <, ExprNode: [DollarExpr: [Const: 4], Const: -, DollarExpr: [Const: 1]]]]]]',
|
|
698
698
|
'Query: [EditNodeAdd: [FormName: [Const: inet:asn], Const: =, Const: 1], EditNodeAdd: [FormName: [Const: inet:asn], Const: =, Const: 2], EditEdgeAdd: [Const: foo), SubQuery: [Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4]]]]]',
|
|
699
699
|
'Query: [LiftPropBy: [Const: inet:asn, Const: <, DollarExpr: [Const: 2]]]',
|
|
700
700
|
'Query: [LiftProp: [Const: inet:asn], N2Walk: [Const: foo), Const: *]]',
|
|
@@ -737,40 +737,40 @@ _ParseResults = [
|
|
|
737
737
|
'Query: [LiftTag: [TagName: [Const: tag, VarValue: [Const: bar]]]]',
|
|
738
738
|
'Query: [FiltOper: [Const: +, TagCond: [TagMatch: [Const: tag, VarValue: [Const: bar]]]]]',
|
|
739
739
|
'Query: [FiltOper: [Const: +, TagCond: [TagMatch: [Const: tag, VarValue: [Const: bar], Const: *]]]]',
|
|
740
|
-
'Query: [LiftTag: [TagName: [Const: tag, VarValue: [Const:
|
|
741
|
-
'Query: [FiltOper: [Const: +, TagCond: [TagMatch: [Const: tag, VarValue: [Const:
|
|
742
|
-
'Query: [EditTagAdd: [TagName: [Const: tag, VarValue: [Const:
|
|
740
|
+
'Query: [LiftTag: [TagName: [Const: tag, VarValue: [Const: escaped "string"]]]]',
|
|
741
|
+
'Query: [FiltOper: [Const: +, TagCond: [TagMatch: [Const: tag, VarValue: [Const: escaped "string"], Const: *]]]]',
|
|
742
|
+
'Query: [EditTagAdd: [TagName: [Const: tag, VarValue: [Const: escaped "string"]]]]',
|
|
743
743
|
'Query: [LiftProp: [Const: test:str], SetVarOper: [Const: some\x08var, FuncCall: [VarDeref: [VarValue: [Const: node], Const: repr], CallArgs: [], CallKwargs: []]]]',
|
|
744
744
|
'Query: [SetVarOper: [Const: x, Const: 0], WhileLoop: [DollarExpr: [ExprNode: [VarValue: [Const: x], Const: <, Const: 10]], SubQuery: [Query: [SetVarOper: [Const: x, DollarExpr: [ExprNode: [VarValue: [Const: x], Const: +, Const: 1]]], EditNodeAdd: [FormName: [Const: test:int], Const: =, VarValue: [Const: x]]]]]]',
|
|
745
745
|
'Query: [EditNodeAdd: [FormName: [Const: test:int], Const: ?=, Const: 4], EditNodeAdd: [FormName: [Const: test:int], Const: ?=, Const: nonono]]',
|
|
746
|
-
'Query: [EditNodeAdd: [FormName: [Const: test:int], Const: =, Const: 4], EditTagAdd: [Const: ?, TagName: [Const: hehe
|
|
746
|
+
'Query: [EditNodeAdd: [FormName: [Const: test:int], Const: =, Const: 4], EditTagAdd: [Const: ?, TagName: [Const: hehe, Const: haha]], EditTagAdd: [Const: ?, TagName: [Const: hehe, Const: newp], Const: =, Const: newp], EditTagAdd: [TagName: [Const: hehe, Const: yes], Const: =, Const: 2020]]',
|
|
747
747
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditPropSet: [RelProp: [Const: tick], Const: ?=, Const: 2019]]',
|
|
748
748
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: a], SwitchCase: [FuncCall: [VarDeref: [VarValue: [Const: node], Const: form], CallArgs: [], CallKwargs: []], CaseEntry: [Const: hehe, SubQuery: [Query: [EditTagAdd: [TagName: [Const: baz]]]]]]]',
|
|
749
749
|
'Query: [EditNodeAdd: [FormName: [Const: test:type10], Const: =, Const: 2], EditPropSet: [RelProp: [Const: strprop], Const: =, Const: 1], CmdOper: [Const: spin, Const: ()], LiftProp: [Const: test:type10], FiltOper: [Const: +, DollarExpr: [RelPropValue: [Const: strprop]]], SetVarOper: [Const: foo, Const: 1], FiltOper: [Const: +, VarValue: [Const: foo]]]',
|
|
750
|
-
'Query: [LiftFormTag: [Const: inet:fqdn, TagName: [Const: xxx
|
|
750
|
+
'Query: [LiftFormTag: [Const: inet:fqdn, TagName: [Const: xxx, Const: xxxxxx, Const: xxxx, Const: xx]], ForLoop: [Const: tag, FuncCall: [VarDeref: [VarValue: [Const: node], Const: tags], CallArgs: [Const: xxx.xxxxxx.*.xx], CallKwargs: []], SubQuery: [Query: [PivotInFrom: [AbsProp: edge:refs], isjoin=False, FiltOper: [Const: +, TagCond: [TagMatch: [Const: xx]]], PivotInFrom: [AbsProp: graph:cluster], isjoin=False, EditTagAdd: [TagName: [Const: foo]], FormPivot: [AbsProp: edge:refs], isjoin=False]]]]',
|
|
751
751
|
'Query: [FiltOper: [Const: +, AbsPropCond: [AbsProp: syn:tag, Const: ~=, Const: aka.*.mal.*]]]',
|
|
752
752
|
'Query: [FiltOper: [Const: +, OrCond: [OrCond: [AbsPropCond: [AbsProp: syn:tag, Const: ^=, Const: aka], AbsPropCond: [AbsProp: syn:tag, Const: ^=, Const: cno]], AbsPropCond: [AbsProp: syn:tag, Const: ^=, Const: rep]]]]',
|
|
753
753
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditNodeAdd: [FormName: [Const: test:int], Const: =, Const: 42]]',
|
|
754
754
|
'Query: [CmdOper: [Const: help, Const: ()]]',
|
|
755
755
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: abcd], EditPropSet: [RelProp: [Const: tick], Const: =, Const: 2015], EditTagAdd: [TagName: [Const: cool]]]',
|
|
756
756
|
'Query: [SubQuery: [Query: [LiftTag: [TagName: [Const: baz]]]], LiftPropBy: [Const: test:str, Const: =, Const: foo]]',
|
|
757
|
-
'Query: [LiftTagTag: [TagName: [Const: baz
|
|
758
|
-
'Query: [LiftTag: [VarValue: [Const: tag]], EditTagDel: [VarValue: [Const: tag]]]',
|
|
759
|
-
'Query: [LiftTag: [VarValue: [Const: tag]]]',
|
|
757
|
+
'Query: [LiftTagTag: [TagName: [Const: baz, Const: faz]]]',
|
|
758
|
+
'Query: [LiftTag: [TagName: [VarValue: [Const: tag]]], EditTagDel: [TagName: [VarValue: [Const: tag]]]]',
|
|
759
|
+
'Query: [LiftTag: [TagName: [VarValue: [Const: tag]]]]',
|
|
760
760
|
'Query: [LiftTag: [TagName: [Const: foo]]]',
|
|
761
761
|
'Query: [LiftTag: [TagName: [Const: foo]]]',
|
|
762
762
|
'Query: [LiftTag: [TagName: [Const: foo]]]',
|
|
763
|
-
'Query: [LiftTag: [TagName: [Const: hehe
|
|
763
|
+
'Query: [LiftTag: [TagName: [Const: hehe, Const: haha]]]',
|
|
764
764
|
'Query: [VarEvalOper: [VarDeref: [VarValue: [Const: hehe], Const: haha]]]',
|
|
765
|
-
'Query: [LiftTag: [TagName: [Const: test
|
|
766
|
-
'Query: [LiftTag: [TagName: [Const: test
|
|
767
|
-
'Query: [LiftTag: [TagName: [Const: test
|
|
768
|
-
'Query: [LiftTag: [TagName: [Const: test
|
|
765
|
+
'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: +, HasAbsPropCond: [AbsProp: test:pivcomp]], PivotOut: [], isjoin=True]',
|
|
766
|
+
'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: +, HasAbsPropCond: [AbsProp: test:pivcomp]], PivotOut: [], isjoin=False]',
|
|
767
|
+
'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: +, HasAbsPropCond: [AbsProp: test:str]], PivotIn: [], isjoin=True]',
|
|
768
|
+
'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: +, HasAbsPropCond: [AbsProp: test:str]], PivotIn: [], isjoin=False]',
|
|
769
769
|
'Query: [LiftProp: [Const: test:migr], PivotInFrom: [AbsProp: edge:refs], isjoin=False]',
|
|
770
|
-
'Query: [LiftTag: [TagName: [Const: test
|
|
771
|
-
'Query: [LiftTag: [TagName: [Const: test
|
|
772
|
-
'Query: [LiftTag: [TagName: [Const: test
|
|
773
|
-
'Query: [LiftTag: [TagName: [Const: test
|
|
770
|
+
'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: -, TagCond: [TagMatch: [Const: test]]], PivotOut: [], isjoin=True]',
|
|
771
|
+
'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: -, TagCond: [TagMatch: [Const: test]]], PivotOut: [], isjoin=False]',
|
|
772
|
+
'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: -, TagCond: [TagMatch: [Const: test]]], PivotIn: [], isjoin=True]',
|
|
773
|
+
'Query: [LiftTag: [TagName: [Const: test, Const: bar]], FiltOper: [Const: -, TagCond: [TagMatch: [Const: test]]], PivotIn: [], isjoin=False]',
|
|
774
774
|
'Query: [SetVarOper: [Const: bar, Const: 5.5.5.5], EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, VarValue: [Const: bar]]]',
|
|
775
775
|
'Query: [SetVarOper: [Const: blah, FuncCall: [VarDeref: [VarValue: [Const: lib], Const: dict], CallArgs: [], CallKwargs: [CallKwarg: [Const: foo, Const: vertex.link]]]], EditNodeAdd: [FormName: [Const: inet:fqdn], Const: =, VarDeref: [VarValue: [Const: blah], Const: foo]]]',
|
|
776
776
|
"Query: [VarListSetOper: [VarList: ['tick', 'tock'], UnivPropValue: [UnivProp: [Const: .seen]]]]",
|
|
@@ -808,9 +808,9 @@ _ParseResults = [
|
|
|
808
808
|
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4]]',
|
|
809
809
|
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 192.168.1.0/24]]',
|
|
810
810
|
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 4.3.2.1], EditPropSet: [RelProp: [Const: loc], Const: =, Const: zz], EditNodeAdd: [FormName: [Const: inet:dns:a], Const: =, List: [Const: example.com, Const: 4.3.2.1]]]',
|
|
811
|
-
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 197.231.221.211], EditPropSet: [RelProp: [Const: asn], Const: =, Const: 37560], EditPropSet: [RelProp: [Const: loc], Const: =, Const: lr.lo.voinjama], EditPropSet: [RelProp: [Const: latlong], Const: =, Const: 8.4219,-9.7478], EditPropSet: [RelProp: [Const: dns:rev], Const: =, Const: exit1.ipredator.se], EditTagAdd: [TagName: [Const: cno
|
|
811
|
+
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 197.231.221.211], EditPropSet: [RelProp: [Const: asn], Const: =, Const: 37560], EditPropSet: [RelProp: [Const: loc], Const: =, Const: lr.lo.voinjama], EditPropSet: [RelProp: [Const: latlong], Const: =, Const: 8.4219,-9.7478], EditPropSet: [RelProp: [Const: dns:rev], Const: =, Const: exit1.ipredator.se], EditTagAdd: [TagName: [Const: cno, Const: anon, Const: tor, Const: exit], Const: =, List: [Const: 2017/12/19, Const: 2019/02/15]]]',
|
|
812
812
|
'Query: [EditNodeAdd: [FormName: [Const: inet:user], Const: =, Const: visi], EditNodeAdd: [FormName: [Const: inet:user], Const: =, Const: whippit]]',
|
|
813
|
-
'Query: [EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 10, Const: haha]], EditTagAdd: [TagName: [Const: foo
|
|
813
|
+
'Query: [EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 10, Const: haha]], EditTagAdd: [TagName: [Const: foo, Const: bar]], EditTagDel: [TagName: [Const: foo, Const: bar]]]',
|
|
814
814
|
'Query: [EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 127, Const: newp]], EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 127, Const: 127]]]',
|
|
815
815
|
'Query: [EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 123, Const: test]], EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 123, Const: duck]], EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 123, Const: mode]]]',
|
|
816
816
|
'Query: [EditNodeAdd: [FormName: [Const: test:guid], Const: =, Const: *], EditPropSet: [RelProp: [Const: tick], Const: =, Const: 2015]]',
|
|
@@ -822,8 +822,8 @@ _ParseResults = [
|
|
|
822
822
|
'Query: [EditNodeAdd: [FormName: [Const: test:pivcomp], Const: =, List: [Const: xxx, Const: yyy]], EditPropSet: [RelProp: [Const: width], Const: =, Const: 42]]',
|
|
823
823
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo bar], EditPropSet: [RelProp: [Const: tick], Const: =, Const: 2018]]',
|
|
824
824
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: bar], EditTagAdd: [TagName: [Const: baz]]]',
|
|
825
|
-
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditTagAdd: [VarValue: [Const: tag]]]',
|
|
826
|
-
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: foo], FiltOper: [Const: +, TagCond: [VarValue: [Const: tag]]]]',
|
|
825
|
+
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditTagAdd: [TagName: [VarValue: [Const: tag]]]]',
|
|
826
|
+
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: foo], FiltOper: [Const: +, TagCond: [TagMatch: [VarValue: [Const: tag]]]]]',
|
|
827
827
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditTagAdd: [TagName: [Const: bar]], FiltOper: [Const: +, OrCond: [TagCond: [TagMatch: [Const: baz]], NotCond: [HasRelPropCond: [UnivProp: [Const: .seen]]]]]]',
|
|
828
828
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditTagAdd: [TagName: [Const: bar]], FiltOper: [Const: +, NotCond: [HasRelPropCond: [UnivProp: [Const: .seen]]]]]',
|
|
829
829
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditTagAdd: [TagName: [Const: bar]], SubQuery: [Query: [EditTagAdd: [TagName: [Const: baz]], FiltOper: [Const: -, TagCond: [TagMatch: [Const: bar]]]]]]',
|
|
@@ -836,9 +836,9 @@ _ParseResults = [
|
|
|
836
836
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: hehe], EditTagAdd: [TagName: [Const: foo], Const: =, List: [Const: 2014, Const: 2016]]]',
|
|
837
837
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: hehe]]',
|
|
838
838
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: oof], EditTagAdd: [TagName: [Const: bar]], SubQuery: [Query: [EditNodeAdd: [FormName: [Const: test:int], Const: =, Const: 0xdeadbeef]]]]',
|
|
839
|
-
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: visi], EditTagAdd: [TagName: [Const: foo
|
|
840
|
-
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: visi], EditTagAdd: [TagName: [Const: foo
|
|
841
|
-
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: visi], EditNodeAdd: [FormName: [Const: test:int], Const: =, Const: 20], EditTagAdd: [TagName: [Const: foo
|
|
839
|
+
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: visi], EditTagAdd: [TagName: [Const: foo, Const: bar]], PivotToTags: [TagMatch: []], isjoin=False, EditTagAdd: [TagName: [Const: baz, Const: faz]]]',
|
|
840
|
+
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: visi], EditTagAdd: [TagName: [Const: foo, Const: bar]], PivotToTags: [TagMatch: []], isjoin=False]',
|
|
841
|
+
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: visi], EditNodeAdd: [FormName: [Const: test:int], Const: =, Const: 20], EditTagAdd: [TagName: [Const: foo, Const: bar]]]',
|
|
842
842
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: woot], EditTagAdd: [TagName: [Const: foo], Const: =, List: [Const: 2015, Const: 2018]], EditTagAdd: [TagName: [Const: bar]], EditPropSet: [UnivProp: [Const: .seen], Const: =, List: [Const: 2014, Const: 2016]]]',
|
|
843
843
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: woot], EditTagAdd: [TagName: [Const: foo], Const: =, List: [Const: 2015, Const: 2018]], EditPropSet: [UnivProp: [Const: .seen], Const: =, List: [Const: 2014, Const: 2016]]]',
|
|
844
844
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: woot], EditTagAdd: [TagName: [Const: foo], Const: =, List: [Const: 2015, Const: 2018]]]',
|
|
@@ -855,9 +855,9 @@ _ParseResults = [
|
|
|
855
855
|
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.1-1.2.3.3]]',
|
|
856
856
|
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], EditPropSet: [RelProp: [Const: asn], Const: =, Const: 10], EditNodeAdd: [FormName: [Const: meta:seen], Const: =, List: [Const: abcd, List: [Const: inet:asn, Const: 10]]]]',
|
|
857
857
|
'Query: [EditNodeAdd: [FormName: [Const: meta:seen], Const: =, List: [Const: abcd, List: [Const: test:str, Const: pennywise]]]]',
|
|
858
|
-
'Query: [EditNodeAdd: [FormName: [Const: meta:source], Const: =, Const: abcd], EditTagAdd: [TagName: [Const: omit
|
|
858
|
+
'Query: [EditNodeAdd: [FormName: [Const: meta:source], Const: =, Const: abcd], EditTagAdd: [TagName: [Const: omit, Const: nopiv]], EditNodeAdd: [FormName: [Const: meta:seen], Const: =, List: [Const: abcd, List: [Const: test:pivtarg, Const: foo]]]]',
|
|
859
859
|
'Query: [EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 1234, Const: 5678]]]',
|
|
860
|
-
'Query: [EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 3, Const: foob]], EditTagAdd: [TagName: [Const: meep
|
|
860
|
+
'Query: [EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 3, Const: foob]], EditTagAdd: [TagName: [Const: meep, Const: gorp]], EditTagAdd: [TagName: [Const: bleep, Const: zlorp]], EditTagAdd: [TagName: [Const: cond]]]',
|
|
861
861
|
'Query: [EditNodeAdd: [FormName: [Const: test:guid], Const: =, Const: *], EditPropSet: [RelProp: [Const: tick], Const: =, Const: 2001]]',
|
|
862
862
|
'Query: [EditNodeAdd: [FormName: [Const: test:guid], Const: =, Const: abcd], EditPropSet: [RelProp: [Const: tick], Const: =, Const: 2015]]',
|
|
863
863
|
'Query: [EditNodeAdd: [FormName: [Const: test:int], Const: =, Const: 1], EditNodeAdd: [FormName: [Const: test:int], Const: =, Const: 2], EditNodeAdd: [FormName: [Const: test:int], Const: =, Const: 3]]',
|
|
@@ -933,11 +933,11 @@ _ParseResults = [
|
|
|
933
933
|
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4], FiltOper: [Const: +, SubqCond: [Query: [FormPivot: [AbsProp: inet:dns:a], isjoin=False], Const: !=, Const: 2]]]',
|
|
934
934
|
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4], CmdOper: [Const: limit, List: [Const: 20]]]',
|
|
935
935
|
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 12.34.56.78], EditPropSet: [RelProp: [Const: loc], Const: =, Const: us.oh.wilmington]]',
|
|
936
|
-
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 12.34.56.78], LiftPropBy: [Const: inet:fqdn, Const: =, Const: woot.com], EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], EditPropSet: [RelProp: [Const: asn], Const: =, Const: 10101], EditNodeAdd: [FormName: [Const: inet:fqdn], Const: =, Const: woowoo.com], EditTagAdd: [TagName: [Const: my
|
|
936
|
+
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 12.34.56.78], LiftPropBy: [Const: inet:fqdn, Const: =, Const: woot.com], EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], EditPropSet: [RelProp: [Const: asn], Const: =, Const: 10101], EditNodeAdd: [FormName: [Const: inet:fqdn], Const: =, Const: woowoo.com], EditTagAdd: [TagName: [Const: my, Const: tag]]]',
|
|
937
937
|
'Query: [LiftProp: [Const: inet:user], CmdOper: [Const: limit, List: [Const: --woot]]]',
|
|
938
938
|
'Query: [LiftProp: [Const: inet:user], CmdOper: [Const: limit, List: [Const: 1]]]',
|
|
939
939
|
'Query: [LiftProp: [Const: inet:user], CmdOper: [Const: limit, List: [Const: 10]], FiltOper: [Const: +, AbsPropCond: [AbsProp: inet:user, Const: =, Const: visi]]]',
|
|
940
|
-
'Query: [LiftProp: [Const: inet:user], CmdOper: [Const: limit, List: [Const: 10]], EditTagAdd: [TagName: [Const: foo
|
|
940
|
+
'Query: [LiftProp: [Const: inet:user], CmdOper: [Const: limit, List: [Const: 10]], EditTagAdd: [TagName: [Const: foo, Const: bar]]]',
|
|
941
941
|
'Query: [LiftPropBy: [Const: media:news, Const: =, Const: 00a1f0d928e25729b9e86e2d08c127ce], EditPropSet: [RelProp: [Const: summary], Const: =, Const: ]]',
|
|
942
942
|
'Query: [LiftPropBy: [Const: meta:seen:meta:source, Const: =, VarValue: [Const: sorc]], PivotOut: [], isjoin=False]',
|
|
943
943
|
'Query: [LiftPropBy: [Const: meta:seen:meta:source, Const: =, VarValue: [Const: sorc]], PropPivotOut: [RelProp: [Const: node]], isjoin=False]',
|
|
@@ -959,12 +959,12 @@ _ParseResults = [
|
|
|
959
959
|
'Query: [CmdOper: [Const: sudo, Const: ()], LiftPropBy: [Const: test:int, Const: =, Const: 6], CmdOper: [Const: delnode, Const: ()]]',
|
|
960
960
|
'Query: [LiftPropBy: [Const: syn:tag, Const: =, Const: a.b], FiltOper: [Const: +, TagCond: [TagMatch: [Const: foo]]]]',
|
|
961
961
|
'Query: [LiftPropBy: [Const: syn:tag, Const: =, Const: aaa.barbarella.ddd]]',
|
|
962
|
-
'Query: [LiftPropBy: [Const: syn:tag, Const: =, Const: baz.faz], EditTagAdd: [TagName: [Const: foo
|
|
962
|
+
'Query: [LiftPropBy: [Const: syn:tag, Const: =, Const: baz.faz], EditTagAdd: [TagName: [Const: foo, Const: bar]]]',
|
|
963
963
|
'Query: [LiftPropBy: [Const: syn:tag, Const: =, Const: foo.bar], PivotOut: [], isjoin=False]',
|
|
964
964
|
'Query: [LiftPropBy: [Const: syn:tag, Const: =, Const: foo.bar], FormPivot: [AbsProp: test:str], isjoin=False]',
|
|
965
965
|
'Query: [LiftPropBy: [Const: syn:tag, Const: =, Const: foo.bar], FormPivot: [AbsProp: test:str:tick], isjoin=False]',
|
|
966
966
|
'Query: [LiftProp: [Const: test:comp], FiltOper: [Const: +, AndCond: [RelPropCond: [RelPropValue: [RelProp: [Const: hehe]], Const: <, Const: 2], RelPropCond: [RelPropValue: [RelProp: [Const: haha]], Const: =, Const: test]]]]',
|
|
967
|
-
'Query: [LiftProp: [Const: test:comp], FiltOper: [Const: +, OrCond: [RelPropCond: [RelPropValue: [RelProp: [Const: hehe]], Const: <, Const: 2], TagCond: [TagMatch: [Const: meep
|
|
967
|
+
'Query: [LiftProp: [Const: test:comp], FiltOper: [Const: +, OrCond: [RelPropCond: [RelPropValue: [RelProp: [Const: hehe]], Const: <, Const: 2], TagCond: [TagMatch: [Const: meep, Const: gorp]]]]]',
|
|
968
968
|
'Query: [LiftProp: [Const: test:comp], FiltOper: [Const: +, OrCond: [RelPropCond: [RelPropValue: [RelProp: [Const: hehe]], Const: <, Const: 2], RelPropCond: [RelPropValue: [RelProp: [Const: haha]], Const: =, Const: test]]]]',
|
|
969
969
|
'Query: [LiftProp: [Const: test:comp], FiltOper: [Const: +, RelPropCond: [RelPropValue: [RelProp: [Const: haha]], Const: range=, List: [Const: grinch, Const: meanone]]]]',
|
|
970
970
|
'Query: [LiftProp: [Const: test:comp], FiltOper: [Const: +, AbsPropCond: [AbsProp: test:comp, Const: range=, List: [List: [Const: 1024, Const: grinch], List: [Const: 4096, Const: zemeanone]]]]]',
|
|
@@ -1034,11 +1034,11 @@ _ParseResults = [
|
|
|
1034
1034
|
'Query: [LiftPropBy: [Const: test:pivcomp, Const: =, List: [Const: hehe, Const: haha]]]',
|
|
1035
1035
|
'Query: [LiftPropBy: [Const: test:pivtarg, Const: =, Const: hehe], EditPropSet: [UnivProp: [Const: .seen], Const: =, Const: 2015]]',
|
|
1036
1036
|
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const: *]]]]',
|
|
1037
|
-
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const:
|
|
1038
|
-
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const:
|
|
1039
|
-
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const:
|
|
1040
|
-
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const: foo
|
|
1041
|
-
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const: foo
|
|
1037
|
+
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const: **, Const: bar, Const: baz]]]]',
|
|
1038
|
+
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const: **, Const: baz]]]]',
|
|
1039
|
+
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const: *, Const: bad]]]]',
|
|
1040
|
+
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const: foo, Const: **, Const: baz]]]]',
|
|
1041
|
+
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagCond: [TagMatch: [Const: foo, Const: *, Const: baz]]]]',
|
|
1042
1042
|
'Query: [LiftTag: [TagName: [Const: foo], Const: @=, List: [Const: 2013, Const: 2015]]]',
|
|
1043
1043
|
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagValuCond: [TagMatch: [Const: foo], Const: @=, List: [Const: 2014, Const: 20141231]]]]',
|
|
1044
1044
|
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, TagValuCond: [TagMatch: [Const: foo], Const: @=, List: [Const: 2015, Const: 2018]]]]',
|
|
@@ -1063,16 +1063,16 @@ _ParseResults = [
|
|
|
1063
1063
|
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, AbsPropCond: [AbsProp: test:str:tick, Const: >, Const: 201808021202]]]',
|
|
1064
1064
|
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: +, AbsPropCond: [AbsProp: test:str:tick, Const: >=, Const: 201808021202]]]',
|
|
1065
1065
|
'Query: [LiftProp: [Const: test:str], FiltOper: [Const: -, TagCond: [TagMatch: [Const: *]]]]',
|
|
1066
|
-
'Query: [LiftProp: [Const: test:str], EditTagAdd: [TagName: [Const: foo
|
|
1067
|
-
'Query: [LiftProp: [Const: test:str], EditTagAdd: [TagName: [Const: foo
|
|
1068
|
-
'Query: [LiftProp: [Const: test:str], EditTagAdd: [TagName: [Const: foo
|
|
1066
|
+
'Query: [LiftProp: [Const: test:str], EditTagAdd: [TagName: [Const: foo, Const: bar], Const: =, List: [Const: 2000, Const: 2002]]]',
|
|
1067
|
+
'Query: [LiftProp: [Const: test:str], EditTagAdd: [TagName: [Const: foo, Const: bar], Const: =, List: [Const: 2000, Const: 20020601]]]',
|
|
1068
|
+
'Query: [LiftProp: [Const: test:str], EditTagAdd: [TagName: [Const: foo, Const: bar]]]',
|
|
1069
1069
|
'Query: [LiftProp: [Const: test:str], EditTagDel: [TagName: [Const: foo]]]',
|
|
1070
1070
|
'Query: [LiftProp: [Const: test:str], EditPropDel: [RelProp: [Const: tick]]]',
|
|
1071
1071
|
'Query: [LiftProp: [Const: test:str], CmdOper: [Const: delnode, List: [Const: --force]]]',
|
|
1072
1072
|
'Query: [LiftProp: [Const: test:str], CmdOper: [Const: noderefs, List: [Const: -d, Const: 3, Const: --unique]]]',
|
|
1073
1073
|
'Query: [LiftProp: [Const: test:str], CmdOper: [Const: noderefs, List: [Const: -d, Const: 3]]]',
|
|
1074
1074
|
'Query: [LiftFormTag: [Const: test:str, TagName: [Const: foo]]]',
|
|
1075
|
-
'Query: [LiftFormTag: [Const: test:str, TagName: [Const: foo
|
|
1075
|
+
'Query: [LiftFormTag: [Const: test:str, TagName: [Const: foo, Const: bar]]]',
|
|
1076
1076
|
'Query: [LiftFormTag: [Const: test:str, TagName: [Const: foo], Const: @=, List: [Const: 2012, Const: 2022]]]',
|
|
1077
1077
|
'Query: [LiftFormTag: [Const: test:str, TagName: [Const: foo], Const: @=, Const: 2016]]',
|
|
1078
1078
|
'Query: [LiftProp: [Const: test:str]]',
|
|
@@ -1096,7 +1096,7 @@ _ParseResults = [
|
|
|
1096
1096
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: bar], FormPivot: [AbsProp: test:pivcomp:lulz], isjoin=False]',
|
|
1097
1097
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: bar], PivotIn: [], isjoin=True]',
|
|
1098
1098
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: bar], PivotIn: [], isjoin=False]',
|
|
1099
|
-
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: bar], LiftPropBy: [Const: test:pivcomp, Const: =, List: [Const: foo, Const: bar]], EditTagAdd: [TagName: [Const: test
|
|
1099
|
+
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: bar], LiftPropBy: [Const: test:pivcomp, Const: =, List: [Const: foo, Const: bar]], EditTagAdd: [TagName: [Const: test, Const: bar]]]',
|
|
1100
1100
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: foo], FiltOper: [Const: +, TagValuCond: [TagMatch: [Const: lol], Const: @=, Const: 2016]]]',
|
|
1101
1101
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: foo], PivotInFrom: [AbsProp: edge:has], isjoin=True]',
|
|
1102
1102
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: foo], PivotInFrom: [AbsProp: edge:has], isjoin=False]',
|
|
@@ -1109,7 +1109,7 @@ _ParseResults = [
|
|
|
1109
1109
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: pennywise], CmdOper: [Const: noderefs, List: [Const: --join, Const: -d, Const: 9, Const: --traverse-edge]]]',
|
|
1110
1110
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: pennywise], CmdOper: [Const: noderefs, List: [Const: -d, Const: 3, Const: --omit-traversal-tag, Const: omit.nopiv, Const: --omit-traversal-tag, Const: test]]]',
|
|
1111
1111
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: visi], PivotToTags: [TagMatch: [Const: *]], isjoin=False]',
|
|
1112
|
-
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: visi], PivotToTags: [TagMatch: [Const: foo
|
|
1112
|
+
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: visi], PivotToTags: [TagMatch: [Const: foo, Const: *]], isjoin=False]',
|
|
1113
1113
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: woot], SetVarOper: [Const: foo, TagValue: [TagName: [Const: foo]]], FiltOper: [Const: +, RelPropCond: [RelPropValue: [UnivProp: [Const: .seen]], Const: @=, VarValue: [Const: foo]]]]',
|
|
1114
1114
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: woot], FiltOper: [Const: +, RelPropCond: [RelPropValue: [UnivProp: [Const: .seen]], Const: @=, TagValue: [TagName: [Const: bar]]]]]',
|
|
1115
1115
|
'Query: [LiftPropBy: [Const: test:str, Const: =, Const: woot], FiltOper: [Const: +, RelPropCond: [RelPropValue: [UnivProp: [Const: .seen]], Const: @=, List: [Const: 2012, Const: 2015]]]]',
|
|
@@ -1121,8 +1121,8 @@ _ParseResults = [
|
|
|
1121
1121
|
'Query: [LiftProp: [Const: test:int]]',
|
|
1122
1122
|
'Query: [LiftProp: [Const: inet:fqdn], CmdOper: [Const: graph, List: [Const: --degrees, Const: 2, Const: --filter, ArgvQuery: [Query: [FiltOper: [Const: -, TagCond: [TagMatch: [Const: nope]]]]], Const: --pivot, ArgvQuery: [Query: [PivotInFrom: [AbsProp: meta:seen], isjoin=False, PivotInFrom: [AbsProp: meta:source], isjoin=False]], Const: --form-pivot, Const: inet:fqdn, ArgvQuery: [Query: [PivotIn: [], isjoin=False, CmdOper: [Const: limit, List: [Const: 20]]]], Const: --form-pivot, Const: inet:fqdn, ArgvQuery: [Query: [PivotOut: [], isjoin=False, CmdOper: [Const: limit, List: [Const: 20]]]], Const: --form-filter, Const: inet:fqdn, ArgvQuery: [Query: [FiltOper: [Const: -, AbsPropCond: [AbsProp: inet:fqdn:issuffix, Const: =, Const: 1]]]], Const: --form-pivot, Const: syn:tag, ArgvQuery: [Query: [PivotOut: [], isjoin=False]], Const: --form-pivot, Const: *, ArgvQuery: [Query: [PivotToTags: [TagMatch: []], isjoin=False]]]]]',
|
|
1123
1123
|
"Query: [ForLoop: [Const: foo, VarValue: [Const: foos], SubQuery: [Query: [VarListSetOper: [VarList: ['fqdn', 'ipv4'], FuncCall: [VarDeref: [VarValue: [Const: foo], Const: split], CallArgs: [Const: |], CallKwargs: []]], EditNodeAdd: [FormName: [Const: inet:dns:a], Const: =, List: [VarValue: [Const: fqdn], VarValue: [Const: ipv4]]]]]]]",
|
|
1124
|
-
'Query: [ForLoop: [Const: tag, FuncCall: [VarDeref: [VarValue: [Const: node], Const: tags], CallArgs: [], CallKwargs: []], SubQuery: [Query: [FormPivot: [AbsProp: test:int], isjoin=False, EditTagAdd: [VarValue: [Const: tag]]]]]]',
|
|
1125
|
-
'Query: [ForLoop: [Const: tag, FuncCall: [VarDeref: [VarValue: [Const: node], Const: tags], CallArgs: [Const: fo*], CallKwargs: []], SubQuery: [Query: [FormPivot: [AbsProp: test:int], isjoin=False, EditTagDel: [VarValue: [Const: tag]]]]]]',
|
|
1124
|
+
'Query: [ForLoop: [Const: tag, FuncCall: [VarDeref: [VarValue: [Const: node], Const: tags], CallArgs: [], CallKwargs: []], SubQuery: [Query: [FormPivot: [AbsProp: test:int], isjoin=False, EditTagAdd: [TagName: [VarValue: [Const: tag]]]]]]]',
|
|
1125
|
+
'Query: [ForLoop: [Const: tag, FuncCall: [VarDeref: [VarValue: [Const: node], Const: tags], CallArgs: [Const: fo*], CallKwargs: []], SubQuery: [Query: [FormPivot: [AbsProp: test:int], isjoin=False, EditTagDel: [TagName: [VarValue: [Const: tag]]]]]]]',
|
|
1126
1126
|
'Query: [EditNodeAdd: [FormName: [Const: inet:email:message], Const: =, Const: *], EditPropSet: [RelProp: [Const: to], Const: =, Const: woot@woot.com], EditPropSet: [RelProp: [Const: from], Const: =, Const: visi@vertex.link], EditPropSet: [RelProp: [Const: replyto], Const: =, Const: root@root.com], EditPropSet: [RelProp: [Const: subject], Const: =, Const: hi there], EditPropSet: [RelProp: [Const: date], Const: =, Const: 2015], EditPropSet: [RelProp: [Const: body], Const: =, Const: there are mad sploitz here!], EditPropSet: [RelProp: [Const: bytes], Const: =, Const: *], SubQuery: [Query: [EditNodeAdd: [FormName: [Const: inet:email:message:link], Const: =, List: [VarValue: [Const: node], Const: https://www.vertex.link]]]], SubQuery: [Query: [EditNodeAdd: [FormName: [Const: inet:email:message:attachment], Const: =, List: [VarValue: [Const: node], Const: *]], FiltOper: [Const: -, HasAbsPropCond: [AbsProp: inet:email:message]], EditPropSet: [RelProp: [Const: name], Const: =, Const: sploit.exe]]], SubQuery: [Query: [EditNodeAdd: [FormName: [Const: edge:has], Const: =, List: [VarValue: [Const: node], List: [Const: inet:email:header, List: [Const: to, Const: Visi Kensho <visi@vertex.link>]]]]]]]',
|
|
1127
1127
|
'Query: [SetVarOper: [Const: x, DollarExpr: [ExprNode: [Const: 1, Const: /, Const: 3]]]]',
|
|
1128
1128
|
'Query: [SetVarOper: [Const: x, DollarExpr: [ExprNode: [Const: 1, Const: *, Const: 3]]]]',
|
|
@@ -1150,14 +1150,14 @@ _ParseResults = [
|
|
|
1150
1150
|
'Query: [SetVarOper: [Const: foo, DollarExpr: [ExprOrNode: [Const: 1, Const: or, ExprAndNode: [Const: 0, Const: and, Const: 0]]]]]',
|
|
1151
1151
|
'Query: [SetVarOper: [Const: foo, DollarExpr: [ExprAndNode: [UnaryExprNode: [Const: not, Const: 1], Const: and, Const: 1]]]]',
|
|
1152
1152
|
'Query: [SetVarOper: [Const: foo, DollarExpr: [UnaryExprNode: [Const: not, ExprNode: [Const: 1, Const: >, Const: 1]]]]]',
|
|
1153
|
-
'Query: [LiftTagProp: [TagProp: [TagName: [Const: baz
|
|
1154
|
-
'Query: [LiftFormTagProp: [FormTagProp: [Const: foo:bar, TagName: [Const: baz
|
|
1155
|
-
'Query: [LiftTagProp: [TagProp: [TagName: [Const: baz
|
|
1156
|
-
'Query: [LiftFormTagProp: [FormTagProp: [Const: foo:bar, TagName: [Const: baz
|
|
1157
|
-
'Query: [FiltOper: [Const: +, HasTagPropCond: [
|
|
1158
|
-
'Query: [FiltOper: [Const: +, TagPropCond: [
|
|
1159
|
-
'Query: [EditTagPropDel: [TagProp: [TagName: [Const: baz
|
|
1160
|
-
'Query: [EditTagPropSet: [TagProp: [TagName: [Const: baz
|
|
1153
|
+
'Query: [LiftTagProp: [TagProp: [TagName: [Const: baz, Const: faz], Const: lol]]]',
|
|
1154
|
+
'Query: [LiftFormTagProp: [FormTagProp: [Const: foo:bar, TagName: [Const: baz, Const: faz], Const: lol]]]',
|
|
1155
|
+
'Query: [LiftTagProp: [TagProp: [TagName: [Const: baz, Const: faz], Const: lol], Const: =, Const: 20]]',
|
|
1156
|
+
'Query: [LiftFormTagProp: [FormTagProp: [Const: foo:bar, TagName: [Const: baz, Const: faz], Const: lol], Const: =, Const: 20]]',
|
|
1157
|
+
'Query: [FiltOper: [Const: +, HasTagPropCond: [TagMatch: [Const: foo, Const: bar], Const: lol]]]',
|
|
1158
|
+
'Query: [FiltOper: [Const: +, TagPropCond: [TagMatch: [Const: foo, Const: bar], Const: lol, Const: =, Const: 20]]]',
|
|
1159
|
+
'Query: [EditTagPropDel: [TagProp: [TagName: [Const: baz, Const: faz], Const: lol]]]',
|
|
1160
|
+
'Query: [EditTagPropSet: [TagProp: [TagName: [Const: baz, Const: faz], Const: lol], Const: =, Const: 20]]',
|
|
1161
1161
|
'Query: [LiftTagProp: [TagProp: [TagName: [Const: tag], Const: somegeoloctypebecauseihatelife], Const: near=, List: [VarValue: [Const: lat], VarValue: [Const: long]]]]',
|
|
1162
1162
|
'Query: [LiftPropBy: [VarValue: [Const: foo], Const: near=, Const: 20]]',
|
|
1163
1163
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, VarDeref: [VarDeref: [VarDeref: [VarDeref: [VarDeref: [VarValue: [Const: foo], Const: woot], Const: var], VarValue: [Const: bar]], Const: mar], VarValue: [Const: car]]]]',
|
|
@@ -1171,7 +1171,7 @@ _ParseResults = [
|
|
|
1171
1171
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: a], SwitchCase: [VarValue: [Const: woot], CaseEntry: [Const: hehe, SubQuery: [Query: [EditTagAdd: [TagName: [Const: baz]]]]]]]',
|
|
1172
1172
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: c], SwitchCase: [VarValue: [Const: woot], CaseEntry: [Const: hehe, SubQuery: [Query: [EditTagAdd: [TagName: [Const: baz]]]]], CaseEntry: [SubQuery: [Query: [EditTagAdd: [TagName: [Const: jaz]]]]]]]',
|
|
1173
1173
|
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: c], SwitchCase: [VarValue: [Const: woot], CaseEntry: [Const: hehe, SubQuery: [Query: [EditTagAdd: [TagName: [Const: baz]]]]], CaseEntry: [Const: haha hoho, SubQuery: [Query: [EditTagAdd: [TagName: [Const: faz]]]]], CaseEntry: [Const: lolz:lulz, SubQuery: [Query: [EditTagAdd: [TagName: [Const: jaz]]]]]]]',
|
|
1174
|
-
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], SwitchCase: [VarValue: [Const: foo], CaseEntry: [Const: bar, SubQuery: [Query: [EditTagAdd: [TagName: [Const: hehe
|
|
1174
|
+
'Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], SwitchCase: [VarValue: [Const: foo], CaseEntry: [Const: bar, SubQuery: [Query: [EditTagAdd: [TagName: [Const: hehe, Const: haha]]]]], CaseEntry: [Const: baz faz, SubQuery: [Query: []]]]]',
|
|
1175
1175
|
'Query: [ForLoop: [Const: foo, VarValue: [Const: foos], SubQuery: [Query: [EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 1.2.3.4], SwitchCase: [VarValue: [Const: foo], CaseEntry: [Const: bar, SubQuery: [Query: [EditTagAdd: [TagName: [Const: ohai]], BreakOper: []]]], CaseEntry: [Const: baz, SubQuery: [Query: [EditTagAdd: [TagName: [Const: visi]], ContinueOper: []]]]], EditNodeAdd: [FormName: [Const: inet:ipv4], Const: =, Const: 5.6.7.8], EditTagAdd: [TagName: [Const: hehe]]]]]]',
|
|
1176
1176
|
'Query: [SwitchCase: [VarValue: [Const: a], CaseEntry: [Const: a, SubQuery: [Query: []]]]]',
|
|
1177
1177
|
'Query: [SwitchCase: [VarValue: [Const: a], CaseEntry: [Const: test:str, SubQuery: [Query: []]], CaseEntry: [SubQuery: [Query: []]]]]',
|
|
@@ -1186,8 +1186,8 @@ _ParseResults = [
|
|
|
1186
1186
|
'Query: [LiftProp: [Const: inet:ipv4], PivotToTags: [TagMatch: [Const: *]], isjoin=True]',
|
|
1187
1187
|
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4], PivotToTags: [TagMatch: []], isjoin=True]',
|
|
1188
1188
|
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4], PivotToTags: [TagMatch: [Const: *]], isjoin=True]',
|
|
1189
|
-
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4], PivotToTags: [TagMatch: [Const: biz
|
|
1190
|
-
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4], PivotToTags: [TagMatch: [Const: bar
|
|
1189
|
+
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4], PivotToTags: [TagMatch: [Const: biz, Const: *]], isjoin=True]',
|
|
1190
|
+
'Query: [LiftPropBy: [Const: inet:ipv4, Const: =, Const: 1.2.3.4], PivotToTags: [TagMatch: [Const: bar, Const: baz]], isjoin=True]',
|
|
1191
1191
|
'Query: [Function: [Const: middlechild, FuncArgs: [Const: arg2], Query: [YieldValu: [FuncCall: [VarValue: [Const: rockbottom], CallArgs: [VarValue: [Const: arg2]], CallKwargs: []]]]]]',
|
|
1192
1192
|
'Query: [EditNodeAdd: [FormName: [Const: test:comp], Const: =, List: [Const: 10, Const: bar]], SubQuery: [Query: [FormPivot: [AbsProp: test:int], isjoin=False]]]',
|
|
1193
1193
|
'Query: [LiftProp: [Const: test:arrayprop], FiltOper: [Const: +, ArrayCond: [RelProp: [Const: ints], Const: range=, List: [Const: 50, Const: 100]]]]',
|
|
@@ -1206,8 +1206,8 @@ _ParseResults = [
|
|
|
1206
1206
|
'Query: [SetVarOper: [Const: x, List: [Const: foo bar baz, Const: two]]]',
|
|
1207
1207
|
'Query: [SetVarOper: [Const: foo, FormatString: [Const: foo\n bar]]]',
|
|
1208
1208
|
'Query: [SetVarOper: [Const: foo, List: [Const: truesec.com]]]',
|
|
1209
|
-
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditTagPropSet: [TagProp: [FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 0], CallKwargs: []], FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 1], CallKwargs: []]], Const: =, FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 2], CallKwargs: []]]]',
|
|
1210
|
-
'Query: [LiftFormTagProp: [FormTagProp: [Const: test:str, FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 0], CallKwargs: []], FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 1], CallKwargs: []]]]]',
|
|
1209
|
+
'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditTagPropSet: [TagProp: [TagName: [FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 0], CallKwargs: []]], FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 1], CallKwargs: []]], Const: =, FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 2], CallKwargs: []]]]',
|
|
1210
|
+
'Query: [LiftFormTagProp: [FormTagProp: [Const: test:str, TagName: [FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 0], CallKwargs: []]], FuncCall: [VarDeref: [VarValue: [Const: tag], Const: index], CallArgs: [Const: 1], CallKwargs: []]]]]',
|
|
1211
1211
|
'Query: [IfStmt: [IfClause: [VarDeref: [VarValue: [Const: lib], Const: true], SubQuery: [Query: []]]], VarEvalOper: [FuncCall: [VarDeref: [VarValue: [Const: lib], Const: print], CallArgs: [FormatString: [Const: User: , VarDeref: [VarValue: [Const: lib], Const: true]]], CallKwargs: []]]]',
|
|
1212
1212
|
'Query: [SetItemOper: [VarValue: [Const: foo], FormatString: [VarDeref: [VarValue: [Const: bar], Const: baz]], VarValue: [Const: bar]]]',
|
|
1213
1213
|
'Query: [SetItemOper: [VarValue: [Const: foo], FormatString: [VarDeref: [VarValue: [Const: bar], Const: baz]], VarValue: [Const: bar]]]',
|
|
@@ -1227,8 +1227,8 @@ _ParseResults = [
|
|
|
1227
1227
|
'Query: [VarEvalOper: [FuncCall: [VarDeref: [VarValue: [Const: lib], Const: print], CallArgs: [DollarExpr: [FuncCall: [VarDeref: [DollarExpr: [RelPropValue: [Const: prop]], Const: upper], CallArgs: [], CallKwargs: []]]], CallKwargs: []]]]',
|
|
1228
1228
|
'Query: [VarEvalOper: [FuncCall: [VarDeref: [VarValue: [Const: lib], Const: print], CallArgs: [VarDeref: [DollarExpr: [ExprDict: [Const: unicode, Const: 1]], DollarExpr: [RelPropValue: [Const: prop]]]], CallKwargs: []]]]',
|
|
1229
1229
|
'Query: [VarEvalOper: [FuncCall: [VarDeref: [VarValue: [Const: lib], Const: print], CallArgs: [DollarExpr: [ExprNode: [VarDeref: [DollarExpr: [ExprDict: [Const: unicode, Const: 1]], DollarExpr: [RelPropValue: [Const: prop]]], Const: +, DollarExpr: [Const: 2]]]], CallKwargs: []]]]',
|
|
1230
|
-
'Query: [LiftFormTag: [VarValue: [Const: form], VarValue: [Const: tag]]]',
|
|
1231
|
-
'Query: [LiftFormTagProp: [FormTagProp: [VarValue: [Const: form], VarValue: [Const: tag], VarValue: [Const: prop]]]]',
|
|
1230
|
+
'Query: [LiftFormTag: [VarValue: [Const: form], TagName: [VarValue: [Const: tag]]]]',
|
|
1231
|
+
'Query: [LiftFormTagProp: [FormTagProp: [VarValue: [Const: form], TagName: [VarValue: [Const: tag]], VarValue: [Const: prop]]]]',
|
|
1232
1232
|
]
|
|
1233
1233
|
|
|
1234
1234
|
class GrammarTest(s_t_utils.SynTest):
|
|
@@ -1511,7 +1511,7 @@ class GrammarTest(s_t_utils.SynTest):
|
|
|
1511
1511
|
with self.raises(s_exc.BadSyntax) as cm:
|
|
1512
1512
|
_ = parser.query()
|
|
1513
1513
|
errinfo = cm.exception.errinfo
|
|
1514
|
-
self.true(errinfo.get('mesg').startswith('
|
|
1514
|
+
self.true(errinfo.get('mesg').startswith("Unexpected token 'default case' at line 1, column 7"))
|
|
1515
1515
|
|
|
1516
1516
|
query = '''$foo=(3+foo)'''
|
|
1517
1517
|
parser = s_parser.Parser(query)
|
|
@@ -1723,7 +1723,8 @@ class HttpApiTest(s_tests.SynTest):
|
|
|
1723
1723
|
|
|
1724
1724
|
with self.getStructuredAsyncLoggerStream(logname, 'api/v1/auth/adduser') as stream:
|
|
1725
1725
|
|
|
1726
|
-
async with sess.post(f'https://root:root@localhost:{port}/api/v1/auth/adduser',
|
|
1726
|
+
async with sess.post(f'https://root:root@localhost:{port}/api/v1/auth/adduser',
|
|
1727
|
+
json=info, headers={'X-Forwarded-For': '1.2.3.4'}) as resp:
|
|
1727
1728
|
item = await resp.json()
|
|
1728
1729
|
self.nn(item.get('result').get('iden'))
|
|
1729
1730
|
visiiden = item['result']['iden']
|
|
@@ -1737,6 +1738,7 @@ class HttpApiTest(s_tests.SynTest):
|
|
|
1737
1738
|
self.isin('remoteip', mesg)
|
|
1738
1739
|
self.isin('(root)', mesg.get('message'))
|
|
1739
1740
|
self.isin('200 POST /api/v1/auth/adduser', mesg.get('message'))
|
|
1741
|
+
self.notin('1.2.3.4', mesg.get('message'))
|
|
1740
1742
|
|
|
1741
1743
|
# No auth provided
|
|
1742
1744
|
with self.getStructuredAsyncLoggerStream(logname, 'api/v1/active') as stream:
|
|
@@ -1775,3 +1777,53 @@ class HttpApiTest(s_tests.SynTest):
|
|
|
1775
1777
|
self.eq(mesg.get('uri'), '/api/v1/auth/users')
|
|
1776
1778
|
self.eq(mesg.get('username'), 'visi')
|
|
1777
1779
|
self.eq(mesg.get('user'), visiiden)
|
|
1780
|
+
|
|
1781
|
+
async with self.getTestCore(conf={'https:parse:proxy:remoteip': True}) as core:
|
|
1782
|
+
|
|
1783
|
+
# structlog tests
|
|
1784
|
+
|
|
1785
|
+
host, port = await core.addHttpsPort(0, host='127.0.0.1')
|
|
1786
|
+
root = await core.auth.getUserByName('root')
|
|
1787
|
+
await root.setPasswd('root')
|
|
1788
|
+
|
|
1789
|
+
async with self.getHttpSess() as sess:
|
|
1790
|
+
|
|
1791
|
+
info = {'name': 'visi', 'passwd': 'secret', 'admin': True}
|
|
1792
|
+
logname = 'tornado.access'
|
|
1793
|
+
|
|
1794
|
+
# Basic-auth
|
|
1795
|
+
|
|
1796
|
+
with self.getStructuredAsyncLoggerStream(logname, 'api/v1/auth/adduser') as stream:
|
|
1797
|
+
|
|
1798
|
+
async with sess.post(f'https://root:root@localhost:{port}/api/v1/auth/adduser',
|
|
1799
|
+
json=info, headers={'X-Forwarded-For': '1.2.3.4'}) as resp:
|
|
1800
|
+
item = await resp.json()
|
|
1801
|
+
self.nn(item.get('result').get('iden'))
|
|
1802
|
+
self.eq(resp.status, 200)
|
|
1803
|
+
self.true(await stream.wait(6))
|
|
1804
|
+
|
|
1805
|
+
mesg = get_mesg(stream)
|
|
1806
|
+
self.eq(mesg.get('uri'), '/api/v1/auth/adduser')
|
|
1807
|
+
self.eq(mesg.get('username'), 'root')
|
|
1808
|
+
self.eq(mesg.get('user'), core.auth.rootuser.iden)
|
|
1809
|
+
self.eq(mesg.get('remoteip'), '1.2.3.4')
|
|
1810
|
+
self.isin('(root)', mesg.get('message'))
|
|
1811
|
+
self.isin('200 POST /api/v1/auth/adduser', mesg.get('message'))
|
|
1812
|
+
|
|
1813
|
+
info = {'name': 'charles', 'passwd': 'secret', 'admin': True}
|
|
1814
|
+
with self.getStructuredAsyncLoggerStream(logname, 'api/v1/auth/adduser') as stream:
|
|
1815
|
+
|
|
1816
|
+
async with sess.post(f'https://root:root@localhost:{port}/api/v1/auth/adduser',
|
|
1817
|
+
json=info, headers={'X-Real-Ip': '8.8.8.8'}) as resp:
|
|
1818
|
+
item = await resp.json()
|
|
1819
|
+
self.nn(item.get('result').get('iden'))
|
|
1820
|
+
self.eq(resp.status, 200)
|
|
1821
|
+
self.true(await stream.wait(6))
|
|
1822
|
+
|
|
1823
|
+
mesg = get_mesg(stream)
|
|
1824
|
+
self.eq(mesg.get('uri'), '/api/v1/auth/adduser')
|
|
1825
|
+
self.eq(mesg.get('username'), 'root')
|
|
1826
|
+
self.eq(mesg.get('user'), core.auth.rootuser.iden)
|
|
1827
|
+
self.eq(mesg.get('remoteip'), '8.8.8.8')
|
|
1828
|
+
self.isin('(root)', mesg.get('message'))
|
|
1829
|
+
self.isin('200 POST /api/v1/auth/adduser', mesg.get('message'))
|
synapse/tests/test_lib_layer.py
CHANGED
|
@@ -1128,6 +1128,26 @@ class LayerTest(s_t_utils.SynTest):
|
|
|
1128
1128
|
nodes = await core.nodes('inet:ipv4=1.2.3.4 [ +#foo.bar=2015 ]')
|
|
1129
1129
|
self.eq((1325376000000, 1420070400001), nodes[0].getTag('foo.bar'))
|
|
1130
1130
|
|
|
1131
|
+
await core.addTagProp('tval', ('ival', {}), {})
|
|
1132
|
+
await core.addTagProp('mintime', ('time', {'ismin': True}), {})
|
|
1133
|
+
await core.addTagProp('maxtime', ('time', {'ismax': True}), {})
|
|
1134
|
+
|
|
1135
|
+
await core.nodes('[test:str=tagprop +#foo:tval=2021]')
|
|
1136
|
+
await core.nodes('test:str=tagprop [+#foo:tval=2023]')
|
|
1137
|
+
|
|
1138
|
+
self.eq(1, await core.count('#foo:tval@=2022'))
|
|
1139
|
+
|
|
1140
|
+
await core.nodes('test:str=tagprop [+#foo:mintime=2021 +#foo:maxtime=2013]')
|
|
1141
|
+
await core.nodes('test:str=tagprop [+#foo:mintime=2023 +#foo:maxtime=2011]')
|
|
1142
|
+
|
|
1143
|
+
self.eq(1, await core.count('#foo:mintime=2021'))
|
|
1144
|
+
self.eq(1, await core.count('#foo:maxtime=2013'))
|
|
1145
|
+
|
|
1146
|
+
await core.nodes('test:str=tagprop [+#foo:mintime=2020 +#foo:maxtime=2015]')
|
|
1147
|
+
|
|
1148
|
+
self.eq(1, await core.count('#foo:mintime=2020'))
|
|
1149
|
+
self.eq(1, await core.count('#foo:maxtime=2015'))
|
|
1150
|
+
|
|
1131
1151
|
async def test_layer_nodeedits_created(self):
|
|
1132
1152
|
|
|
1133
1153
|
async with self.getTestCore() as core:
|
synapse/tests/test_lib_rstorm.py
CHANGED
|
@@ -104,7 +104,7 @@ multi_rst_in_http_opts = '''
|
|
|
104
104
|
.. storm-vcr-opts:: {"record_mode": "none"}
|
|
105
105
|
.. storm-vcr-callback:: synapse.tests.test_lib_rstorm.vcrcallbacktst
|
|
106
106
|
.. storm-mock-http:: /this/path/does/not/exist.yaml
|
|
107
|
-
.. storm:: $resp = $lib.inet.http.get("http://example.com") if $resp.body { $lib.print('unexpected results') } else { $lib.print(
|
|
107
|
+
.. storm:: $resp = $lib.inet.http.get("http://example.com") if $resp.body { $lib.print('unexpected results') } else { $lib.print('this test passed') }
|
|
108
108
|
'''
|
|
109
109
|
|
|
110
110
|
storm_http_sadpath_callback = '''
|
synapse/tests/test_lib_storm.py
CHANGED
|
@@ -891,8 +891,8 @@ class StormTest(s_t_utils.SynTest):
|
|
|
891
891
|
self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn = mvmnasde.com', msgs)
|
|
892
892
|
self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:host = mvmnasde', msgs)
|
|
893
893
|
self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:domain = com', msgs)
|
|
894
|
-
self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:issuffix =
|
|
895
|
-
self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:iszone =
|
|
894
|
+
self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:issuffix = false', msgs)
|
|
895
|
+
self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:iszone = true', msgs)
|
|
896
896
|
self.stormIsInPrint('3496c02183961db4fbc179f0ceb5526347b37d8ff278279917b6eb6d39e1e272 inet:fqdn:zone = mvmnasde.com', msgs)
|
|
897
897
|
|
|
898
898
|
# test that a user without perms can diff but not apply
|
|
@@ -4454,15 +4454,15 @@ class StormTest(s_t_utils.SynTest):
|
|
|
4454
4454
|
|
|
4455
4455
|
q = 'media:news:org#test.*.bar'
|
|
4456
4456
|
msgs = await core.stormlist(q)
|
|
4457
|
-
self.stormIsInErr(
|
|
4457
|
+
self.stormIsInErr("Unexpected token 'default case'", msgs)
|
|
4458
4458
|
|
|
4459
4459
|
q = '#test.*.bar'
|
|
4460
4460
|
msgs = await core.stormlist(q)
|
|
4461
|
-
self.stormIsInErr(
|
|
4461
|
+
self.stormIsInErr("Unexpected token 'default case'", msgs)
|
|
4462
4462
|
|
|
4463
4463
|
q = 'media:news:org#test.*.bar:score'
|
|
4464
4464
|
msgs = await core.stormlist(q)
|
|
4465
|
-
self.stormIsInErr(
|
|
4465
|
+
self.stormIsInErr("Unexpected token 'default case'", msgs)
|
|
4466
4466
|
|
|
4467
4467
|
async def test_storm_copyto(self):
|
|
4468
4468
|
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import bz2
|
|
2
|
+
import gzip
|
|
3
|
+
import zlib
|
|
4
|
+
import base64
|
|
5
|
+
|
|
6
|
+
import synapse.exc as s_exc
|
|
7
|
+
|
|
8
|
+
import synapse.tests.utils as s_test
|
|
9
|
+
|
|
10
|
+
class StormlibCompressionTest(s_test.SynTest):
|
|
11
|
+
|
|
12
|
+
async def test_storm_lib_bytes_bzip2(self):
|
|
13
|
+
async with self.getTestCore() as core:
|
|
14
|
+
text = 'ohhai'
|
|
15
|
+
tenc = base64.urlsafe_b64encode((bz2.compress(text.encode()))).decode()
|
|
16
|
+
|
|
17
|
+
await core.nodes(f'[ graph:node=(node1,) :data="{tenc}" ]')
|
|
18
|
+
await core.nodes(f'[ graph:node=(node2,) :data="{text}" ]')
|
|
19
|
+
|
|
20
|
+
q = 'graph:node=(node1,) return($lib.compression.bzip2.un($lib.base64.decode(:data)).decode())'
|
|
21
|
+
self.eq(text, await core.callStorm(q))
|
|
22
|
+
|
|
23
|
+
q = 'graph:node=(node2,) return($lib.base64.encode($lib.compression.bzip2.en((:data).encode())))'
|
|
24
|
+
self.eq(tenc, await core.callStorm(q))
|
|
25
|
+
|
|
26
|
+
await self.asyncraises(s_exc.StormRuntimeError, core.nodes('$lib.compression.bzip2.en(foo)'))
|
|
27
|
+
await self.asyncraises(s_exc.StormRuntimeError, core.nodes('$lib.compression.bzip2.un(foo)'))
|
|
28
|
+
|
|
29
|
+
async def test_storm_lib_bytes_gzip(self):
|
|
30
|
+
async with self.getTestCore() as core:
|
|
31
|
+
text = 'ohhai'
|
|
32
|
+
tenc = base64.urlsafe_b64encode((gzip.compress(text.encode()))).decode()
|
|
33
|
+
|
|
34
|
+
await core.nodes(f'[ graph:node=(node1,) :data="{tenc}" ]')
|
|
35
|
+
await core.nodes(f'[ graph:node=(node2,) :data="{text}" ]')
|
|
36
|
+
|
|
37
|
+
q = 'graph:node=(node1,) return($lib.compression.gzip.un($lib.base64.decode(:data)).decode())'
|
|
38
|
+
self.eq(text, await core.callStorm(q))
|
|
39
|
+
|
|
40
|
+
q = 'graph:node=(node2,) return($lib.compression.gzip.en((:data).encode()))'
|
|
41
|
+
self.eq(text.encode(), gzip.decompress(await core.callStorm(q)))
|
|
42
|
+
|
|
43
|
+
await self.asyncraises(s_exc.StormRuntimeError, core.nodes('$lib.compression.gzip.en(foo)'))
|
|
44
|
+
await self.asyncraises(s_exc.StormRuntimeError, core.nodes('$lib.compression.gzip.un(foo)'))
|
|
45
|
+
|
|
46
|
+
async def test_storm_lib_bytes_zlib(self):
|
|
47
|
+
async with self.getTestCore() as core:
|
|
48
|
+
text = 'ohhai'
|
|
49
|
+
tenc = base64.urlsafe_b64encode((zlib.compress(text.encode()))).decode()
|
|
50
|
+
|
|
51
|
+
await core.nodes(f'[ graph:node=(node1,) :data="{tenc}" ]')
|
|
52
|
+
await core.nodes(f'[ graph:node=(node2,) :data="{text}" ]')
|
|
53
|
+
|
|
54
|
+
q = 'graph:node=(node1,) return($lib.compression.zlib.un($lib.base64.decode(:data)).decode())'
|
|
55
|
+
self.eq(text, await core.callStorm(q))
|
|
56
|
+
|
|
57
|
+
q = 'graph:node=(node2,) return($lib.base64.encode($lib.compression.zlib.en((:data).encode())))'
|
|
58
|
+
self.eq(tenc, await core.callStorm(q))
|
|
59
|
+
|
|
60
|
+
await self.asyncraises(s_exc.StormRuntimeError, core.nodes('$lib.compression.zlib.en(foo)'))
|
|
61
|
+
await self.asyncraises(s_exc.StormRuntimeError, core.nodes('$lib.compression.zlib.un(foo)'))
|
|
@@ -17,7 +17,7 @@ class StormlibModelTest(s_test.SynTest):
|
|
|
17
17
|
q = '$val = $lib.model.type(bool).repr(1) [test:str=$val]'
|
|
18
18
|
nodes = await core.nodes(q)
|
|
19
19
|
self.len(1, nodes)
|
|
20
|
-
self.eq(nodes[0].ndef, ('test:str', '
|
|
20
|
+
self.eq(nodes[0].ndef, ('test:str', 'true'))
|
|
21
21
|
|
|
22
22
|
self.eq('inet:dns:a', await core.callStorm('return($lib.model.form(inet:dns:a).type.name)'))
|
|
23
23
|
self.eq('inet:ipv4', await core.callStorm('return($lib.model.prop(inet:dns:a:ipv4).type.name)'))
|
|
@@ -3877,9 +3877,9 @@ class StormTypesTest(s_test.SynTest):
|
|
|
3877
3877
|
msgs = await core.stormlist('trigger.list')
|
|
3878
3878
|
self.stormHasNoWarnErr(msgs)
|
|
3879
3879
|
trgs = ('iden en? async? cond object',
|
|
3880
|
-
'8af9a5b134d08fded3edb667f8d8bbc2
|
|
3881
|
-
'99b637036016dadd6db513552a1174b8
|
|
3882
|
-
'bc1cbf350d151bba5936e6654dd13ff5
|
|
3880
|
+
'8af9a5b134d08fded3edb667f8d8bbc2 true true tag:add inet:ipv4',
|
|
3881
|
+
'99b637036016dadd6db513552a1174b8 true false tag:add ',
|
|
3882
|
+
'bc1cbf350d151bba5936e6654dd13ff5 true false node:add inet:ipv4',
|
|
3883
3883
|
)
|
|
3884
3884
|
for m in trgs:
|
|
3885
3885
|
self.stormIsInPrint(m, msgs)
|
|
@@ -24,7 +24,7 @@ class TrigTest(s_t_utils.SynTest):
|
|
|
24
24
|
self.none(nodes[0].tags.get('foo'))
|
|
25
25
|
|
|
26
26
|
msgs = await core.stormlist('trigger.list')
|
|
27
|
-
self.stormIsInPrint('
|
|
27
|
+
self.stormIsInPrint('true true node:add inet:ipv4', msgs)
|
|
28
28
|
|
|
29
29
|
self.nn(await core.callStorm('return($lib.queue.gen(foo).pop(wait=$lib.true))'))
|
|
30
30
|
nodes = await core.nodes('inet:ipv4=1.2.3.4')
|
synapse/tests/test_lib_types.py
CHANGED
|
@@ -127,6 +127,8 @@ class TypesTest(s_t_utils.SynTest):
|
|
|
127
127
|
self.eq('foo.b_a_r.baz.', taxo.norm('foo.b-a-r.baz.')[0])
|
|
128
128
|
self.eq('foo.b_a_r.baz.', taxo.norm('foo. b a r .baz.')[0])
|
|
129
129
|
|
|
130
|
+
self.eq('foo.bar.baz', taxo.repr('foo.bar.baz.'))
|
|
131
|
+
|
|
130
132
|
with self.raises(s_exc.BadTypeValu):
|
|
131
133
|
taxo.norm('foo.---.baz')
|
|
132
134
|
|
|
@@ -183,8 +185,8 @@ class TypesTest(s_t_utils.SynTest):
|
|
|
183
185
|
|
|
184
186
|
self.raises(s_exc.BadTypeValu, t.norm, 'a')
|
|
185
187
|
|
|
186
|
-
self.eq(t.repr(1), '
|
|
187
|
-
self.eq(t.repr(0), '
|
|
188
|
+
self.eq(t.repr(1), 'true')
|
|
189
|
+
self.eq(t.repr(0), 'false')
|
|
188
190
|
|
|
189
191
|
async def test_comp(self):
|
|
190
192
|
async with self.getTestCore() as core:
|