Bugfix: Notebook cell type selector not working (#4650)

scudette · snyk-bot · web-flow · commit 3114992e36c2 · 2026-02-09T22:46:16.000+10:00
Also: * Upload Function/Plugin Minimum Filesize Bug * Page the notebook overview table when there are many cells in the notebook. Fixes: #4643 #4642 --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io>
diff --git a/artifacts/testdata/server/testcases/artifacts.out.yaml b/artifacts/testdata/server/testcases/artifacts.out.yaml
@@ -89,7 +89,7 @@ Output: [
    "timeout": 0,
    "max_rows": 0,
    "max_logs": 0,
-   "max_upload_bytes": 0,
+   "max_upload_bytes": 1073741824,
    "trace_freq_sec": 0,
    "allow_custom_overrides": false,
    "log_batch_time": 0,
@@ -137,7 +137,7 @@ Output: [
    "timeout": 0,
    "max_rows": 0,
    "max_logs": 0,
-   "max_upload_bytes": 0,
+   "max_upload_bytes": 1073741824,
    "trace_freq_sec": 0,
    "allow_custom_overrides": false,
    "log_batch_time": 0,
diff --git a/artifacts/testdata/server/testcases/clients.out.yaml b/artifacts/testdata/server/testcases/clients.out.yaml
@@ -119,7 +119,7 @@ Output: [
     "timeout": 0,
     "max_rows": 0,
     "max_logs": 0,
-    "max_upload_bytes": 0,
+    "max_upload_bytes": 1073741824,
     "trace_freq_sec": 0,
     "allow_custom_overrides": false,
     "log_batch_time": 0,
diff --git a/artifacts/testdata/server/testcases/users.out.yaml b/artifacts/testdata/server/testcases/users.out.yaml
@@ -260,7 +260,9 @@ Output: [
    "lang": "fr",
    "default_password": "foobar",
    "options": "{\n  \"selectionStyle\":\"line\",\n  \"highlightActiveLine\":true,\n  \"highlightSelectedWord\":true,\n  \"copyWithEmptySelection\":false,\n  \"cursorStyle\":\"ace\",\n  \"mergeUndoDeltas\":true,\n  \"behavioursEnabled\":true,\n  \"wrapBehavioursEnabled\":true,\n  \"showLineNumbers\":true,\n  \"relativeLineNumbers\":true,\n  \"hScrollBarAlwaysVisible\":false,\n  \"vScrollBarAlwaysVisible\":false,\n  \"highlightGutterLine\":true,\n  \"animatedScroll\":false,\n  \"showInvisibles\":false,\n  \"showPrintMargin\":true,\n  \"printMarginColumn\":80,\n  \"printMargin\":80,\n  \"fadeFoldWidgets\":false,\n  \"showFoldWidgets\":true,\n  \"displayIndentGuides\":true,\n  \"showGutter\":true,\n  \"fontSize\":15,\n  \"fontFamily\":\"monospace\",\n  \"scrollPastEnd\":0,\n  \"theme\":\"ace/theme/xcode\",\n  \"useTextareaForIME\":true,\n  \"scrollSpeed\":2,\n  \"dragDelay\":0,\n  \"dragEnabled\":true,\n  \"focusTimeout\":0,\n  \"tooltipFollowsMouse\":true,\n  \"firstLineNumber\":1,\n  \"overwrite\":false,\n  \"newLineMode\":\"auto\",\n  \"useSoftTabs\":true,\n  \"navigateWithinSoftTabs\":false,\n  \"tabSize\":2,\n  \"wrap\":\"free\",\n  \"indentedSoftWrap\":true,\n  \"foldStyle\":\"markbegin\",\n  \"enableMultiselect\":true,\n  \"enableBlockSelect\":true,\n  \"enableEmmet\":true,\n  \"enableBasicAutocompletion\":true,\n  \"enableLiveAutocompletion\":true}",
-   "customizations": {},
+   "customizations": {
+    "hunt_expiry_hours": 168
+   },
    "links": [
     {
      "text": "Foobar",
diff --git a/bin/binary_test.go b/bin/binary_test.go
@@ -186,7 +186,7 @@ func TestProgressTimeout(t *testing.T) {
 		"--config", config_file.Name(),
 		"artifacts", "collect", "Sleep", "-v", "--progress_timeout", "0.1")
 	out, err := cmd.CombinedOutput()
-	require.NoError(t, err, string(out))
+	require.Error(t, err, string(out))
 	assert.Regexp(t, "Starting collection of Sleep", string(out))
 
 	// Make sure the collection timed out and dumped the goroutines.
diff --git a/config/migration.go b/config/migration.go
@@ -182,10 +182,15 @@ func migrate_0_6_1(config_obj *config_proto.Config) {
 	}
 
 	if config_obj.Defaults == nil {
-		config_obj.Defaults = &config_proto.Defaults{
-			HuntExpiryHours:        24 * 7,
-			NotebookCellTimeoutMin: 10,
-		}
+		config_obj.Defaults = &config_proto.Defaults{}
+	}
+
+	if config_obj.Defaults.HuntExpiryHours == 0 {
+		config_obj.Defaults.HuntExpiryHours = 24 * 7
+	}
+
+	if config_obj.Defaults.NotebookCellTimeoutMin == 0 {
+		config_obj.Defaults.NotebookCellTimeoutMin = 10
 	}
 }
 
diff --git a/file_store/uploader/uploader.go b/file_store/uploader/uploader.go
@@ -87,9 +87,14 @@ loop:
 
 		default:
 			n, err := reader.Read(buf)
-			if n == 0 || err == io.EOF {
+			if err != nil && err != io.EOF {
 				break loop
 			}
+
+			if n == 0 {
+				break loop
+			}
+
 			data := buf[:n]
 
 			_, err = out_fd.Write(data)
diff --git a/flows/client_flow_runner_test.go b/flows/client_flow_runner_test.go
@@ -442,6 +442,7 @@ func (self *ServerTestSuite) TestForeman() {
 	// The hunt will launch the Generic.Client.Info on the client.
 	expected := api.MakeCollectorRequest(
 		self.client_id, "Generic.Client.Info")
+	expected.MaxUploadBytes = 1073741824
 
 	hunt_dispatcher, err := services.GetHuntDispatcher(self.ConfigObj)
 	assert.NoError(self.T(), err)
diff --git a/gui/velociraptor/package-lock.json b/gui/velociraptor/package-lock.json
diff --git a/gui/velociraptor/package.json b/gui/velociraptor/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "type": "module",
     "dependencies": {
-        "@babel/runtime": "^7.28.4",
+        "@babel/runtime": "^7.28.6",
         "@fortawesome/fontawesome-svg-core": "6.7.2",
         "@fortawesome/free-regular-svg-icons": "6.7.2",
         "@fortawesome/free-solid-svg-icons": "^6.7.2",
diff --git a/gui/velociraptor/src/components/docs/doc-button.jsx b/gui/velociraptor/src/components/docs/doc-button.jsx
@@ -165,7 +165,7 @@ class HelpDialog extends Component {
     }
 
     searchTag = tag=>{
-        this.setState({query: "tags:" + tag + " " + this.state.query});
+        this.setState({query: "+tags:" + tag + " " + this.state.query});
     }
 
 
diff --git a/gui/velociraptor/src/components/notebooks/notebook-cell-renderer.jsx b/gui/velociraptor/src/components/notebooks/notebook-cell-renderer.jsx
@@ -1019,9 +1019,9 @@ export default class NotebookCellRenderer extends React.Component {
 
                 <FormControl as="select"
                              value={this.state.cell.type}
-                             onChange={() => {
+                             onChange={x=> {
                                  let cell = this.state.cell;
-                                 cell.type = this.element.value;
+                                 cell.type = x.currentTarget.value;
                                  this.setState({cell: cell});
                              }} >
                   { _.map(cell_types, (v, idx) => {
diff --git a/gui/velociraptor/src/components/notebooks/notebook-navigator.jsx b/gui/velociraptor/src/components/notebooks/notebook-navigator.jsx
@@ -52,6 +52,9 @@ class NotebookNavigator extends Component {
     }
 
     render() {
+        let md = (this.props.notebook &&
+                  this.props.notebook.cell_metadata) || [];
+
         return (
             <div className="float-left navigator">
               <div
@@ -89,9 +92,9 @@ class NotebookNavigator extends Component {
                     </li>
                     <span className="notebook-outline">
                       <VeloTable
-                        rows={this.props.notebook.cell_metadata}
+                        rows={md}
                         columns={["cell_id", "timestamp", "type", "summary"]}
-                        no_toolbar={true}
+                        no_toolbar={md.length < 10}
                         header_renderers={{"cell_id": T("Cell"),
                                            "timestamp": T("Timestamp"),
                                            "type": T("Type")}}
diff --git a/services/launcher/launcher.go b/services/launcher/launcher.go
@@ -355,6 +355,12 @@ func (self *Launcher) CompileCollectorArgs(
 		collector_request.MaxUploadBytes = max_upload_bytes
 	}
 
+	// Enforce a max upload limit if it is not specified by anything
+	// else.
+	if collector_request.MaxUploadBytes == 0 {
+		collector_request.MaxUploadBytes = 1024 * 1024 * 1024 // 1Gb
+	}
+
 	if collector_request.Timeout == 0 {
 		collector_request.Timeout = timeout
 	}
diff --git a/services/server_artifacts/fixtures/TestMultiSource.golden b/services/server_artifacts/fixtures/TestMultiSource.golden
@@ -6,7 +6,8 @@
   "client_id": "server",
   "artifacts": [
    "TestMultiSource"
-  ]
+  ],
+  "max_upload_bytes": 1073741824
  },
  "create_time": 10000000,
  "start_time": 10000000,
diff --git a/services/server_artifacts/fixtures/TestMultiSourceSerial.golden b/services/server_artifacts/fixtures/TestMultiSourceSerial.golden
@@ -6,7 +6,8 @@
   "client_id": "server",
   "artifacts": [
    "TestMultiSourceSerial"
-  ]
+  ],
+  "max_upload_bytes": 1073741824
  },
  "create_time": 10000000,
  "start_time": 10000000,
diff --git a/vql/server/downloads/fixtures/TestExportCollectionServerArtifact.golden b/vql/server/downloads/fixtures/TestExportCollectionServerArtifact.golden
@@ -12,7 +12,8 @@
    "client_id": "server",
    "artifacts": [
     "TestArtifact"
-   ]
+   ],
+   "max_upload_bytes": 1073741824
   },
   "create_time": 10000000,
   "start_time": 10000000,
@@ -108,7 +109,8 @@
        "max_row": 1000
       }
      ],
-     "log_batch_time": 100
+     "log_batch_time": 100,
+     "max_upload_bytes": 1073741824
     }
    }
   ]
diff --git a/vql/server/downloads/fixtures/TestExportHunt.golden b/vql/server/downloads/fixtures/TestExportHunt.golden
@@ -234,6 +234,7 @@
    "artifacts": [
     "Custom.TestArtifactUpload"
    ],
+   "max_upload_bytes": "1073741824",
    "compiled_collector_args": [
     {
      "query_id": "1",
diff --git a/vql/server/hunts/fixtures/TestCreateHunt.golden b/vql/server/hunts/fixtures/TestCreateHunt.golden
@@ -14,6 +14,7 @@
     "artifacts": [
      "Test.Artifact"
     ],
+    "max_upload_bytes": "1073741824",
     "compiled_collector_args": [
      {
       "query_id": "1",
@@ -54,6 +55,7 @@
     "artifacts": [
      "Test.Artifact"
     ],
+    "max_upload_bytes": "1073741824",
     "compiled_collector_args": [
      {
       "query_id": "1",
@@ -94,6 +96,7 @@
     "artifacts": [
      "Test.Artifact"
     ],
+    "max_upload_bytes": "1073741824",
     "compiled_collector_args": [
      {
       "query_id": "1",
@@ -134,6 +137,7 @@
     "artifacts": [
      "Test.Artifact"
     ],
+    "max_upload_bytes": "1073741824",
     "compiled_collector_args": [
      {
       "query_id": "1",
@@ -179,6 +183,7 @@
     "artifacts": [
      "Test.Artifact"
     ],
+    "max_upload_bytes": "1073741824",
     "compiled_collector_args": [
      {
       "query_id": "1",
@@ -217,6 +222,7 @@
     "artifacts": [
      "Test.Artifact"
     ],
+    "max_upload_bytes": "1073741824",
     "compiled_collector_args": [
      {
       "query_id": "1",
diff --git a/vql/server/monitoring/fixtures/TestAddServerMonitoring.golden b/vql/server/monitoring/fixtures/TestAddServerMonitoring.golden
@@ -16,11 +16,13 @@
      ]
     }
    }
-  ]
+  ],
+  "max_upload_bytes": 1073741824
  },
  "Removing artifact from label": {
   "artifacts": [
    "Server.Monitor.Health"
-  ]
+  ],
+  "max_upload_bytes": 1073741824
  }
 }
diff --git a/vql/tools/collector/fixtures/TestCollectionWithArtifacts.golden b/vql/tools/collector/fixtures/TestCollectionWithArtifacts.golden
@@ -68,7 +68,8 @@
       ]
      }
     }
-   ]
+   ],
+   "max_upload_bytes": 1073741824
   },
   "create_time": 1602103388000000000,
   "total_collected_rows": 1,
diff --git a/vql/tools/collector/fixtures/TestCollectionWithTypes.golden b/vql/tools/collector/fixtures/TestCollectionWithTypes.golden
@@ -102,7 +102,8 @@
       ]
      }
     }
-   ]
+   ],
+   "max_upload_bytes": 1073741824
   },
   "create_time": 1602103388000000000,
   "total_collected_rows": 1,
diff --git a/vql/tools/collector/fixtures/TestCollectionWithUpload.golden b/vql/tools/collector/fixtures/TestCollectionWithUpload.golden
@@ -90,7 +90,7 @@
     "message": "Query Stats: {\"RowsScanned\":2,\"PluginsCalled\":1,\"FunctionsCalled\":4,\"ProtocolSearch\":0,\"ScopeCopy\":6}\n"
    }
   ],
