PLAT-566 - added santa prefilght parameters

portswigger-it · Sep 6, 2024 · 9df16c8 · 9df16c8
1 parent b915a91
commit 9df16c8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/santa/santa.go b/santa/santa.go
@@ -26,15 +26,19 @@ type Rule struct {
 
 // Preflight represents sync response sent to a Santa client by the sync server.
 type Preflight struct {
-	ClientMode            ClientMode `json:"client_mode" toml:"client_mode"`
-	BlockedPathRegex      string     `json:"blocked_path_regex" toml:"blocked_path_regex"`
-	AllowedPathRegex      string     `json:"allowed_path_regex" toml:"allowed_path_regex"`
-	BatchSize             int        `json:"batch_size" toml:"batch_size"`
-	EnableAllEventUpload  bool       `json:"enable_all_event_upload" toml:"enable_all_event_upload"`
 	EnableBundles         bool       `json:"enable_bundles" toml:"enable_bundles"`
 	EnableTransitiveRules bool       `json:"enable_transitive_rules" toml:"enable_transitive_rules"`
-	CleanSync             bool       `json:"clean_sync" toml:"clean_sync"`
+	BatchSize             int        `json:"batch_size" toml:"batch_size"`
 	FullSyncInterval      int        `json:"full_sync_interval" toml:"full_sync_interval"`
+	ClientMode            ClientMode `json:"client_mode" toml:"client_mode"`
+	AllowedPathRegex      string     `json:"allowed_path_regex" toml:"allowed_path_regex"`
+	BlockedPathRegex      string     `json:"blocked_path_regex" toml:"blocked_path_regex"`
+	BlockUsbMount		  bool		 `json:"block_usb_mount" toml:"block_usb_mount"`
+	RemountUsbMode		  string	 `json:"remount_usb_mode" toml:"remount_usb_mode"`
+	SyncType			  string	 `json:"sync_type" toml:"sync_type"`
+	OverrideFileAccessAction string  `json:"override_file_access_action,omitempty" toml:"override_file_access_action"`
+	// EnableAllEventUpload  bool       `json:"enable_all_event_upload" toml:"enable_all_event_upload"`
+	// CleanSync             bool       `json:"clean_sync" toml:"clean_sync"`
 }
 
 // A PreflightPayload represents the request sent by a santa client to the sync server.

diff --git a/santa/santa_test.go b/santa/santa_test.go
@@ -15,9 +15,9 @@ func TestConfigMarshalUnmarshal(t *testing.T) {
 		t.Errorf("have client_mode %d, want %d\n", have, want)
 	}
 
-	if have, want := conf.CleanSync, true; have != want {
-		t.Errorf("have clean_sync %t, want %t\n", have, want)
-	}
+	// if have, want := conf.CleanSync, true; have != want {
+	// 	t.Errorf("have clean_sync %t, want %t\n", have, want)
+	// }
 
 	if have, want := conf.FullSyncInterval, 600; have != want {
 		t.Errorf("have full_sync_interval %d, want %d\n", have, want)