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

specgen-volumes: parse --mount using csv-reader instead of split by comma

Browse Source 
Following commit ensures that csv escaping is supported while using
inline `--mount=type=......` flag with `podman run` by using
`encoding/csv` to parse options instead of performing a `split.String(`
by `comma`.

Closes: https://github.com/containers/podman/issues/13922

Signed-off-by: Aditya R <arajan@redhat.com>
This commit is contained in:
Aditya R
2022-04-22 13:46:37 +05:30
parent b46970763c
commit f87f23e3b6
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/specgenutil/volumes.go
View File

@ -1,6 +1,7 @@
package specgenutil package specgenutil
import ( import (
"encoding/csv"
"fmt" "fmt"
"path/filepath" "path/filepath"
"strings" "strings"
@ -152,7 +153,15 @@ func findMountType(input string) (mountType string, tokens []string, err error)
// Split by comma, iterate over the slice and look for // Split by comma, iterate over the slice and look for
// "type=$mountType". Everything else is appended to tokens. // "type=$mountType". Everything else is appended to tokens.
found := false found := false
for _, s := range strings.Split(input, ",") { csvReader := csv.NewReader(strings.NewReader(input))
records, err := csvReader.ReadAll()
if err != nil {
return "", nil, err
}
if len(records) != 1 {
return "", nil, errInvalidSyntax
}
for _, s := range records[0] {
kv := strings.Split(s, "=") kv := strings.Split(s, "=")
if found || !(len(kv) == 2 && kv[0] == "type") { if found || !(len(kv) == 2 && kv[0] == "type") {
tokens = append(tokens, s) tokens = append(tokens, s)

5
test/e2e/run_volume_test.go
View File

@ -120,6 +120,11 @@ var _ = Describe("Podman run with volumes", func() {
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError()) Expect(session).To(ExitWithError())
// test csv escaping
session = podmanTest.Podman([]string{"run", "--rm", "--mount=type=tmpfs,tmpfs-size=512M,\"destination=/test,\"", ALPINE, "ls", "/test,"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"run", "--rm", "--mount", "type=bind,src=/tmp,target=/tmp,tmpcopyup", ALPINE, "true"}) session = podmanTest.Podman([]string{"run", "--rm", "--mount", "type=bind,src=/tmp,target=/tmp,tmpcopyup", ALPINE, "true"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError()) Expect(session).To(ExitWithError())