Fleetspeak/Configs: Do not crash when reading unknown field names

PiperOrigin-RevId: 673835911
google · Sep 12, 2024 · f0d649c · f0d649c
1 parent 77bf103
commit f0d649c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/fleetspeak/src/client/config/filesystem_persistence_handler.go b/fleetspeak/src/client/config/filesystem_persistence_handler.go
@@ -189,7 +189,11 @@ func (h *FilesystemPersistenceHandler) ReadServices() ([]*fspb.ClientServiceConf
 		}
 
 		s := &fspb.ClientServiceConfig{}
-		if err := prototext.Unmarshal(b, s); err != nil {
+		err = prototext.UnmarshalOptions{
+			// Forward compatibility with future field names
+			DiscardUnknown: true,
+		}.Unmarshal(b, s)
+		if err != nil {
 			log.Errorf("Unable to parse service file [%s], ignoring: %v", fp, err)
 			continue
 		}