wip

vertexproject · Sep 16, 2024 · 6b40360 · 6b40360
1 parent e38d1d5
commit 6b40360
Show file tree

Hide file tree

Showing 35 changed files with 32 additions and 6 deletions.
diff --git a/cortexes/model-0.2.28/axon/cell.guid b/cortexes/model-0.2.28/axon/cell.guid
@@ -1 +1 @@
-41ac59fe4d8a573eff07bf86e37b287c
+fa22e86b56ec1069d9ed2c6be38f2893
diff --git a/cortexes/model-0.2.28/axon/cookie.secret b/cortexes/model-0.2.28/axon/cookie.secret
@@ -1 +1 @@
-2b42456fd40a71db9f3df8af43847d89
+75b13263f5ebedf4de22bcb8325bbdd4
diff --git a/cortexes/model-0.2.28/axon/slabs/cell.lmdb/data.mdb b/cortexes/model-0.2.28/axon/slabs/cell.lmdb/data.mdb
diff --git a/cortexes/model-0.2.28/cell.guid b/cortexes/model-0.2.28/cell.guid
@@ -1 +1 @@
-530ae14cbf8757039ec1ef210e062223
+67fe008c2c95aa33e7a0a58c16b12aca
diff --git a/cortexes/model-0.2.28/cookie.secret b/cortexes/model-0.2.28/cookie.secret
@@ -1 +1 @@
-ff764804713b3c6453786d0c65f0b1c4
+132354ab573a20d5a49b90aec2a57e76
diff --git a/cortexes/model-0.2.28/jsonstor/cell.guid b/cortexes/model-0.2.28/jsonstor/cell.guid
@@ -1 +1 @@
-8736a2eda1fa31df596410d5dc3fc925
+fa264c7ecebd1b6862bc421d64fc10f7
diff --git a/cortexes/model-0.2.28/jsonstor/cookie.secret b/cortexes/model-0.2.28/jsonstor/cookie.secret
@@ -1 +1 @@
-690022f846334d6235490c384bf38665
+0bb1c7e86fd05da0259b5807d48bac90
diff --git a/cortexes/model-0.2.28/jsonstor/slabs/cell.lmdb/data.mdb b/cortexes/model-0.2.28/jsonstor/slabs/cell.lmdb/data.mdb
diff --git a/cortexes/model-0.2.28/layers/451a24aaa97c7cfb878299510628f41a/layer_v2.lmdb/data.mdb b/cortexes/model-0.2.28/layers/451a24aaa97c7cfb878299510628f41a/layer_v2.lmdb/data.mdb
diff --git a/...5ed139cab89df001f5037e/layer_v2.opts.yaml → ...7c7cfb878299510628f41a/layer_v2.opts.yaml b/...5ed139cab89df001f5037e/layer_v2.opts.yaml → ...7c7cfb878299510628f41a/layer_v2.opts.yaml
diff --git a/...39cab89df001f5037e/nodedata.lmdb/data.mdb → ...fb878299510628f41a/nodedata.lmdb/data.mdb b/...39cab89df001f5037e/nodedata.lmdb/data.mdb → ...fb878299510628f41a/nodedata.lmdb/data.mdb
diff --git a/...5ed139cab89df001f5037e/nodedata.opts.yaml → ...7c7cfb878299510628f41a/nodedata.opts.yaml b/...5ed139cab89df001f5037e/nodedata.opts.yaml → ...7c7cfb878299510628f41a/nodedata.opts.yaml
diff --git a/cortexes/model-0.2.28/layers/451a24aaa97c7cfb878299510628f41a/nodeedits.lmdb/data.mdb b/cortexes/model-0.2.28/layers/451a24aaa97c7cfb878299510628f41a/nodeedits.lmdb/data.mdb
diff --git a/...ed139cab89df001f5037e/nodeedits.opts.yaml → ...c7cfb878299510628f41a/nodeedits.opts.yaml b/...ed139cab89df001f5037e/nodeedits.opts.yaml → ...c7cfb878299510628f41a/nodeedits.opts.yaml
diff --git a/...39cab89df001f5037e/layer_v2.lmdb/data.mdb → ...3b177633292886cc56/layer_v2.lmdb/data.mdb b/...39cab89df001f5037e/layer_v2.lmdb/data.mdb → ...3b177633292886cc56/layer_v2.lmdb/data.mdb
diff --git a/...8f6cf4e75b4e0be744e4c2/layer_v2.opts.yaml → ...43233b177633292886cc56/layer_v2.opts.yaml b/...8f6cf4e75b4e0be744e4c2/layer_v2.opts.yaml → ...43233b177633292886cc56/layer_v2.opts.yaml
diff --git a/cortexes/model-0.2.28/layers/5194e5465843233b177633292886cc56/nodedata.lmdb/data.mdb b/cortexes/model-0.2.28/layers/5194e5465843233b177633292886cc56/nodedata.lmdb/data.mdb
diff --git a/...8f6cf4e75b4e0be744e4c2/nodedata.opts.yaml → ...43233b177633292886cc56/nodedata.opts.yaml b/...8f6cf4e75b4e0be744e4c2/nodedata.opts.yaml → ...43233b177633292886cc56/nodedata.opts.yaml
diff --git a/...9cab89df001f5037e/nodeedits.lmdb/data.mdb → ...b177633292886cc56/nodeedits.lmdb/data.mdb b/...9cab89df001f5037e/nodeedits.lmdb/data.mdb → ...b177633292886cc56/nodeedits.lmdb/data.mdb
diff --git a/...f6cf4e75b4e0be744e4c2/nodeedits.opts.yaml → ...3233b177633292886cc56/nodeedits.opts.yaml b/...f6cf4e75b4e0be744e4c2/nodeedits.opts.yaml → ...3233b177633292886cc56/nodeedits.opts.yaml
diff --git a/...f4e75b4e0be744e4c2/layer_v2.lmdb/data.mdb → ...dda67d3a3e1ebf70a2/layer_v2.lmdb/data.mdb b/...f4e75b4e0be744e4c2/layer_v2.lmdb/data.mdb → ...dda67d3a3e1ebf70a2/layer_v2.lmdb/data.mdb
diff --git a/...a013e1a2fb616202cc0cc/viewstate.opts.yaml → ...248bdda67d3a3e1ebf70a2/layer_v2.opts.yaml b/...a013e1a2fb616202cc0cc/viewstate.opts.yaml → ...248bdda67d3a3e1ebf70a2/layer_v2.opts.yaml
diff --git a/...f4e75b4e0be744e4c2/nodedata.lmdb/data.mdb → ...dda67d3a3e1ebf70a2/nodedata.lmdb/data.mdb b/...f4e75b4e0be744e4c2/nodedata.lmdb/data.mdb → ...dda67d3a3e1ebf70a2/nodedata.lmdb/data.mdb
diff --git a/...b117f038cb61662925831/viewstate.opts.yaml → ...248bdda67d3a3e1ebf70a2/nodedata.opts.yaml b/...b117f038cb61662925831/viewstate.opts.yaml → ...248bdda67d3a3e1ebf70a2/nodedata.opts.yaml
diff --git a/...4e75b4e0be744e4c2/nodeedits.lmdb/data.mdb → ...da67d3a3e1ebf70a2/nodeedits.lmdb/data.mdb b/...4e75b4e0be744e4c2/nodeedits.lmdb/data.mdb → ...da67d3a3e1ebf70a2/nodeedits.lmdb/data.mdb
diff --git a/cortexes/model-0.2.28/layers/93b5186d23248bdda67d3a3e1ebf70a2/nodeedits.opts.yaml b/cortexes/model-0.2.28/layers/93b5186d23248bdda67d3a3e1ebf70a2/nodeedits.opts.yaml
@@ -0,0 +1,2 @@
+--- {}
+...
diff --git a/cortexes/model-0.2.28/slabs/cell.lmdb/data.mdb b/cortexes/model-0.2.28/slabs/cell.lmdb/data.mdb
diff --git a/cortexes/model-0.2.28/slabs/nexuslog/seqn0000000000000000.lmdb/data.mdb b/cortexes/model-0.2.28/slabs/nexuslog/seqn0000000000000000.lmdb/data.mdb
diff --git a/...e1a2fb616202cc0cc/viewstate.lmdb/data.mdb → ...230b924342490291b/viewstate.lmdb/data.mdb b/...e1a2fb616202cc0cc/viewstate.lmdb/data.mdb → ...230b924342490291b/viewstate.lmdb/data.mdb
diff --git a/cortexes/model-0.2.28/views/039a8179e1b2794230b924342490291b/viewstate.opts.yaml b/cortexes/model-0.2.28/views/039a8179e1b2794230b924342490291b/viewstate.opts.yaml
@@ -0,0 +1,2 @@
+--- {}
+...
diff --git a/...f038cb61662925831/viewstate.lmdb/data.mdb → ...ec86ccbd30001a32f/viewstate.lmdb/data.mdb b/...f038cb61662925831/viewstate.lmdb/data.mdb → ...ec86ccbd30001a32f/viewstate.lmdb/data.mdb
diff --git a/cortexes/model-0.2.28/views/34d8a6a88388f52ec86ccbd30001a32f/viewstate.opts.yaml b/cortexes/model-0.2.28/views/34d8a6a88388f52ec86ccbd30001a32f/viewstate.opts.yaml
@@ -0,0 +1,2 @@
+--- {}
+...
diff --git a/cortexes/model-0.2.28/views/69dc8226d527df9580ca3a833c6f7007/viewstate.lmdb/data.mdb b/cortexes/model-0.2.28/views/69dc8226d527df9580ca3a833c6f7007/viewstate.lmdb/data.mdb
diff --git a/cortexes/model-0.2.28/views/69dc8226d527df9580ca3a833c6f7007/viewstate.opts.yaml b/cortexes/model-0.2.28/views/69dc8226d527df9580ca3a833c6f7007/viewstate.opts.yaml
@@ -0,0 +1,2 @@
+--- {}
+...
diff --git a/scripts/gen-0.2.28.py b/scripts/gen-0.2.28.py
@@ -158,6 +158,10 @@ async def main():
         infork00 = {'view': fork00}
         print(f'{fork00=}')
 
