Skip to content

Commit

Permalink
Allow colons in windows file paths
Browse files Browse the repository at this point in the history
the `podman save` command was failing on windows due to the use of a
colon between the drive letter and first directory.  the check was
intended for Linux and not windows.

Fixes containers#15247

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <[email protected]>
  • Loading branch information
baude authored and openshift-cherrypick-robot committed Aug 29, 2022
1 parent 754ec89 commit bf8ee5a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
9 changes: 0 additions & 9 deletions cmd/podman/parse/net.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,6 @@ func parseEnvOrLabelFile(envOrLabel map[string]string, filename, configType stri
return scanner.Err()
}

// ValidateFileName returns an error if filename contains ":"
// as it is currently not supported
func ValidateFileName(filename string) error {
if strings.Contains(filename, ":") {
return fmt.Errorf("invalid filename (should not contain ':') %q", filename)
}
return nil
}

// ValidURL checks a string urlStr is a url or not
func ValidURL(urlStr string) error {
url, err := url.ParseRequestURI(urlStr)
Expand Down
18 changes: 18 additions & 0 deletions cmd/podman/parse/parse.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//go:build !windows
// +build !windows

package parse

import (
"fmt"
"strings"
)

// ValidateFileName returns an error if filename contains ":"
// as it is currently not supported
func ValidateFileName(filename string) error {
if strings.Contains(filename, ":") {
return fmt.Errorf("invalid filename (should not contain ':') %q", filename)
}
return nil
}
5 changes: 5 additions & 0 deletions cmd/podman/parse/parse_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package parse

func ValidateFileName(filename string) error {
return nil
}

0 comments on commit bf8ee5a

Please sign in to comment.