diff --git a/go.mod b/go.mod index b43cd0ee2a08..f152a289c434 100644 --- a/go.mod +++ b/go.mod @@ -15,6 +15,7 @@ require ( github.com/containers/buildah v1.31.1-0.20230722114901-5ece066f82c6 github.com/containers/common v0.55.1-0.20230816154734-519ed7fea9bd github.com/containers/conmon v2.0.20+incompatible + github.com/containers/gvisor-tap-vsock v0.7.1-0.20230823110538-89946edb7545 github.com/containers/image/v5 v5.26.1-0.20230807184415-3fb422379cfa github.com/containers/libhvee v0.4.0 github.com/containers/ocicrypt v1.1.8 diff --git a/go.sum b/go.sum index e2d5e5433907..0818d511c3c7 100644 --- a/go.sum +++ b/go.sum @@ -250,6 +250,8 @@ github.com/containers/common v0.55.1-0.20230816154734-519ed7fea9bd h1:fdpl099M/X github.com/containers/common v0.55.1-0.20230816154734-519ed7fea9bd/go.mod h1:wtIdVQKHf4U+UfIz9B1htNZqqEeMNysQOevHNiNrru0= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= +github.com/containers/gvisor-tap-vsock v0.7.1-0.20230823110538-89946edb7545 h1:hq/sMnlCrq1aOa65rhT1F9++4tINITKym0BmiNT0TU0= +github.com/containers/gvisor-tap-vsock v0.7.1-0.20230823110538-89946edb7545/go.mod h1:xNPOjiOf6KX2rrMwlGhiqmb2Ujqg6dfhwS9u3V6Z3cA= github.com/containers/image/v5 v5.26.1-0.20230807184415-3fb422379cfa h1:wDfVQtc6ik2MvsUmu/YRSyBAE5YUxdjcEDtuT1q2KDo= github.com/containers/image/v5 v5.26.1-0.20230807184415-3fb422379cfa/go.mod h1:apL4qwq31NV0gsSZQJPxYyTH0yzWavmMCjT8vsQaXSk= github.com/containers/libhvee v0.4.0 h1:HGHIIExgP2PjwjHKKoQM3B+3qakNIZcmmkiAO4luAZE= diff --git a/pkg/machine/applehv/machine.go b/pkg/machine/applehv/machine.go index 08992f5f3b47..96a801a2d573 100644 --- a/pkg/machine/applehv/machine.go +++ b/pkg/machine/applehv/machine.go @@ -18,6 +18,7 @@ import ( "time" "github.com/containers/common/pkg/config" + gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/podman/v4/libpod/define" "github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/util" @@ -822,21 +823,18 @@ func getVMInfos() ([]*machine.ListResponse, error) { // setupStartHostNetworkingCmd generates the cmd that will be used to start the // host networking. Includes the ssh port, gvproxy pid file, gvproxy socket, and // a debug flag depending on the logrus log level -func (m *MacMachine) setupStartHostNetworkingCmd(gvProxyBinary, forwardSock string, state machine.APIForwardingState) []string { - cmd := []string{gvProxyBinary} - // Add the ssh port - cmd = append(cmd, []string{"-ssh-port", fmt.Sprintf("%d", m.Port)}...) - // Add pid file - cmd = append(cmd, "-pid-file", m.GvProxyPid.GetPath()) - // Add vfkit proxy listen - cmd = append(cmd, "-listen-vfkit", fmt.Sprintf("unixgram://%s", m.GvProxySock.GetPath())) - cmd, forwardSock, state = m.setupAPIForwarding(cmd) - if logrus.GetLevel() == logrus.DebugLevel { - cmd = append(cmd, "--debug") - fmt.Println(cmd) - } - - return cmd +func (m *MacMachine) setupStartHostNetworkingCmd() (gvproxy.Command, string, machine.APIForwardingState) { + cmd := gvproxy.NewCommand() + cmd.SSHPort = m.Port + cmd.PidFile = m.GvProxyPid.GetPath() + cmd.AddVfkitSocket(fmt.Sprintf("unixgram://%s", m.GvProxySock.GetPath())) + cmd.Debug = logrus.GetLevel() == logrus.DebugLevel + + if cmd.Debug { + defer fmt.Println(cmd.ToCmdline()) + } + + return m.setupAPIForwarding(cmd) } func (m *MacMachine) startHostNetworking(ioEater *os.File) (string, machine.APIForwardingState, error) { @@ -874,23 +872,22 @@ func (m *MacMachine) startHostNetworking(ioEater *os.File) (string, machine.APIF return "", machine.NoForwarding, err } - attr := new(os.ProcAttr) - gvproxy, err := cfg.FindHelperBinary("gvproxy", false) + gvproxyBinary, err := cfg.FindHelperBinary("gvproxy", false) if err != nil { return "", 0, err } - attr.Files = []*os.File{ioEater, ioEater, ioEater} - cmd := m.setupStartHostNetworkingCmd(gvproxy, forwardSock, state) - - _, err = os.StartProcess(cmd[0], cmd, attr) - if err != nil { - return "", 0, fmt.Errorf("unable to execute: %q: %w", cmd, err) + cmd, forwardSock, state := m.setupStartHostNetworkingCmd() + c := cmd.Cmd(gvproxyBinary) + c.ExtraFiles = []*os.File{ioEater, ioEater, ioEater} + if err := c.Start(); err != nil { + return "", 0, fmt.Errorf("unable to execute: %q: %w", cmd.ToCmdline(), err) } + return forwardSock, state, nil } -func (m *MacMachine) setupAPIForwarding(cmd []string) ([]string, string, machine.APIForwardingState) { +func (m *MacMachine) setupAPIForwarding(cmd gvproxy.Command) (gvproxy.Command, string, machine.APIForwardingState) { socket, err := m.forwardSocketPath() if err != nil { return cmd, "", machine.NoForwarding @@ -904,10 +901,10 @@ func (m *MacMachine) setupAPIForwarding(cmd []string) ([]string, string, machine forwardUser = "root" } - cmd = append(cmd, []string{"-forward-sock", socket.GetPath()}...) - cmd = append(cmd, []string{"-forward-dest", destSock}...) - cmd = append(cmd, []string{"-forward-user", forwardUser}...) - cmd = append(cmd, []string{"-forward-identity", m.IdentityPath}...) + cmd.AddForwardSock(socket.GetPath()) + cmd.AddForwardDest(destSock) + cmd.AddForwardUser(forwardUser) + cmd.AddForwardIdentity(m.IdentityPath) link, err := m.userGlobalSocketLink() if err != nil { diff --git a/pkg/machine/hyperv/machine.go b/pkg/machine/hyperv/machine.go index 4919f5bd3155..d9159bcd2d7d 100644 --- a/pkg/machine/hyperv/machine.go +++ b/pkg/machine/hyperv/machine.go @@ -14,6 +14,7 @@ import ( "time" "github.com/containers/common/pkg/config" + gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/libhvee/pkg/hypervctl" "github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/util" @@ -596,7 +597,6 @@ func (m *HyperVMachine) startHostNetworking() (string, machine.APIForwardingStat return "", machine.NoForwarding, err } - attr := new(os.ProcAttr) dnr, dnw, err := machine.GetDevNullFiles() if err != nil { return "", machine.NoForwarding, err @@ -613,31 +613,31 @@ func (m *HyperVMachine) startHostNetworking() (string, machine.APIForwardingStat } }() - gvproxy, err := cfg.FindHelperBinary("gvproxy.exe", false) + gvproxyBinary, err := cfg.FindHelperBinary("gvproxy.exe", false) if err != nil { return "", 0, err } - attr.Files = []*os.File{dnr, dnw, dnw} - cmd := []string{gvproxy} - // Add the ssh port - cmd = append(cmd, []string{"-ssh-port", fmt.Sprintf("%d", m.Port)}...) - cmd = append(cmd, []string{"-listen", fmt.Sprintf("vsock://%s", m.NetworkHVSock.KeyName)}...) - cmd = append(cmd, "-pid-file", m.GvProxyPid.GetPath()) + cmd := gvproxy.NewCommand() + cmd.SSHPort = m.Port + cmd.AddEndpoint(fmt.Sprintf("vsock://%s", m.NetworkHVSock.KeyName)) + cmd.PidFile = m.GvProxyPid.GetPath() cmd, forwardSock, state = m.setupAPIForwarding(cmd) if logrus.GetLevel() == logrus.DebugLevel { - cmd = append(cmd, "--debug") + cmd.Debug = true fmt.Println(cmd) } - _, err = os.StartProcess(cmd[0], cmd, attr) - if err != nil { + + c := cmd.Cmd(gvproxyBinary) + c.ExtraFiles = []*os.File{dnr, dnw, dnw} + if err := c.Start(); err != nil { return "", 0, fmt.Errorf("unable to execute: %q: %w", cmd, err) } return forwardSock, state, nil } -func (m *HyperVMachine) setupAPIForwarding(cmd []string) ([]string, string, machine.APIForwardingState) { +func (m *HyperVMachine) setupAPIForwarding(cmd gvproxy.Command) (gvproxy.Command, string, machine.APIForwardingState) { socket, err := m.forwardSocketPath() if err != nil { return cmd, "", machine.NoForwarding @@ -651,10 +651,10 @@ func (m *HyperVMachine) setupAPIForwarding(cmd []string) ([]string, string, mach forwardUser = "root" } - cmd = append(cmd, []string{"-forward-sock", socket.GetPath()}...) - cmd = append(cmd, []string{"-forward-dest", destSock}...) - cmd = append(cmd, []string{"-forward-user", forwardUser}...) - cmd = append(cmd, []string{"-forward-identity", m.IdentityPath}...) + cmd.AddForwardSock(socket.GetPath()) + cmd.AddForwardDest(destSock) + cmd.AddForwardUser(forwardUser) + cmd.AddForwardIdentity(m.IdentityPath) return cmd, "", machine.MachineLocal } diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index c267d5d18ea8..2b8b4dc3e742 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -22,6 +22,7 @@ import ( "time" "github.com/containers/common/pkg/config" + gvproxy "github.com/containers/gvisor-tap-vsock/pkg/types" "github.com/containers/podman/v4/pkg/machine" "github.com/containers/podman/v4/pkg/rootless" "github.com/containers/podman/v4/pkg/util" @@ -1354,7 +1355,6 @@ func (v *MachineVM) startHostNetworking() (string, machine.APIForwardingState, e return "", machine.NoForwarding, err } - attr := new(os.ProcAttr) dnr, dnw, err := machine.GetDevNullFiles() if err != nil { return "", machine.NoForwarding, err @@ -1363,11 +1363,10 @@ func (v *MachineVM) startHostNetworking() (string, machine.APIForwardingState, e defer dnr.Close() defer dnw.Close() - attr.Files = []*os.File{dnr, dnw, dnw} - cmd := []string{binary} - cmd = append(cmd, []string{"-listen-qemu", fmt.Sprintf("unix://%s", v.QMPMonitor.Address.GetPath()), "-pid-file", v.PidFilePath.GetPath()}...) - // Add the ssh port - cmd = append(cmd, []string{"-ssh-port", fmt.Sprintf("%d", v.Port)}...) + cmd := gvproxy.NewCommand() + cmd.AddQemuSocket(fmt.Sprintf("unix://%s", v.QMPMonitor.Address.GetPath())) + cmd.PidFile = v.PidFilePath.GetPath() + cmd.SSHPort = v.Port var forwardSock string var state machine.APIForwardingState @@ -1376,17 +1375,19 @@ func (v *MachineVM) startHostNetworking() (string, machine.APIForwardingState, e } if logrus.GetLevel() == logrus.DebugLevel { - cmd = append(cmd, "--debug") + cmd.Debug = true fmt.Println(cmd) } - _, err = os.StartProcess(cmd[0], cmd, attr) - if err != nil { - return "", 0, fmt.Errorf("unable to execute: %q: %w", cmd, err) + + c := cmd.Cmd(binary) + c.ExtraFiles = []*os.File{dnr, dnw, dnw} + if err := c.Start(); err != nil { + return "", 0, fmt.Errorf("unable to execute: %q: %w", cmd.ToCmdline(), err) } return forwardSock, state, nil } -func (v *MachineVM) setupAPIForwarding(cmd []string) ([]string, string, machine.APIForwardingState) { +func (v *MachineVM) setupAPIForwarding(cmd gvproxy.Command) (gvproxy.Command, string, machine.APIForwardingState) { socket, err := v.forwardSocketPath() if err != nil { @@ -1401,10 +1402,10 @@ func (v *MachineVM) setupAPIForwarding(cmd []string) ([]string, string, machine. forwardUser = "root" } - cmd = append(cmd, []string{"-forward-sock", socket.GetPath()}...) - cmd = append(cmd, []string{"-forward-dest", destSock}...) - cmd = append(cmd, []string{"-forward-user", forwardUser}...) - cmd = append(cmd, []string{"-forward-identity", v.IdentityPath}...) + cmd.AddForwardSock(socket.GetPath()) + cmd.AddForwardDest(destSock) + cmd.AddForwardUser(forwardUser) + cmd.AddForwardIdentity(v.IdentityPath) // The linking pattern is /var/run/docker.sock -> user global sock (link) -> machine sock (socket) // This allows the helper to only have to maintain one constant target to the user, which can be diff --git a/vendor/github.com/containers/gvisor-tap-vsock/LICENSE b/vendor/github.com/containers/gvisor-tap-vsock/LICENSE new file mode 100644 index 000000000000..d64569567334 --- /dev/null +++ b/vendor/github.com/containers/gvisor-tap-vsock/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/command.go b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/command.go new file mode 100644 index 000000000000..d3f80d53a6bb --- /dev/null +++ b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/command.go @@ -0,0 +1,189 @@ +package types + +import ( + "fmt" + "os/exec" +) + +type Command struct { + // Print packets on stderr + Debug bool + + // Length of packet + // Larger packets means less packets to exchange for the same amount of data (and less protocol overhead) + MTU int + + // Values passed in by forward-xxx flags in commandline (forward-xxx:info) + forwardInfo map[string][]string + + // List of endpoints the user wants to listen to + endpoints []string + + // Map of different sockets provided by user (socket-type flag:socket) + sockets map[string]string + + // File where gvproxy's pid is stored + PidFile string + + // SSHPort to access the guest VM + SSHPort int +} + +func NewCommand() Command { + return Command{ + MTU: 1500, + SSHPort: 2222, + endpoints: []string{}, + forwardInfo: map[string][]string{}, + sockets: map[string]string{}, + } +} + +func (c *Command) checkSocketsInitialized() { + if len(c.sockets) < 1 { + c.sockets = map[string]string{} + } +} + +func (c *Command) checkForwardInfoInitialized() { + if len(c.forwardInfo) < 1 { + c.forwardInfo = map[string][]string{} + } +} + +func (c *Command) AddEndpoint(endpoint string) { + if len(c.endpoints) < 1 { + c.endpoints = []string{} + } + + c.endpoints = append(c.endpoints, endpoint) +} + +func (c *Command) AddVpnkitSocket(socket string) { + c.checkSocketsInitialized() + c.sockets["listen-vpnkit"] = socket +} + +func (c *Command) AddQemuSocket(socket string) { + c.checkSocketsInitialized() + c.sockets["listen-qemu"] = socket +} + +func (c *Command) AddBessSocket(socket string) { + c.checkSocketsInitialized() + c.sockets["listen-bess"] = socket +} + +func (c *Command) AddStdioSocket(socket string) { + c.checkSocketsInitialized() + c.sockets["listen-stdio"] = socket +} + +func (c *Command) AddVfkitSocket(socket string) { + c.checkSocketsInitialized() + c.sockets["listen-vfkit"] = socket +} + +func (c *Command) addForwardInfo(flag, value string) { + c.forwardInfo[flag] = append(c.forwardInfo[flag], value) +} + +func (c *Command) AddForwardSock(socket string) { + c.checkForwardInfoInitialized() + c.addForwardInfo("forward-sock", socket) +} + +func (c *Command) AddForwardDest(dest string) { + c.checkForwardInfoInitialized() + c.addForwardInfo("forward-dest", dest) +} + +func (c *Command) AddForwardUser(user string) { + c.checkForwardInfoInitialized() + c.addForwardInfo("forward-user", user) +} + +func (c *Command) AddForwardIdentity(identity string) { + c.checkForwardInfoInitialized() + c.addForwardInfo("forward-identity", identity) +} + +// socketsToCmdline converts Command.sockets to a commandline format +func (c *Command) socketsToCmdline() []string { + args := []string{} + + for socketFlag, socket := range c.sockets { + if socket != "" { + args = append(args, fmt.Sprintf("-%s %s", socketFlag, socket)) + } + } + + return args +} + +// forwardInfoToCmdline converts Command.forwardInfo to a commandline format +func (c *Command) forwardInfoToCmdline() []string { + args := []string{} + + for forwardInfoFlag, forwardInfo := range c.forwardInfo { + for _, i := range forwardInfo { + if i != "" { + args = append(args, fmt.Sprintf("-%s %s", forwardInfoFlag, i)) + } + } + } + + return args +} + +// endpointsToCmdline converts Command.endpoints to a commandline format +func (c *Command) endpointsToCmdline() []string { + args := []string{} + + for _, endpoint := range c.endpoints { + if endpoint != "" { + args = append(args, "-listen "+endpoint) + } + } + + return args +} + +// ToCmdline converts Command to a properly formatted command for gvproxy based +// on its fields +func (c *Command) ToCmdline() []string { + args := []string{} + + // listen (endpoints) + args = append(args, c.endpointsToCmdline()...) + + // debug + if c.Debug { + args = append(args, "-debug") + } + + // mtu + args = append(args, fmt.Sprintf("-mtu %d", c.MTU)) + + // ssh-port + args = append(args, fmt.Sprintf("-ssh-port %d", c.SSHPort)) + + // sockets + args = append(args, c.socketsToCmdline()...) + + // forward info + args = append(args, c.forwardInfoToCmdline()...) + + // pid-file + if c.PidFile != "" { + args = append(args, "-pid-file "+c.PidFile) + } + + return args +} + +// Cmd converts Command to a commandline format and returns an exec.Cmd which +// can be executed by os/exec +func (c *Command) Cmd(gvproxyPath string) *exec.Cmd { + return exec.Command(gvproxyPath, c.ToCmdline()...) // #nosec G204 +} diff --git a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/configuration.go b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/configuration.go new file mode 100644 index 000000000000..912fcb90ebf4 --- /dev/null +++ b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/configuration.go @@ -0,0 +1,80 @@ +package types + +import ( + "net" + "regexp" +) + +type Configuration struct { + // Print packets on stderr + Debug bool + + // Record all packets coming in and out in a file that can be read by Wireshark (pcap) + CaptureFile string + + // Length of packet + // Larger packets means less packets to exchange for the same amount of data (and less protocol overhead) + MTU int + + // Network reserved for the virtual network + Subnet string + + // IP address of the virtual gateway + GatewayIP string + + // MAC address of the virtual gateway + GatewayMacAddress string + + // Built-in DNS records that will be served by the DNS server embedded in the gateway + DNS []Zone + + // List of search domains that will be added in all DHCP replies + DNSSearchDomains []string + + // Port forwarding between the machine running the gateway and the virtual network. + Forwards map[string]string + + // Address translation of incoming traffic. + // Useful for reaching the host itself (localhost) from the virtual network. + NAT map[string]string + + // IPs assigned to the gateway that can answer to ARP requests + GatewayVirtualIPs []string + + // DHCP static leases. Allow to assign pre-defined IP to virtual machine based on the MAC address + DHCPStaticLeases map[string]string + + // Only for Hyperkit + // Allow to assign a pre-defined MAC address to an Hyperkit VM + VpnKitUUIDMacAddresses map[string]string + + // Protocol to be used. Only for /connect mux + Protocol Protocol +} + +type Protocol string + +const ( + // HyperKitProtocol is handshake, then 16bits little endian size of packet, then the packet. + HyperKitProtocol Protocol = "hyperkit" + // QemuProtocol is 32bits big endian size of the packet, then the packet. + QemuProtocol Protocol = "qemu" + // BessProtocol transfers bare L2 packets as SOCK_SEQPACKET. + BessProtocol Protocol = "bess" + // StdioProtocol is HyperKitProtocol without the handshake + StdioProtocol Protocol = "stdio" + // VfkitProtocol transfers bare L2 packets as SOCK_DGRAM. + VfkitProtocol Protocol = "vfkit" +) + +type Zone struct { + Name string + Records []Record + DefaultIP net.IP +} + +type Record struct { + Name string + IP net.IP + Regexp *regexp.Regexp +} diff --git a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/handshake.go b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/handshake.go new file mode 100644 index 000000000000..e9aa78076ead --- /dev/null +++ b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/handshake.go @@ -0,0 +1,21 @@ +package types + +type TransportProtocol string + +const ( + UDP TransportProtocol = "udp" + TCP TransportProtocol = "tcp" + UNIX TransportProtocol = "unix" + NPIPE TransportProtocol = "npipe" +) + +type ExposeRequest struct { + Local string `json:"local"` + Remote string `json:"remote"` + Protocol TransportProtocol `json:"protocol"` +} + +type UnexposeRequest struct { + Local string `json:"local"` + Protocol TransportProtocol `json:"protocol"` +} diff --git a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/paths.go b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/paths.go new file mode 100644 index 000000000000..d50e5aecb79c --- /dev/null +++ b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/paths.go @@ -0,0 +1,3 @@ +package types + +const ConnectPath = "/connect" diff --git a/vendor/modules.txt b/vendor/modules.txt index 391b36e39eba..374795354c48 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -214,6 +214,9 @@ github.com/containers/common/version # github.com/containers/conmon v2.0.20+incompatible ## explicit github.com/containers/conmon/runner/config +# github.com/containers/gvisor-tap-vsock v0.7.1-0.20230823110538-89946edb7545 +## explicit; go 1.20 +github.com/containers/gvisor-tap-vsock/pkg/types # github.com/containers/image/v5 v5.26.1-0.20230807184415-3fb422379cfa ## explicit; go 1.19 github.com/containers/image/v5/copy