Added a reformat button for the artifact editor (Velocidex#3087)

Also refactor column filters/sorters in paged table.
Genio40921 · Nov 10, 2023 · d22c46e · d22c46e
1 parent c1903af
commit d22c46e
Show file tree

Hide file tree

Showing 15 changed files with 646 additions and 239 deletions.
diff --git a/api/proto/notebooks.pb.go b/api/proto/notebooks.pb.go
diff --git a/api/proto/notebooks.proto b/api/proto/notebooks.proto
@@ -10,9 +10,9 @@ option go_package = "www.velocidex.com/golang/velociraptor/api/proto";
 
 message ReformatVQLMessage {
     string vql = 1;
+    string artifact = 2;
 }
 
-
 message Env {
     string key = 1;
     string value = 2;

diff --git a/api/reformat.go b/api/reformat.go
@@ -25,6 +25,17 @@ func (self *ApiServer) ReformatVQL(
 			"User is not allowed to read notebooks.")
 	}
 
+	if in.Artifact != "" {
+		manager, err := services.GetRepositoryManager(org_config_obj)
+		if err != nil {
+			return nil, Status(self.verbose, err)
+		}
+
+		reformated_vql, err := manager.ReformatVQL(ctx, in.Artifact)
+		return &api_proto.ReformatVQLMessage{
+			Artifact: reformated_vql,
+		}, Status(self.verbose, err)
+	}
 	notebook_manager, err := services.GetNotebookManager(org_config_obj)
 	if err != nil {
 		return nil, Status(self.verbose, err)

diff --git a/api/tables/table.go b/api/tables/table.go
@@ -18,6 +18,7 @@
 package tables
 
 import (
+	"io"
 	"regexp"
 	"time"
 
@@ -137,6 +138,10 @@ func getTable(
 
 	// Seek to the row we need.
 	err = rs_reader.SeekToRow(int64(in.StartRow))
+	if err == io.EOF {
+		return result, nil
+	}
+
 	if err != nil {
 		return nil, err
 	}

diff --git a/gui/velociraptor/src/components/artifacts/new-artifact.jsx b/gui/velociraptor/src/components/artifacts/new-artifact.jsx
@@ -61,6 +61,18 @@ export default class NewArtifactDialog extends React.Component {
             });
     }
 
+    reformatArtifact = ()=>{
+        this.setState({loading: true});
+        api.post("v1/ReformatVQL",
+                 {artifact: this.state.text}, this.source.token).then(
+                     response=>{
+                         if (response.data.artifact) {
+                             this.setState({text: response.data.artifact});
+                         };
+                         this.setState({loading: false});
+                     });
+    }
+
     aceConfig = (ace) => {
         // Attach a completer to ACE.
         let completer = new Completer();
@@ -113,6 +125,10 @@ export default class NewArtifactDialog extends React.Component {
                 <Navbar className="w-100 justify-content-between">
                 <ButtonGroup className="float-left">
                   <SettingsButton ace={this.state.ace}/>
+                  <Button variant="default"
+                          onClick={this.reformatArtifact}>
+                    <FontAwesomeIcon icon="indent"/>
+                  </Button>
                 </ButtonGroup>
 
                 <ButtonGroup className="float-right">

diff --git a/gui/velociraptor/src/components/core/api-service.jsx b/gui/velociraptor/src/components/core/api-service.jsx
@@ -53,8 +53,8 @@ function retryDelay(retryNumber = 0) {
 }
 
 function isRetryableError(error) {
-  return error.code !== 'ECONNABORTED' && (!error.response || (
-      error.response.status >= 500 && error.response.status <= 599));
+    return error.code !== 'ECONNABORTED' && (!error.response || (
+        error.response.status >= 500 && error.response.status <= 599));
 }
 
 function isNetworkError(error) {
@@ -82,6 +82,7 @@ function isNetworkOrIdempotentRequestError(error) {
 function simpleNetworkErrorCheck(error) {
   if ((error && error.message) === 'Network Error') {
     return true;
+
   } else {
       return isNetworkOrIdempotentRequestError(error);
   }

diff --git a/gui/velociraptor/src/components/core/paged-table.css b/gui/velociraptor/src/components/core/paged-table.css
@@ -28,10 +28,18 @@ table.paged-table-header:hover .sort-element {
     display: block;
 }
 
-table.paged-table-header .sort-element.visible {
+table.paged-table-header .sort-element {
     display: block;
 }
 
 tr.paged-table-header th {
     padding: 0;
 }
+
+table.paged-table-header .hidden-edit {
+    visibility: hidden;
+}
+
+table.paged-table-header:hover .hidden-edit {
+    visibility: visible;
+}