Merge pull request moby#5085 from AkihiroSuda/fix-related-to-5064

tonistiigi · web-flow · commit 966302ee9d95 · 2024-06-25T11:20:42.000-07:00
Disallow `ADD --checksum=&lt;SUM&gt; &lt;GITSRC&gt; &lt;DST&gt;`
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -2117,7 +2117,14 @@ func commonImageNames() []string {
 }
 
 func isHTTPSource(src string) bool {
-	return strings.HasPrefix(src, "http://") || strings.HasPrefix(src, "https://")
+	if !strings.HasPrefix(src, "http://") && !strings.HasPrefix(src, "https://") {
+		return false
+	}
+	// https://github.com/ORG/REPO.git is a git source, not an http source
+	if gitRef, gitErr := gitutil.ParseGitRef(src); gitRef != nil && gitErr == nil {
+		return false
+	}
+	return true
 }
 
 func isEnabledForStage(stage string, value string) bool {

Original file line number	Diff line number	Diff line change
`@@ -2117,7 +2117,14 @@ func commonImageNames() []string {`
`2117`	`2117`	`}`
`2118`	`2118`
`2119`	`2119`	`func isHTTPSource(src string) bool {`
`2120`		`- return strings.HasPrefix(src, "http://") \|\| strings.HasPrefix(src, "https://")`
	`2120`	`+ if !strings.HasPrefix(src, "http://") && !strings.HasPrefix(src, "https://") {`
	`2121`	`+ return false`
	`2122`	`+ }`
	`2123`	`+ // https://github.com/ORG/REPO.git is a git source, not an http source`
	`2124`	`+ if gitRef, gitErr := gitutil.ParseGitRef(src); gitRef != nil && gitErr == nil {`
	`2125`	`+ return false`
	`2126`	`+ }`
	`2127`	`+ return true`
`2121`	`2128`	`}`
`2122`	`2129`
`2123`	`2130`	`func isEnabledForStage(stage string, value string) bool {`