Skip to content
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.

Sign up for GitHub

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

Respect "Rootful" when starting WSL API Forwarding #13885

Merged
merged 1 commit into from
Apr 20, 2022
Merged

Respect "Rootful" when starting WSL API Forwarding #13885

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion pkg/machine/wsl/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,15 @@ func launchWinProxy(v *MachineVM) (bool, string, error) {
return globalName, "", err
}

dest := fmt.Sprintf("ssh://root@localhost:%d/run/podman/podman.sock", v.Port)
destSock := "/run/user/1000/podman/podman.sock"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we hardcode 1000 here or should it be rootless.GetRootlessUID()?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case the UID is referring to a fixed configuration for the Fedora distro that podman machine controls, so regardless of system configuration the guest will always have a uid of 1000 (vs rootless.GetRootlessUID which return the host value). Granted a constant value in the code would have been cleaner.

forwardUser := v.RemoteUsername

if v.Rootful {
destSock = "/run/podman/podman.sock"
forwardUser = "root"
}

dest := fmt.Sprintf("ssh://%s@localhost:%d%s", forwardUser, v.Port, destSock)
args := []string{v.Name, stateDir, pipePrefix + machinePipe, dest, v.IdentityPath}
waitPipe := machinePipe
if globalName {
Expand Down