Merge pull request #483 from yui-knk/copy_command_http

Return an error when copying from url
moby · Jul 3, 2018 · 0f20a37 · 0f20a37
2 parents 2e7a680 + 30c27cd
commit 0f20a37
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -601,7 +601,11 @@ func dispatchCopy(d *dispatchState, c instructions.SourcesAndDest, sourceState l
 
 	for i, src := range c.Sources() {
 		commitMessage.WriteString(" " + src)
-		if isAddCommand && (strings.HasPrefix(src, "http://") || strings.HasPrefix(src, "https://")) {
+		if strings.HasPrefix(src, "http://") || strings.HasPrefix(src, "https://") {
+			if !isAddCommand {
+				return errors.New("source can't be a URL for COPY")
+			}
+
 			// Resources from remote URLs are not decompressed.
 			// https://docs.docker.com/engine/reference/builder/#add
 			//

diff --git a/frontend/dockerfile/dockerfile2llb/convert_test.go b/frontend/dockerfile/dockerfile2llb/convert_test.go
@@ -42,6 +42,18 @@ COPY --from=0 f2 /
 	})
 	assert.Error(t, err)
 
+	df = `FROM busybox
+	ADD http://github.com/moby/buildkit/blob/master/README.md /
+		`
+	_, _, err = Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
+	assert.NoError(t, err)
+
+	df = `FROM busybox
+	COPY http://github.com/moby/buildkit/blob/master/README.md /
+		`
+	_, _, err = Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
+	assert.EqualError(t, err, "source can't be a URL for COPY")
+
 	df = `FROM "" AS foo`
 	_, _, err = Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
 	assert.Error(t, err)