Skip to content

Commit

Permalink
fix import not ignoring url path
Browse files Browse the repository at this point in the history
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 <qiwan@redhat.com>
  • Loading branch information
QiWang19 committed Jul 24, 2019
1 parent 2283471 commit a328e87
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
8 changes: 6 additions & 2 deletions cmd/podman/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions cmd/podman/shared/parse/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"bufio"
"fmt"
"net"
"net/url"
"os"
"regexp"
"strings"
Expand Down Expand Up @@ -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
}

0 comments on commit a328e87

Please sign in to comment.