Merge branch 'main' into signing-id-log

google · Jul 10, 2024 · f2a8162 · f2a8162
2 parents 5d4543d + 208b4a6
commit f2a8162
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/Source/santasyncservice/SNTSyncEventUpload.mm b/Source/santasyncservice/SNTSyncEventUpload.mm
@@ -56,6 +56,8 @@ - (BOOL)sync {
 - (BOOL)uploadEvents:(NSArray *)events {
   google::protobuf::Arena arena;
   auto req = google::protobuf::Arena::Create<::pbv1::EventUploadRequest>(&arena);
+  req->set_machine_id(NSStringToUTF8String(self.syncState.machineID));
+
   google::protobuf::RepeatedPtrField<::pbv1::Event> *uploadEvents = req->mutable_events();
 
   NSMutableSet *eventIds = [NSMutableSet setWithCapacity:events.count];

diff --git a/Source/santasyncservice/SNTSyncPostflight.mm b/Source/santasyncservice/SNTSyncPostflight.mm
@@ -18,12 +18,15 @@
 
 #import "Source/common/SNTSyncConstants.h"
 #import "Source/common/SNTXPCControlInterface.h"
+#import "Source/common/String.h"
 #import "Source/santasyncservice/SNTSyncState.h"
 
 #include <google/protobuf/arena.h>
 #include "Source/santasyncservice/syncv1.pb.h"
 namespace pbv1 = ::santa::sync::v1;
 
+using santa::NSStringToUTF8String;
+
 @implementation SNTSyncPostflight
 
 - (NSURL *)stageURL {
@@ -34,6 +37,7 @@ - (NSURL *)stageURL {
 - (BOOL)sync {
   google::protobuf::Arena arena;
   auto req = google::protobuf::Arena::Create<::pbv1::PostflightRequest>(&arena);
+  req->set_machine_id(NSStringToUTF8String(self.syncState.machineID));
   req->set_rules_received(self.syncState.rulesReceived);
   req->set_rules_processed(self.syncState.rulesProcessed);
 

diff --git a/Source/santasyncservice/SNTSyncPreflight.mm b/Source/santasyncservice/SNTSyncPreflight.mm
@@ -76,6 +76,7 @@ - (NSURL *)stageURL {
 - (BOOL)sync {
   google::protobuf::Arena arena;
   auto req = google::protobuf::Arena::Create<::pbv1::PreflightRequest>(&arena);
+  req->set_machine_id(NSStringToUTF8String(self.syncState.machineID));
   req->set_serial_number(NSStringToUTF8String([SNTSystemInfo serialNumber]));
   req->set_hostname(NSStringToUTF8String([SNTSystemInfo longHostname]));
   req->set_os_version(NSStringToUTF8String([SNTSystemInfo osVersion]));

diff --git a/Source/santasyncservice/SNTSyncRuleDownload.mm b/Source/santasyncservice/SNTSyncRuleDownload.mm
@@ -29,6 +29,7 @@
 #include "Source/santasyncservice/syncv1.pb.h"
 namespace pbv1 = ::santa::sync::v1;
 
+using santa::NSStringToUTF8String;
 using santa::StringToNSString;
 
 SNTRuleCleanup SyncTypeToRuleCleanup(SNTSyncType syncType) {
@@ -104,6 +105,8 @@ - (BOOL)sync {
 
   do {
     auto req = google::protobuf::Arena::Create<::pbv1::RuleDownloadRequest>(&arena);
+    req->set_machine_id(NSStringToUTF8String(self.syncState.machineID));
+
     if (!cursor.empty()) {
       req->set_cursor(cursor);
     }

diff --git a/Source/santasyncservice/syncv1.proto b/Source/santasyncservice/syncv1.proto
@@ -52,6 +52,8 @@ message PreflightRequest {
   uint32 teamid_rule_count = 15;
   uint32 signingid_rule_count = 16;
   uint32 cdhash_rule_count = 17;
+  // The UUID of the machine that is sending this preflight.
+  string machine_id = 18;
 }
 
 message PreflightResponse {
@@ -202,6 +204,8 @@ message Event {
 
 message EventUploadRequest {
   repeated Event events = 1;
+  // The UUID of the machine where the event(s) occurred
+  string machine_id = 2;
 }
 
 message EventUploadResponse {
@@ -257,6 +261,8 @@ message Rule {
 
 message RuleDownloadRequest {
   string cursor = 1;
+  // The UUID of the machine that is requesting the rules.
+  string machine_id = 2;
 }
 
 message RuleDownloadResponse {
@@ -267,6 +273,8 @@ message RuleDownloadResponse {
 message PostflightRequest {
   uint64 rules_received = 1;
   uint64 rules_processed = 2;
+  // The UUID of the machine that is sending this postflight.
+  string machine_id = 3;
 }
 
 message PostflightResponse { }