fix import not ignoring url path

fix containers#3609 Podman import used to check filename to only allow tarball path as a file. It should also allow an url as the doc mentioned. This PR allows the program to continue if the input is a valid URL Signed-off-by: Qi Wang <[email protected]>
QiWang19 · Jul 24, 2019 · a328e87 · a328e87
1 parent 2283471
commit a328e87
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/cmd/podman/import.go b/cmd/podman/import.go
@@ -6,6 +6,7 @@ import (
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/shared/parse"
 	"github.com/containers/libpod/pkg/adapter"
+	multierror "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -69,8 +70,11 @@ func importCmd(c *cliconfig.ImportValues) error {
 		return errors.Errorf("too many arguments. Usage TARBALL [REFERENCE]")
 	}
 
-	if err := parse.ValidateFileName(source); err != nil {
-		return err
+	errFileName := parse.ValidateFileName(source)
+	errURL := parse.ValidURL(source)
+
+	if errFileName != nil && errURL != nil {
+		return multierror.Append(errFileName, errURL)
 	}
 
 	quiet := c.Quiet

diff --git a/cmd/podman/shared/parse/parse.go b/cmd/podman/shared/parse/parse.go
@@ -7,6 +7,7 @@ import (
 	"bufio"
 	"fmt"
 	"net"
+	"net/url"
 	"os"
 	"regexp"
 	"strings"
@@ -162,3 +163,12 @@ func ValidateFileName(filename string) error {
 	}
 	return nil
 }
+
+// ValidURL checks a string urlStr is a url or not
+func ValidURL(urlStr string) error {
+	_, err := url.ParseRequestURI(urlStr)
+	if err != nil {
+		return errors.Wrapf(err, "invalid url path: %q", urlStr)
+	}
+	return nil
+}