Compiling client event table ignores missing artifacts (Velocidex#1220)

If an artifact is added to the client monitoring table and then deleted the client monitoring service will fail to load because it is unable to recompile the missing artifact. This PR makes it a non-fatal error, the event table will simply skip the missing artifact. Also some small fixes: 1. USN parser returns the time.Time object 2. UI shows JSON mode in raw json views
scudette · Aug 26, 2021 · 7d8b75e · 7d8b75e
1 parent 4d3b404
commit 7d8b75e
Show file tree

Hide file tree

Showing 22 changed files with 552 additions and 412 deletions.
diff --git a/api/api.go b/api/api.go
@@ -781,7 +781,7 @@ func (self *ApiServer) SetServerMonitoringState(
 }
 
 func (self *ApiServer) GetClientMonitoringState(
-	ctx context.Context, in *empty.Empty) (
+	ctx context.Context, in *flows_proto.GetClientMonitoringStateRequest) (
 	*flows_proto.ClientEventTable, error) {
 
 	defer Instrument("GetClientMonitoringState")()
@@ -794,7 +794,14 @@ func (self *ApiServer) GetClientMonitoringState(
 			"User is not allowed to read monitoring artifacts (%v).", permissions))
 	}
 
-	result := services.ClientEventManager().GetClientMonitoringState()
+	manager := services.ClientEventManager()
+	result := manager.GetClientMonitoringState()
+	if in.ClientId != "" {
+		message := manager.GetClientUpdateEventTableMessage(self.config,
+			in.ClientId)
+		result.ClientMessage = message
+	}
+
 	return result, err
 }
 

diff --git a/api/mock/api_mock.go b/api/mock/api_mock.go
diff --git a/api/proto/api.pb.go b/api/proto/api.pb.go
diff --git a/api/proto/api.pb.gw.go b/api/proto/api.pb.gw.go
diff --git a/api/proto/api.proto b/api/proto/api.proto
@@ -353,7 +353,7 @@ service API {
 
     // Client Monitoring Artifacts - manage the Client Monitoring
     // Service.
-    rpc GetClientMonitoringState(google.protobuf.Empty) returns (ClientEventTable) {
+    rpc GetClientMonitoringState(GetClientMonitoringStateRequest) returns (ClientEventTable) {
         option (google.api.http) = {
             get: "/api/v1/GetClientMonitoringState",
         };

diff --git a/api/proto/api_grpc.pb.go b/api/proto/api_grpc.pb.go
diff --git a/api/server_monitoring.go b/api/server_monitoring.go
@@ -21,6 +21,7 @@ func getServerMonitoringState(config_obj *config_proto.Config) (
 		result,
 	)
 	_ = err // if an error we return an empty collector args.
+
 	return result, nil
 }
 

diff --git a/file_store/test_utils/testsuite.go b/file_store/test_utils/testsuite.go
@@ -45,8 +45,8 @@ func (self *TestSuite) SetupTest() {
 	require.NoError(self.T(), self.Sm.Start(journal.StartJournalService))
 	require.NoError(self.T(), self.Sm.Start(notifications.StartNotificationService))
 	require.NoError(self.T(), self.Sm.Start(inventory.StartInventoryService))
-	require.NoError(self.T(), self.Sm.Start(repository.StartRepositoryManager))
 	require.NoError(self.T(), self.Sm.Start(launcher.StartLauncherService))
+	require.NoError(self.T(), self.Sm.Start(repository.StartRepositoryManager))
 	require.NoError(self.T(), self.Sm.Start(labels.StartLabelService))
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		result,
     	)
     	_ = err // if an error we return an empty collector args.
     	return result, nil
     }
@@ Expand Down @@