artifact definition in config file is now a protobuf. (#92)

Previously it was a flat yaml string but this is harder to edit correctly.
Velocidex · Sep 30, 2019 · b3ce9ad · b3ce9ad
1 parent 2cd9c3e
commit b3ce9ad
Show file tree

Hide file tree

Showing 11 changed files with 375 additions and 321 deletions.
diff --git a/artifacts/assets/ab0x.go b/artifacts/assets/ab0x.go
diff --git a/bin/artifacts.go b/bin/artifacts.go
@@ -396,7 +396,10 @@ func load_config_artifacts(config_obj *config_proto.Config) {
 	}
 	repository := getRepository(config_obj)
 	for _, definition := range config_obj.Autoexec.ArtifactDefinitions {
-		_, err := repository.LoadYaml(definition, true /* validate */)
+		serialized, err := yaml.Marshal(definition)
+		kingpin.FatalIfError(err, "Unable to parse config artifact")
+
+		_, err = repository.LoadYaml(string(serialized), true /* validate */)
 		kingpin.FatalIfError(err, "Unable to parse config artifact")
 	}
 }

diff --git a/bin/repack.go b/bin/repack.go
@@ -61,12 +61,17 @@ func validate_config(config_data []byte) error {
 	if test_config.Autoexec != nil {
 		repository := artifacts.NewRepository()
 
-		for _, def := range test_config.Autoexec.ArtifactDefinitions {
-			_, err := repository.LoadYaml(def, true /* validate */)
+		for _, definition := range test_config.Autoexec.ArtifactDefinitions {
+			serialized, err := yaml.Marshal(definition)
+			if err != nil {
+				return err
+			}
+
+			_, err = repository.LoadYaml(string(serialized), true /* validate */)
 			if err != nil {
 				return errors.New(
 					fmt.Sprintf("While parsing artifact: %s\n%s",
-						err, def))
+						err, string(serialized)))
 			}
 		}
 	}