Improved eslint score (Velocidex#2642)

Also added DELETE_RESULTS permissions to allow finer control over who can delete results.
Genio40921 · Apr 25, 2023 · 3c0b3f1 · 3c0b3f1
1 parent 4b5d2fd
commit 3c0b3f1
Show file tree

Hide file tree

Showing 111 changed files with 630 additions and 481 deletions.
diff --git a/acls/acls.go b/acls/acls.go
@@ -114,6 +114,9 @@ const (
 	// Allowed to create zip files.
 	PREPARE_RESULTS
 
+	// Allowed to delete results from the server
+	DELETE_RESULTS
+
 	// Allowed raw datastore access
 	DATASTORE_ACCESS
 
@@ -171,6 +174,8 @@ func (self ACL_PERMISSION) String() string {
 		return "MACHINE_STATE"
 	case PREPARE_RESULTS:
 		return "PREPARE_RESULTS"
+	case DELETE_RESULTS:
+		return "DELETE_RESULTS"
 	case DATASTORE_ACCESS:
 		return "DATASTORE_ACCESS"
 
@@ -221,6 +226,8 @@ func GetPermission(name string) ACL_PERMISSION {
 		return MACHINE_STATE
 	case "PREPARE_RESULTS":
 		return PREPARE_RESULTS
+	case "DELETE_RESULTS":
+		return DELETE_RESULTS
 	case "DATASTORE_ACCESS":
 		return DATASTORE_ACCESS
 

diff --git a/acls/proto/acl.pb.go b/acls/proto/acl.pb.go
diff --git a/acls/proto/acl.proto b/acls/proto/acl.proto
@@ -45,6 +45,7 @@ message ApiClientACL {
     bool filesystem_write = 14;
     bool machine_state = 16;
     bool prepare_results = 17;
+    bool delete_results = 23;
     bool datastore_access = 18;
 
     // A list of roles in lieu of the permissions above. These will be

diff --git a/acls/roles.go b/acls/roles.go
@@ -33,6 +33,7 @@ var (
 		"FILESYSTEM_WRITE",
 		"MACHINE_STATE",
 		"PREPARE_RESULTS",
+		"DELETE_RESULTS",
 		"DATASTORE_ACCESS",
 	}
 )
@@ -101,6 +102,10 @@ func DescribePermissions(token *acl_proto.ApiClientACL) []string {
 		result = append(result, "PREPARE_RESULTS")
 	}
 
+	if token.DeleteResults {
+		result = append(result, "DELETE_RESULTS")
+	}
+
 	if token.DatastoreAccess {
 		result = append(result, "DATASTORE_ACCESS")
 	}
@@ -148,6 +153,8 @@ func SetTokenPermission(
 			token.MachineState = true
 		case "PREPARE_RESULTS":
 			token.PrepareResults = true
+		case "DELETE_RESULTS":
+			token.DeleteResults = true
 		case "DATASTORE_ACCESS":
 			token.DatastoreAccess = true
 
@@ -188,6 +195,7 @@ func GetRolePermissions(
 			result.FilesystemWrite = true
 			result.MachineState = true
 			result.PrepareResults = true
+			result.DeleteResults = true
 
 			// An administrator for the root org is allowed to
 			// manipulate orgs.

diff --git a/api/filesearch.go b/api/filesearch.go
@@ -200,7 +200,7 @@ func newMatcher(term, search_type string) (matcher, error) {
 		return &literal_matcher{[]byte(term)}, nil
 
 	case "regex":
-		re, err := regexp.Compile("(?i)" + term)
+		re, err := regexp.Compile("(?ism)" + term)
 		if err != nil {
 			return nil, err
 		}

diff --git a/api/proto/api.pb.gw.go b/api/proto/api.pb.gw.go
diff --git a/artifacts/testdata/server/testcases/orgs.out.yaml b/artifacts/testdata/server/testcases/orgs.out.yaml
@@ -55,7 +55,8 @@ SELECT Name, OrgId FROM orgs() ORDER BY OrgId[
    "filesystem_read": true,
    "filesystem_write": true,
    "machine_state": true,
-   "prepare_results": true
+   "prepare_results": true,
+   "delete_results": true
   }
  },
  {
@@ -89,7 +90,8 @@ SELECT Name, OrgId FROM orgs() ORDER BY OrgId[
    "filesystem_read": true,
    "filesystem_write": true,
    "machine_state": true,
-   "prepare_results": true
+   "prepare_results": true,
+   "delete_results": true
   }
  },
  {
@@ -161,7 +163,8 @@ SELECT Name, OrgId FROM orgs() ORDER BY OrgId[
    "filesystem_read": true,
    "filesystem_write": true,
    "machine_state": true,
-   "prepare_results": true
+   "prepare_results": true,
+   "delete_results": true
   }
  },
  {
@@ -214,7 +217,8 @@ SELECT Name, OrgId FROM orgs() ORDER BY OrgId[
    "filesystem_read": true,
    "filesystem_write": true,
    "machine_state": true,
-   "prepare_results": true
+   "prepare_results": true,
+   "delete_results": true
   }
  },
  {
@@ -284,7 +288,8 @@ SELECT Name, OrgId FROM orgs() ORDER BY OrgId[
    "filesystem_read": true,
    "filesystem_write": true,
    "machine_state": true,
-   "prepare_results": true
+   "prepare_results": true,
+   "delete_results": true
   }
  },
  {

diff --git a/artifacts/testdata/server/testcases/users.out.yaml b/artifacts/testdata/server/testcases/users.out.yaml
@@ -110,7 +110,8 @@ SELECT whoami() FROM scope()[
    "filesystem_read": true,
    "filesystem_write": true,
    "machine_state": true,
-   "prepare_results": true
+   "prepare_results": true,
+   "delete_results": true
   }
  }
 ]SELECT user_delete(user="TestUser", really_do_it=TRUE) FROM scope()[
@@ -149,7 +150,8 @@ SELECT whoami() FROM scope()[
    "filesystem_read": true,
    "filesystem_write": true,
    "machine_state": true,
-   "prepare_results": true
+   "prepare_results": true,
+   "delete_results": true
   }
  }
 ]SELECT user_delete(user="TestUser", really_do_it=TRUE, orgs="ORGID2") FROM scope()[

diff --git a/go.mod b/go.mod
@@ -102,7 +102,7 @@ require (
 	www.velocidex.com/golang/go-prefetch v0.0.0-20220801101854-338dbe61982a
 	www.velocidex.com/golang/oleparse v0.0.0-20230217092320-383a0121aafe
 	www.velocidex.com/golang/regparser v0.0.0-20221020153526-bbc758cbd18b
-	www.velocidex.com/golang/vfilter v0.0.0-20230413031155-cadd50f14c5d
+	www.velocidex.com/golang/vfilter v0.0.0-20230425012353-b6d0a982ca34
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -1265,7 +1265,7 @@ www.velocidex.com/golang/oleparse v0.0.0-20230217092320-383a0121aafe/go.mod h1:R
 www.velocidex.com/golang/regparser v0.0.0-20221020153526-bbc758cbd18b h1:NrnjFXwjUi7vdLEDKgSxu6cs304UJLZE/H7pSXXakVA=
 www.velocidex.com/golang/regparser v0.0.0-20221020153526-bbc758cbd18b/go.mod h1:pxSECT5mWM3goJ4sxB4HCJNKnKqiAlpyT8XnvBwkLGU=
 www.velocidex.com/golang/vfilter v0.0.0-20220103082604-85bb38175cb7/go.mod h1:eEFMhAmoFHWGCKF39j+iOhTH8REpqBndc3OsdPsxqo8=
-www.velocidex.com/golang/vfilter v0.0.0-20230413031155-cadd50f14c5d h1:4CIkMbS48+qG/Dhaziskfxlb6FyQ8PxL3KpquQQuNnM=
-www.velocidex.com/golang/vfilter v0.0.0-20230413031155-cadd50f14c5d/go.mod h1:4mDQuvnVu6oPvDu/rZm8eYXh0h8mM7j9CJpj1nRfu8g=
+www.velocidex.com/golang/vfilter v0.0.0-20230425012353-b6d0a982ca34 h1:Ww5wvoiNEzTzsGffZsCkc2uIwk1hAJJdNZcLHU7Ogsg=
+www.velocidex.com/golang/vfilter v0.0.0-20230425012353-b6d0a982ca34/go.mod h1:4mDQuvnVu6oPvDu/rZm8eYXh0h8mM7j9CJpj1nRfu8g=
 www.velocidex.com/golang/vtypes v0.0.0-20220816192452-6a27ae078f12 h1:8azOLd/l6sPy1/ug03ueA7jLfsVwE1sI3oHg9q/nkqQ=
 www.velocidex.com/golang/vtypes v0.0.0-20220816192452-6a27ae078f12/go.mod h1:gpuRaiyhcuPmZYvI/zw+rjlDXklR2ORaLQBuzCXe84o=
diff --git a/gui/velociraptor/.eslintrc.cjs b/gui/velociraptor/.eslintrc.cjs
@@ -1,5 +1,9 @@
 module.exports = {
-    env: { browser: true, node: true },
+    env: {
+        browser: true,
+        node: true,
+        es6: true,
+     },
     parser: "@babel/eslint-parser",
     parserOptions: {
         requireConfigFile: false,
@@ -31,5 +35,9 @@ module.exports = {
     rules: {
         // allows characters like <'`&^"
         "react/no-unescaped-entities": 0,
+        "no-extra-semi": 0,
+        "react/display-name": 0,
+        "no-empty": 0,
+        "no-unused-vars": ["error", { "args": "none" }],
     },
 };