opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 17:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix import not ignoring url path

Browse Source 
fix #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>
This commit is contained in:
Qi Wang
2019-07-22 15:15:38 -04:00
parent 2283471f8d
commit a328e873c6
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/podman/import.go
View File

@ -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

10
cmd/podman/shared/parse/parse.go
View File

@ -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
}