-  "collection_context.json": "{\n \"session_id\": \"F.1234\",\n \"request\": {\n  \"artifacts\": [\n   \"Custom.TestArtifactUpload\"\n  ]\n },\n \"create_time\": 1602103388000000000,\n \"total_uploaded_files\": 3,\n \"total_expected_uploaded_bytes\": 11,\n \"total_uploaded_bytes\": 11,\n \"total_collected_rows\": 1,\n \"total_logs\": 3,\n \"total_requests\": 1,\n \"state\": 2,\n \"artifacts_with_results\": [\n  \"Custom.TestArtifactUpload\"\n ],\n \"query_stats\": [\n  {\n   \"names_with_response\": [\n    \"Custom.TestArtifactUpload\"\n   ],\n   \"log_rows\": 3,\n   \"result_rows\": 1\n  }\n ]\n}",
+  "collection_context.json": "{\n \"session_id\": \"F.1234\",\n \"request\": {\n  \"artifacts\": [\n   \"Custom.TestArtifactUpload\"\n  ],\n  \"max_upload_bytes\": 1073741824\n },\n \"create_time\": 1602103388000000000,\n \"total_uploaded_files\": 3,\n \"total_expected_uploaded_bytes\": 11,\n \"total_uploaded_bytes\": 11,\n \"total_collected_rows\": 1,\n \"total_logs\": 3,\n \"total_requests\": 1,\n \"state\": 2,\n \"artifacts_with_results\": [\n  \"Custom.TestArtifactUpload\"\n ],\n \"query_stats\": [\n  {\n   \"names_with_response\": [\n    \"Custom.TestArtifactUpload\"\n   ],\n   \"log_rows\": 3,\n   \"result_rows\": 1\n  }\n ]\n}",
   "requests.json": "{\n \"items\": [\n  {\n   \"session_id\": \"F.1234\",\n   \"request_id\": 1,\n   \"VQLClientAction\": {\n    \"query_id\": 1,\n    \"total_queries\": 1,\n    \"Query\": [\n     {\n      \"VQL\": \"LET Custom_TestArtifactUpload_0_0 = SELECT upload(file=\\\"hello world\\\", accessor=\\\"data\\\", name=\\\"file.db\\\") AS Upload, upload(file=pathspec(Path='[{\\\"length\\\":5,\\\"offset\\\":0},{\\\"length\\\":3,\\\"offset\\\":10}]', DelegateAccessor=\\\"data\\\", DelegatePath=\\\"This is a bit of text\\\"), accessor=\\\"sparse\\\", name=pathspec(Path=\\\"C:/file.sparse.txt\\\", path_type=\\\"windows\\\")) AS SparseUpload FROM scope()\"\n     },\n     {\n      \"Name\": \"Custom.TestArtifactUpload\",\n      \"VQL\": \"SELECT * FROM Custom_TestArtifactUpload_0_0\"\n     }\n    ],\n    \"max_row\": 1000\n   }\n  }\n ]\n}",
   "custom_artifacts.json": [
    {
diff --git a/vql/tools/process/fixtures/ProcessTrackerMemoryTest_TestProcessTracker.golden b/vql/tools/process/fixtures/ProcessTrackerMemoryTest_TestProcessTracker.golden
diff --git a/vql/tools/process/tracker_test.go b/vql/tools/process/tracker_test.go

Original file line number	Diff line number	Diff line change
`@@ -182,10 +182,15 @@ func migrate_0_6_1(config_obj *config_proto.Config) {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if config_obj.Defaults == nil {`
`185`		`- config_obj.Defaults = &config_proto.Defaults{`
`186`		`- HuntExpiryHours: 24 * 7,`
`187`		`- NotebookCellTimeoutMin: 10,`
`188`		`- }`
	`185`	`+ config_obj.Defaults = &config_proto.Defaults{}`
	`186`	`+ }`
	`187`	`+`
	`188`	`+ if config_obj.Defaults.HuntExpiryHours == 0 {`
	`189`	`+ config_obj.Defaults.HuntExpiryHours = 24 * 7`
	`190`	`+ }`
	`191`	`+`
	`192`	`+ if config_obj.Defaults.NotebookCellTimeoutMin == 0 {`
	`193`	`+ config_obj.Defaults.NotebookCellTimeoutMin = 10`
`189`	`194`	`}`
`190`	`195`	`}`
`191`	`196`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ class HelpDialog extends Component {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`searchTag = tag=>{`
`168`		`- this.setState({query: "tags:" + tag + " " + this.state.query});`
	`168`	`+ this.setState({query: "+tags:" + tag + " " + this.state.query});`
`169`	`169`	`}`
`170`	`170`
`171`	`171`