Skip to content

Commit

Permalink
Change types of repeated args and envs fields (#1063)
Browse files Browse the repository at this point in the history
* Change types of repeated args and envs fields

* Update args and env testdata strings to base64

* Remove whitespace
  • Loading branch information
mlw authored Mar 31, 2023
1 parent 0fe6728 commit be87b3e
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions Source/common/santa.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions Source/santad/testdata/protobuf/v1/exec.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions Source/santad/testdata/protobuf/v2/exec.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions Source/santad/testdata/protobuf/v4/exec.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
10 changes: 5 additions & 5 deletions Source/santad/testdata/protobuf/v5/exec.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
10 changes: 5 additions & 5 deletions Source/santad/testdata/protobuf/v6/exec.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down

0 comments on commit be87b3e

Please sign in to comment.