Change types of repeated args and envs fields (#1063)

* Change types of repeated args and envs fields * Update args and env testdata strings to base64 * Remove whitespace
google · Mar 31, 2023 · be87b3e · be87b3e
1 parent 0fe6728
commit be87b3e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/Source/common/santa.proto b/Source/common/santa.proto
@@ -231,10 +231,10 @@ message Execution {
   optional FileInfo working_directory = 4;
 
   // List of process arguments
-  repeated string args = 5;
+  repeated bytes args = 5;
 
   // List of environment variables
-  repeated string envs = 6;
+  repeated bytes envs = 6;
 
   // List of file descriptors
   repeated FileDescriptor fds = 7;

diff --git a/Source/santad/testdata/protobuf/v1/exec.json b/Source/santad/testdata/protobuf/v1/exec.json
@@ -102,13 +102,13 @@
   }
  },
  "args": [
-  "exec_path",
-  "-l",
-  "--foo"
+  "ZXhlY19wYXRo",
+  "LWw=",
+  "LS1mb28="
  ],
  "envs": [
-  "ENV_PATH=/path/to/bin:/and/another",
-  "DEBUG=1"
+  "RU5WX1BBVEg9L3BhdGgvdG8vYmluOi9hbmQvYW5vdGhlcg==",
+  "REVCVUc9MQ=="
  ],
  "decision": "DECISION_ALLOW",
  "reason": "REASON_BINARY",

diff --git a/Source/santad/testdata/protobuf/v2/exec.json b/Source/santad/testdata/protobuf/v2/exec.json
@@ -130,13 +130,13 @@
   }
  },
  "args": [
-  "exec_path",
-  "-l",
-  "--foo"
+  "ZXhlY19wYXRo",
+  "LWw=",
+  "LS1mb28="
  ],
  "envs": [
-  "ENV_PATH=/path/to/bin:/and/another",
-  "DEBUG=1"
+  "RU5WX1BBVEg9L3BhdGgvdG8vYmluOi9hbmQvYW5vdGhlcg==",
+  "REVCVUc9MQ=="
  ],
  "decision": "DECISION_ALLOW",
  "reason": "REASON_BINARY",

diff --git a/Source/santad/testdata/protobuf/v4/exec.json b/Source/santad/testdata/protobuf/v4/exec.json
@@ -163,13 +163,13 @@
   }
  },
  "args": [
-  "exec_path",
-  "-l",
-  "--foo"
+  "ZXhlY19wYXRo",
+  "LWw=",
+  "LS1mb28="
  ],
  "envs": [
-  "ENV_PATH=/path/to/bin:/and/another",
-  "DEBUG=1"
+  "RU5WX1BBVEg9L3BhdGgvdG8vYmluOi9hbmQvYW5vdGhlcg==",
+  "REVCVUc9MQ=="
  ],
  "fds": [
   {

diff --git a/Source/santad/testdata/protobuf/v5/exec.json b/Source/santad/testdata/protobuf/v5/exec.json
@@ -163,13 +163,13 @@
   }
  },
  "args": [
-  "exec_path",
-  "-l",
-  "--foo"
+  "ZXhlY19wYXRo",
+  "LWw=",
+  "LS1mb28="
  ],
  "envs": [
-  "ENV_PATH=/path/to/bin:/and/another",
-  "DEBUG=1"
+  "RU5WX1BBVEg9L3BhdGgvdG8vYmluOi9hbmQvYW5vdGhlcg==",
+  "REVCVUc9MQ=="
  ],
  "fds": [
   {

diff --git a/Source/santad/testdata/protobuf/v6/exec.json b/Source/santad/testdata/protobuf/v6/exec.json
@@ -163,13 +163,13 @@
   }
  },
  "args": [
-  "exec_path",
-  "-l",
-  "--foo"
+  "ZXhlY19wYXRo",
+  "LWw=",
+  "LS1mb28="
  ],
  "envs": [
-  "ENV_PATH=/path/to/bin:/and/another",
-  "DEBUG=1"
+  "RU5WX1BBVEg9L3BhdGgvdG8vYmluOi9hbmQvYW5vdGhlcg==",
+  "REVCVUc9MQ=="
  ],
  "fds": [
   {