+        fork01 = await core.callStorm('return($lib.view.get().fork().iden)', opts=infork00)
+        infork01 = {'view': fork01}
+        print(f'{fork01=}')
+
         q = r'''
             // 22valid, 23valid
             [( it:prod:soft=(prod, 22v, 23v)
@@ -303,6 +307,20 @@ async def main():
         '''
         await core.callStorm(q, opts=infork00)
 
+        # Primary and v2_2 valid in lower layer, v2_2 invalid in fork
+        q = r'''
+            it:sec:cpe="cpe:2.3:a:01generator:pireospay:-:*:*:*:*:prestashop:*:*"
+            [ :v2_2 = "cpe:/a:01generator:pireospay\r\n:-::~~~prestashop~~" ]
+        '''
+        await core.callStorm(q, opts=infork01)
+
+        # Primary and v2_2 invalid in lower layer, v2_2 valid in fork
+        q = r'''
+            it:sec:cpe="cpe:2.3:a:openbsd:openssh:7.4\r\n:*:*:*:*:*:*:*"
+            [ :v2_2 = "cpe:/a:openbsd:openssh:7.4" ]
+        '''
+        await core.callStorm(q, opts=infork01)
+
     s_backup.backup(tmpdir, modldir)
 
 if __name__ == '__main__':