Merge pull request #105 from infosiftr/explicit-full-gitcommit

yosifkit · web-flow · commit 7afe152f6da7 · 2024-08-13T12:58:32.000-07:00
Enforce that `GitCommit` must be a *full* commit hash
diff --git a/manifest/rfc2822.go b/manifest/rfc2822.go
@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	GitCommitRegex = regexp.MustCompile(`^[0-9a-f]{1,64}$`)
+	GitCommitRegex = regexp.MustCompile(`^([0-9a-f]{40}|[0-9a-f]{64})$`)
 	GitFetchRegex  = regexp.MustCompile(`^refs/(heads|tags)/[^*?:]+$`)
 
 	// https://github.com/docker/distribution/blob/v2.7.1/reference/regexp.go#L37

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var (`
`19`		- GitCommitRegex = regexp.MustCompile(`^[0-9a-f]{1,64}$`)
	`19`	+ GitCommitRegex = regexp.MustCompile(`^([0-9a-f]{40}\|[0-9a-f]{64})$`)
`20`	`20`	GitFetchRegex = regexp.MustCompile(`^refs/(heads\|tags)/[^*?:]+$`)
`21`	`21`
`22`	`22`	`// https://github.com/docker/distribution/blob/v2.7.1/reference/regexp.go#L37`