Repository navigation
fix(docker): defer bind mount validation to the engine #1610
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9d1f758
fix(docker): defer bind mount validation to the engine
skevetter c2a22dc
fix(e2e): distinguish missing Podman prerequisites from misconfiguration
skevetter aacdbb4
fix(e2e): fail selected native runs with missing prerequisites
skevetter a48296e
test: distinguish native Podman qualification selectors
skevetter a604663
test: qualify native Podman bind fixture on macOS
skevetter File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,323 @@ | ||
| package up | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "net/url" | ||
| "os" | ||
| "os/exec" | ||
| "path/filepath" | ||
| "strings" | ||
| "time" | ||
| "unicode" | ||
|
|
||
| "github.com/devsy-org/devsy/e2e/framework" | ||
| "github.com/onsi/ginkgo/v2" | ||
| "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| const ( | ||
| podmanMachineBindLabel = "up-provider-podman-machine-bind" | ||
| podmanMachineCommand = "machine" | ||
| podmanJSONFormat = "json" | ||
| podmanFormatFlag = "--format" | ||
| podmanMarkerTarget = "/tmp/devsy-engine-only-marker" | ||
| podmanMarkerName = "/marker" | ||
| podmanHomeEnv = "DEVSY_HOME" | ||
| ) | ||
|
|
||
| type podmanMachineConnection struct { | ||
| Name string | ||
| URI string | ||
| Default bool | ||
| } | ||
|
|
||
| type podmanMachineSSHConfig struct { | ||
| Port int | ||
| RemoteUsername string | ||
| } | ||
|
|
||
| type podmanMachineInspection struct { | ||
| Name string | ||
| State string | ||
| SSHConfig podmanMachineSSHConfig | ||
| } | ||
|
|
||
| type ( | ||
| podmanMachineName struct{ Name string } | ||
| podmanMachineSecurity struct { | ||
| Rootless bool | ||
| SELinuxEnabled bool | ||
| } | ||
| podmanMachineSocket struct{ Path string } | ||
| podmanMachineHost struct { | ||
| Security podmanMachineSecurity | ||
| Hostname string | ||
| RemoteSocket podmanMachineSocket | ||
| } | ||
| ) | ||
| type podmanMachineInfo struct{ Host podmanMachineHost } | ||
|
|
||
| type podmanBindFixture struct { | ||
| Image string `json:"image"` | ||
| Mounts []string `json:"mounts"` | ||
| } | ||
|
|
||
| var _ = ginkgo.Describe("Podman Machine engine-side bind sources", | ||
| ginkgo.Label(podmanMachineBindLabel), func() { | ||
| ginkgo.It( | ||
| "mounts a guest-only source without creating or changing it", | ||
| func(ctx context.Context) { | ||
| quote := func(value string) string { return "'" + strings.ReplaceAll(value, "'", "'\"'\"'") + "'" } | ||
| podman, err := exec.LookPath("podman") | ||
| requirePodmanMachinePrerequisite(err == nil, "Podman CLI is not installed") | ||
| run := func(args ...string) string { | ||
| // #nosec G204 -- executable is resolved Podman; arguments are test commands and quoted owned fixture paths. | ||
| output, cmdErr := exec.CommandContext(ctx, podman, args...).CombinedOutput() | ||
| framework.ExpectNoError(cmdErr, "podman %v: %s", args, output) | ||
| return strings.TrimSpace(string(output)) | ||
| } | ||
| for _, key := range []string{ | ||
| "CONTAINER_HOST", "CONTAINER_CONNECTION", "DOCKER_HOST", "DEVSY_CONFIG", "DEVSY_PROVIDER", | ||
| } { | ||
| requirePodmanMachinePrerequisite(os.Getenv(key) == "", | ||
| key+" overrides the isolated provider or selected connection") | ||
| } | ||
| var connections []podmanMachineConnection | ||
| framework.ExpectNoError( | ||
| json.Unmarshal( | ||
| []byte( | ||
| run("system", "connection", "list", podmanFormatFlag, podmanJSONFormat), | ||
| ), | ||
| &connections, | ||
| ), | ||
| ) | ||
| selected := -1 | ||
| for i := range connections { | ||
| if connections[i].Default { | ||
| selected = i | ||
| } | ||
| } | ||
| requirePodmanMachinePrerequisite( | ||
| selected >= 0, | ||
| "no default native Podman connection is configured", | ||
| ) | ||
| connection := connections[selected] | ||
| endpoint, err := url.Parse(connection.URI) | ||
| framework.ExpectNoError(err) | ||
| gomega.Expect(endpoint.Scheme).To(gomega.Equal(cmdSSH)) | ||
| gomega.Expect(endpoint.User).NotTo(gomega.BeNil()) | ||
|
|
||
| var machines []podmanMachineInspection | ||
| var machineNames []podmanMachineName | ||
| framework.ExpectNoError( | ||
| json.Unmarshal( | ||
| []byte( | ||
| run(podmanMachineCommand, "list", podmanFormatFlag, podmanJSONFormat), | ||
| ), | ||
| &machineNames, | ||
| ), | ||
| ) | ||
| inspectArgs := []string{podmanMachineCommand, "inspect"} | ||
| for _, entry := range machineNames { | ||
| inspectArgs = append(inspectArgs, entry.Name) | ||
| } | ||
| requirePodmanMachinePrerequisite( | ||
| len(machineNames) > 0, | ||
| "no Podman machines are available", | ||
| ) | ||
| framework.ExpectNoError(json.Unmarshal([]byte(run(inspectArgs...)), &machines)) | ||
| machine := "" | ||
| for _, candidate := range machines { | ||
| if fmt.Sprint(candidate.SSHConfig.Port) == endpoint.Port() && | ||
| candidate.SSHConfig.RemoteUsername == endpoint.User.Username() { | ||
| gomega.Expect(machine). | ||
| To(gomega.BeEmpty(), "connection must identify exactly one machine") | ||
| requirePodmanMachinePrerequisite(candidate.State == "running", | ||
| "selected Podman machine is not running") | ||
| machine = candidate.Name | ||
| } | ||
| } | ||
| gomega.Expect(machine). | ||
| NotTo(gomega.BeEmpty(), "selected connection must match a machine's SSH port and user") | ||
| gomega.Expect(endpoint.Hostname()). | ||
| To(gomega.BeElementOf("127.0.0.1", "localhost", "::1")) | ||
|
|
||
| // Machine SSH otherwise follows machine rootful mode instead of the selected connection's user. | ||
| guestSSHArgs := []string{ | ||
| podmanMachineCommand, | ||
| cmdSSH, | ||
| "--username", | ||
| endpoint.User.Username(), | ||
| machine, | ||
| } | ||
| guest := func(script string) string { | ||
| return run(append(guestSSHArgs, "sh -c "+quote(script))...) | ||
| } | ||
| var info podmanMachineInfo | ||
| framework.ExpectNoError( | ||
| json.Unmarshal([]byte(run("info", podmanFormatFlag, podmanJSONFormat)), &info), | ||
| ) | ||
| gomega.Expect(info.Host.Security.Rootless). | ||
| To(gomega.BeTrue(), "native gate requires rootless Podman") | ||
| guestUID := guest("id -u") | ||
| gomega.Expect(guestUID).NotTo(gomega.Equal("0")) | ||
| ginkgo.GinkgoWriter.Printf( | ||
| "Guest UID: %s; runtime directory: %s\n", | ||
| guestUID, | ||
| guest(`printf %s "$XDG_RUNTIME_DIR"`), | ||
| ) | ||
| gomega.Expect(info.Host.Hostname).To(gomega.Equal(guest("hostname"))) | ||
| gomega.Expect(endpoint.Path). | ||
| To(gomega.Equal(strings.TrimPrefix(info.Host.RemoteSocket.Path, "unix://"))) | ||
| gomega.Expect(guest(`id -un`)).To(gomega.Equal(endpoint.User.Username())) | ||
| ginkgo.GinkgoWriter.Printf( | ||
| "Podman version: %s; selected connection: %s; machine: %s\n", | ||
| run("version", podmanFormatFlag, podmanJSONFormat), | ||
| connection.Name, | ||
| machine, | ||
| ) | ||
|
|
||
| source := guest( | ||
| `set -eu; test -n "$XDG_RUNTIME_DIR"; test -d "$XDG_RUNTIME_DIR"; ` + | ||
| `mktemp -d "$XDG_RUNTIME_DIR/devsy-bind-e2e.XXXXXXXX"`, | ||
| ) | ||
| gomega.Expect(source). | ||
| To(gomega.MatchRegexp(`^/[^\r\n']+/devsy-bind-e2e\.[A-Za-z0-9]+$`)) | ||
| ginkgo.DeferCleanup(func() { | ||
| cleanupCtx, cancel := context.WithTimeout(context.Background(), time.Minute) | ||
| defer cancel() | ||
| // #nosec G204 -- resolved Podman removes only the quoted directory created by this spec. | ||
| output, cleanupErr := exec.CommandContext(cleanupCtx, podman, | ||
| append(guestSSHArgs, "sh -c "+quote("rm -rf -- "+quote(source)))...). | ||
| CombinedOutput() | ||
| framework.ExpectNoError(cleanupErr, "remove owned guest fixture: %s", output) | ||
| }) | ||
| marker := filepath.Base(source) | ||
| guest( | ||
| "printf %s " + quote( | ||
| marker, | ||
| ) + " > " + quote( | ||
| source+podmanMarkerName, | ||
| ) + "; chmod 755 " + quote( | ||
| source, | ||
| ) + "; chmod 666 " + quote( | ||
| source+podmanMarkerName, | ||
| ), | ||
| ) | ||
| snapshotFormat := "%a:%u:%g:%s:%Y" | ||
| if info.Host.Security.SELinuxEnabled { | ||
| // Label only the owned fixture so SELinux permits the unchanged readonly bind. | ||
| guest("chcon -t container_file_t -- " + quote(source+podmanMarkerName)) | ||
| snapshotFormat += ":%C" | ||
| } | ||
|
|
||
| _, err = os.Stat(source + podmanMarkerName) | ||
| gomega.Expect(os.IsNotExist(err)). | ||
| To(gomega.BeTrue(), "fixture must be absent on macOS: %s", source) | ||
| gomega.Expect(guest("cat " + quote(source+podmanMarkerName))). | ||
| To(gomega.Equal(marker)) | ||
| snapshotCommand := "stat -c " + quote(snapshotFormat) + " " + quote(source) + " " + | ||
| quote(source+podmanMarkerName) | ||
| before := guest(snapshotCommand) | ||
|
|
||
| initialDir, err := os.Getwd() | ||
| framework.ExpectNoError(err) | ||
| // Keep the SSH agent socket below the Darwin Unix socket path limit. | ||
| devsyHome, err := os.MkdirTemp("/tmp", "ds-") | ||
| framework.ExpectNoError(err) | ||
| ginkgo.DeferCleanup(func() { framework.ExpectNoError(os.RemoveAll(devsyHome)) }) | ||
| previousHome, hadHome := os.LookupEnv(podmanHomeEnv) | ||
| framework.ExpectNoError(os.Setenv(podmanHomeEnv, devsyHome)) | ||
| ginkgo.DeferCleanup(func() { | ||
| if hadHome { | ||
| framework.ExpectNoError(os.Setenv(podmanHomeEnv, previousHome)) | ||
| } else { | ||
| framework.ExpectNoError(os.Unsetenv(podmanHomeEnv)) | ||
| } | ||
| }) | ||
| f, err := framework.SetupDockerProvider(filepath.Join(initialDir, "bin"), podman) | ||
| framework.ExpectNoError(err) | ||
| content, err := json.Marshal(podmanBindFixture{ | ||
| Image: "ghcr.io/devsy-org/test-images/base:alpine", | ||
| Mounts: []string{ | ||
| "type=bind,source=" + source + podmanMarkerName + ",target=" + podmanMarkerTarget + ",readonly", | ||
| }, | ||
| }) | ||
| framework.ExpectNoError(err) | ||
| workspace := framework.WriteTempDevcontainer("devsy-machine-bind-", string(content)) | ||
| ginkgo.DeferCleanup(func() { framework.ExpectNoError(os.RemoveAll(workspace)) }) | ||
| ginkgo.DeferCleanup( | ||
| func(cleanupCtx context.Context) error { return f.CleanupWorkspace(cleanupCtx, workspace) }, | ||
| ) | ||
| sha, err := exec.CommandContext(ctx, "git", "rev-parse", "HEAD").Output() | ||
| framework.ExpectNoError(err) | ||
| ginkgo.GinkgoWriter.Printf("Repository SHA: %s", sha) | ||
| framework.ExpectNoError(f.DevsyUp(ctx, workspace)) | ||
| actual, err := f.DevsySSH( | ||
| ctx, | ||
| workspace, | ||
| "if printf '' >> "+podmanMarkerTarget+"; then exit 1; fi; cat "+podmanMarkerTarget, | ||
| ) | ||
| framework.ExpectNoError(err) | ||
| gomega.Expect(actual).To(gomega.Equal(marker)) | ||
| framework.ExpectNoError(f.DevsyWorkspaceDelete(ctx, workspace)) | ||
| gomega.Expect(guest("cat " + quote(source+podmanMarkerName))). | ||
| To(gomega.Equal(marker)) | ||
| gomega.Expect(guest(snapshotCommand)). | ||
| To(gomega.Equal(before)) | ||
| _, err = os.Stat(source + podmanMarkerName) | ||
| gomega.Expect(os.IsNotExist(err)).To(gomega.BeTrue()) | ||
| missingSource := source + "/missing-marker" | ||
| invalidContent := strings.ReplaceAll( | ||
| string(content), | ||
| source+podmanMarkerName, | ||
| missingSource, | ||
| ) | ||
| framework.ExpectNoError( | ||
| os.WriteFile( | ||
| filepath.Join(workspace, ".devcontainer", "devcontainer.json"), | ||
| []byte(invalidContent), | ||
| 0o600, | ||
| ), | ||
| ) | ||
| stdout, _, upErr := f.DevsyUpStreams( | ||
| ctx, | ||
| workspace, | ||
| "--result-format", | ||
| podmanJSONFormat, | ||
| ) | ||
| gomega.Expect(upErr).To(gomega.HaveOccurred()) | ||
| envelope, ok := parseFailedStatus(stdout) | ||
| gomega.Expect(ok).To(gomega.BeTrue(), "expected failed JSON envelope: %s", stdout) | ||
| gomega.Expect(envelope.Error.Message). | ||
| To(gomega.ContainSubstring("failed to start dev container")) | ||
| gomega.Expect(envelope.Error.Message).To(gomega.ContainSubstring(missingSource)) | ||
| gomega.Expect(envelope.Error.Message). | ||
| NotTo(gomega.ContainSubstring("bind mount source path does not exist")) | ||
| guest("test ! -e " + quote(missingSource)) | ||
| }, | ||
| ginkgo.SpecTimeout(framework.TimeoutLong()), | ||
| ) | ||
| }) | ||
|
|
||
| func requirePodmanMachinePrerequisite(available bool, reason string) { | ||
| if available { | ||
| return | ||
| } | ||
| config, _ := ginkgo.GinkgoConfiguration() | ||
| message := "native gate BLOCKED: " + reason | ||
| if isPodmanMachineQualificationFilter(config.LabelFilter) { | ||
| ginkgo.Fail(message, 1) | ||
| } | ||
| ginkgo.Skip(message, 1) | ||
| } | ||
|
|
||
| func isPodmanMachineQualificationFilter(filter string) bool { | ||
| // Ginkgo validates syntax first; only a standalone label requests native qualification. | ||
| label := strings.TrimFunc(filter, func(r rune) bool { | ||
| return r == '(' || r == ')' || unicode.IsSpace(r) | ||
| }) | ||
| return strings.ToLower(label) == podmanMachineBindLabel | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package up | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/onsi/ginkgo/v2/types" | ||
| ) | ||
|
|
||
| func TestIsPodmanMachineQualificationFilter(t *testing.T) { | ||
| cases := []struct { | ||
| name string | ||
| filter string | ||
| qualification bool | ||
| }{ | ||
| {name: "unfiltered"}, | ||
| {name: "bare native", filter: podmanMachineBindLabel, qualification: true}, | ||
| {name: "nested native", filter: "((" + podmanMachineBindLabel + "))", qualification: true}, | ||
| { | ||
| name: "spaced native", | ||
| filter: " ( ( " + podmanMachineBindLabel + " ) ) ", | ||
| qualification: true, | ||
| }, | ||
| { | ||
| name: "case insensitive native", | ||
| filter: strings.ToUpper(podmanMachineBindLabel), | ||
| qualification: true, | ||
| }, | ||
| { | ||
| name: "vertical tab and form feed", | ||
| filter: "\v\f" + podmanMachineBindLabel + "\v\f", | ||
| qualification: true, | ||
| }, | ||
| { | ||
| name: "Unicode whitespace", | ||
| filter: "\u2003\u00a0" + podmanMachineBindLabel + "\u2003\u00a0", | ||
| qualification: true, | ||
| }, | ||
| { | ||
| name: "Ginkgo dotted capital I", | ||
| filter: strings.ReplaceAll(podmanMachineBindLabel, "i", "\u0130"), | ||
| qualification: true, | ||
| }, | ||
| {name: "broad exclusion", filter: "!kubernetes"}, | ||
| {name: "native exclusion", filter: "!" + podmanMachineBindLabel}, | ||
| {name: "OR includes native", filter: "up-behaviors || " + podmanMachineBindLabel}, | ||
| {name: "AND includes native", filter: podmanMachineBindLabel + " && !kubernetes"}, | ||
| { | ||
| name: "parenthesized compound", | ||
| filter: "(" + podmanMachineBindLabel + " || up-behaviors)", | ||
| }, | ||
| {name: "regex selects native", filter: "/up-provider-podman-machine-bind/"}, | ||
| } | ||
| for _, tc := range cases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| if _, err := types.ParseLabelFilter(tc.filter); err != nil { | ||
| t.Fatalf("policy case must be valid Ginkgo syntax: %v", err) | ||
| } | ||
| if got := isPodmanMachineQualificationFilter(tc.filter); got != tc.qualification { | ||
| t.Errorf("qualification for %q = %t, want %t", tc.filter, got, tc.qualification) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.