From 29ebe1cee370787c445c284b2e73b4500b46fe27 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 24 Jan 2017 13:03:52 -0800 Subject: [PATCH] Also verify that Maintainers are valid in individual entry objects --- manifest/rfc2822.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest/rfc2822.go b/manifest/rfc2822.go index e1f2a96..bfbfaa1 100644 --- a/manifest/rfc2822.go +++ b/manifest/rfc2822.go @@ -167,6 +167,9 @@ func (manifest *Manifest2822) AddEntry(entry Manifest2822Entry) error { if !GitCommitRegex.MatchString(entry.GitCommit) { return fmt.Errorf(`Tags %q has invalid GitCommit (must be a commit, not a tag or ref): %q`, entry.TagsString(), entry.GitCommit) } + if invalidMaintainers := entry.InvalidMaintainers(); len(invalidMaintainers) > 0 { + return fmt.Errorf("Tags %q has invalid Maintainers: %q (expected format %q)", strings.Join(invalidMaintainers, ", "), MaintainersFormat) + } for _, tag := range entry.Tags { if otherEntry := manifest.GetTag(tag); otherEntry != nil {