Fix #3032: Remove query parameters in ADD command when the destinatio…

…n is a directory

pkg/util/command_util.go

@@ -215,7 +215,7 @@ func URLDestinationFilepath(rawurl, dest, cwd string, envs []string) (string, er
 		}
 		return dest, nil
 	}
-	urlBase := filepath.Base(rawurl)
+	urlBase := extractFilename(rawurl)
 	urlBase, err := ResolveEnvironmentReplacement(urlBase, envs, true)
 	if err != nil {
 		return "", err
@@ -469,3 +469,11 @@ func getUID(userStr string) (uint32, error) {
 	}
 	return uint32(uid), nil
 }
+
+// ExtractFilename extracts the filename from a URL without its query url
+func extractFilename(rawUrl string) string {
+	// not necessarily return an error, due to parsing ambiguities https://pkg.go.dev/net/url#Parse
+	parsedUrl, _ := url.Parse(rawUrl)
+	filename := filepath.Base(parsedUrl.Path)
+	return filename
+}

pkg/util/command_util_test.go

@@ -226,6 +226,12 @@ var urlDestFilepathTests = []struct {
 		dest:         "/test",
 		expectedDest: "/test",
 	},
+	{
+		url:          "https://something/something.tar?foo=bar",
+		cwd:          "/cwd",
+		dest:         "/dir/",
+		expectedDest: "/dir/something.tar",
+	},
 	{
 		url:          "https://something/something",
 		cwd:          "/test",