Bugfix: Update index when processing automated client metadata (#3586)

Also support tool editor in notebook markdown.
Velocidex · Jul 4, 2024 · b22f131 · b22f131
1 parent 3cf92a9
commit b22f131
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 9 deletions.
diff --git a/artifacts/definitions/Server/Utils/CreateCollector.yaml b/artifacts/definitions/Server/Utils/CreateCollector.yaml
@@ -17,6 +17,8 @@ parameters:
       - Windows_x86
       - Linux
       - MacOS
+      - MacOSArm
+      - Generic
 
   - name: artifacts
     description: A list of artifacts to collect

diff --git a/gui/velociraptor/src/components/artifacts/reporting.css b/gui/velociraptor/src/components/artifacts/reporting.css
@@ -2,6 +2,14 @@
     width: fit-content;
 }
 
+.report-viewer {
+    min-height: 10px;
+}
+
+.report-viewer:hover {
+    cursor: pointer;
+}
+
 .report-viewer h1 {
         font-size: 24px;
         margin-top: 1rem;

diff --git a/gui/velociraptor/src/components/artifacts/reporting.jsx b/gui/velociraptor/src/components/artifacts/reporting.jsx
@@ -166,7 +166,8 @@ export default class VeloReportViewer extends React.Component {
                     } catch(e) {};
                 }
 
-                if (domNode.name === "velo-csv-viewer") {
+                if (domNode.name === "velo-csv-viewer" ||
+                    domNode.name === "grr-csv-viewer") {
                     // Figure out where the data is: attribs.value is something like data['table2']
                     let re = /'([^']+)'/;
                     let value = decodeURIComponent(domNode.attribs.value || "");
@@ -192,7 +193,8 @@ export default class VeloReportViewer extends React.Component {
                     }
                 };
 
-                if (domNode.name === "velo-tool-viewer") {
+                if (domNode.name === "velo-tool-viewer" ||
+                    domNode.name === "grr-tool-viewer") {
                     let name = decodeURIComponent(domNode.attribs.name ||"");
                     let tool_version = decodeURIComponent(
                         domNode.attribs.version ||"");
@@ -203,20 +205,23 @@ export default class VeloReportViewer extends React.Component {
                     );
                 };
 
-                if (domNode.name === "velo-timeline") {
+                if (domNode.name === "velo-timeline" ||
+                    domNode.name === "grr-timeline") {
                     let name = decodeURIComponent(domNode.attribs.name ||"");
                     return (
                         <Timeline name={name}/>
                     );
                 };
 
-                if (domNode.name === "velo-value") {
+                if (domNode.name === "velo-value" ||
+                    domNode.name === "grr-value") {
                     let value = decodeURIComponent(domNode.attribs.value || "");
                     return <VeloValueRenderer value={value}/>;
 
                 };
 
-                if (domNode.name === "velo-line-chart") {
+                if (domNode.name === "velo-line-chart" ||
+                    domNode.name === "grr-line-chart") {
                     // Figure out where the data is: attribs.value is
                     // something like data['table2']
                     let re = /'([^']+)'/;

diff --git a/gui/velociraptor/src/components/notebooks/notebook-report-renderer.jsx b/gui/velociraptor/src/components/notebooks/notebook-report-renderer.jsx
@@ -77,6 +77,7 @@ export default class NotebookReportRenderer extends React.Component {
 
         switch  (domNode.name) {
         case "velo-line-chart":
+        case "grr-line-chart":
                     return <VeloLineChart data={rows}
                                           columns={data.Columns}
                                           params={parse_param(domNode)} />;
@@ -133,12 +134,14 @@ export default class NotebookReportRenderer extends React.Component {
                     };
                 }
 
-                if (domNode.name === "velo-value") {
+                if (domNode.name === "velo-value" ||
+                    domNode.name === "grr-value") {
                     let value = decodeURIComponent(domNode.attribs.value || "");
                     return <VeloValueRenderer value={value}/>;
                 };
 
-                if (domNode.name === "velo-timeline") {
+                if (domNode.name === "velo-timeline" ||
+                    domNode.name === "grr-timeline") {
                     let name = decodeURIComponent(domNode.attribs.name || "");
                     return (
                         <TimelineRenderer
@@ -148,7 +151,8 @@ export default class NotebookReportRenderer extends React.Component {
                     );
                 };
 
-                if (domNode.name ===  "velo-tool-viewer") {
+                if (domNode.name ===  "velo-tool-viewer"||
+                    domNode.name === "grr-tool-viewer") {
                     let name = decodeURIComponent(domNode.attribs.name ||"");
                     let tool_version = decodeURIComponent(
                         domNode.attribs.version ||"");
@@ -157,7 +161,8 @@ export default class NotebookReportRenderer extends React.Component {
                 };
 
                 // A tag that loads a table from a notebook cell.
-                if (domNode.name === "velo-csv-viewer") {
+                if (domNode.name === "velo-csv-viewer" ||
+                    domNode.name === "grr-csv-viewer") {
                     try {
                         return (
                             <NotebookTableRenderer

diff --git a/reporting/gui.go b/reporting/gui.go
@@ -641,6 +641,12 @@ func NewBlueMondayPolicy() *bluemonday.Policy {
 	// DATA urls are useful for markdown cells
 	p.AllowURLSchemes("http", "https", "data")
 
+	// Deprecated but may still appear in older notebooks.
+	p.AllowAttrs("value", "params").OnElements("grr-csv-viewer")
+	p.AllowAttrs("value", "params").OnElements("grr-line-chart")
+	p.AllowAttrs("name", "params").OnElements("grr-timeline")
+	p.AllowAttrs("name", "version").OnElements("grr-tool-viewer")
+
 	// Directives for the GUI.
 	p.AllowAttrs("value", "params").OnElements("velo-csv-viewer")
 	p.AllowAttrs("value", "params").OnElements("inline-table-viewer")