-
Notifications
You must be signed in to change notification settings - Fork 748
Implement "Dual" port forwarder (SSH for TCP, GRPC for UDP) #4210
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
Closed
Closed
Changes from all commits
Commits
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
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
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
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
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,138 @@ | ||
| // SPDX-FileCopyrightText: Copyright The Lima Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package hostagent | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "gotest.tools/v3/assert" | ||
|
|
||
| "github.com/lima-vm/lima/v2/pkg/limatype" | ||
| ) | ||
|
|
||
| func TestResolvePortForwardTypes(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| portForwardTypes map[limatype.Proto]limatype.PortForwardType | ||
| portForwards []limatype.PortForward | ||
| env map[string]string | ||
| expected map[limatype.Proto]limatype.PortForwardType | ||
| expectedErr string | ||
| }{ | ||
| { | ||
| name: "default", | ||
| portForwardTypes: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoTCP: limatype.PortForwardTypeSSH, | ||
| limatype.ProtoUDP: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| portForwards: nil, | ||
| env: nil, | ||
| expected: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoTCP: limatype.PortForwardTypeSSH, | ||
| limatype.ProtoUDP: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| }, | ||
| { | ||
| name: "grpc only via config", | ||
| portForwardTypes: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoAny: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| portForwards: nil, | ||
| env: nil, | ||
| expected: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoTCP: limatype.PortForwardTypeGRPC, | ||
| limatype.ProtoUDP: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| }, | ||
| { | ||
| name: "ssh only via env", | ||
| portForwardTypes: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoTCP: limatype.PortForwardTypeSSH, | ||
| limatype.ProtoUDP: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| portForwards: nil, | ||
| env: map[string]string{ | ||
| "LIMA_SSH_PORT_FORWARDER": "true", | ||
| }, | ||
| expected: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoTCP: limatype.PortForwardTypeSSH, | ||
| // No UDP support in SSH port forwarder | ||
| }, | ||
| }, | ||
| { | ||
| name: "grpc only via env", | ||
| portForwardTypes: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoTCP: limatype.PortForwardTypeSSH, | ||
| limatype.ProtoUDP: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| portForwards: nil, | ||
| env: map[string]string{ | ||
| "LIMA_SSH_PORT_FORWARDER": "false", | ||
| }, | ||
| expected: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoTCP: limatype.PortForwardTypeGRPC, | ||
| limatype.ProtoUDP: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| }, | ||
| { | ||
| name: "disable tcp via portForwards", | ||
| portForwardTypes: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoTCP: limatype.PortForwardTypeSSH, | ||
| limatype.ProtoUDP: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| portForwards: []limatype.PortForward{ | ||
| { | ||
| Ignore: true, | ||
| Proto: limatype.ProtoTCP, | ||
| GuestPortRange: [2]int{1, 65535}, | ||
| }, | ||
| }, | ||
| env: nil, | ||
| expected: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoUDP: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| }, | ||
| { | ||
| name: "disable tcp via portForwards, with any in portForwardTypes", | ||
| portForwardTypes: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoAny: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| portForwards: []limatype.PortForward{ | ||
| { | ||
| Ignore: true, | ||
| Proto: limatype.ProtoTCP, | ||
| GuestPortRange: [2]int{1, 65535}, | ||
| }, | ||
| }, | ||
| env: nil, | ||
| expected: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoUDP: limatype.PortForwardTypeGRPC, | ||
| }, | ||
| }, | ||
| { | ||
| name: "conflict between any and tcp", | ||
| portForwardTypes: map[limatype.Proto]limatype.PortForwardType{ | ||
| limatype.ProtoAny: limatype.PortForwardTypeGRPC, | ||
| limatype.ProtoTCP: limatype.PortForwardTypeSSH, | ||
| }, | ||
| portForwards: nil, | ||
| env: nil, | ||
| expectedErr: "conflicting port forward types for proto", | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| for envK, envV := range tt.env { | ||
| t.Setenv(envK, envV) | ||
| } | ||
| got, err := resolvePortForwardTypes(tt.portForwardTypes, tt.portForwards) | ||
| if tt.expectedErr != "" { | ||
| assert.ErrorContains(t, err, tt.expectedErr) | ||
| return | ||
| } | ||
| assert.NilError(t, err) | ||
| assert.DeepEqual(t, got, tt.expected) | ||
| }) | ||
| } | ||
| } |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
About the bool variables
*FwdIgnore*created based on thisportForwardTypes.They are only used to suppress log messages (
logrus.Infof("Not forwarding ...) when Forwarder decides not to forward by applying rules.And they are not involved in the forwarder applying/not applying the rules.
Therefore, the current implementation is not related to the newly introduced settings, first the SSH Forwarder binds the local port, then the gRPC Forwarder fails to bind, and the gRPC Forwarder only runs on the rules that the SSH Forwarder does not support.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, fixed(EDIT: reverted due to CI failures on Windows)