Fix: Can't use Unix Sockets in Quick Tunnel mode #1367
Conversation
This file contains 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
rhyswilliamsza
commented
Dec 10, 2024
Comment on lines
+317
to
+319
| shouldRunQuickTunnel := c.IsSet("url") || c.IsSet("unix-socket") || c.IsSet(ingress.HelloWorldFlag) | ||
| if !c.IsSet("proxy-dns") && c.String("quick-service") != "" && shouldRunQuickTunnel { | ||
| return RunQuickTunnel(sc) | ||
| return runQuickTunnel(sc) |
There was a problem hiding this comment.
I was hoping to avoid changes here as far as possible, but I'm happy to refactor this into a separate function if this is too hacky.
rhyswilliamsza
commented
Dec 10, 2024
| @@ -15,3 +18,76 @@ func TestHostnameFromURI(t *testing.T) { | |||
| assert.Equal(t, "", hostnameFromURI("trash")) | |||
| assert.Equal(t, "", hostnameFromURI("https://awesomesauce.com")) | |||
| } | |||
|
|
|||
| func TestShouldRunQuickTunnel(t *testing.T) { | |||
There was a problem hiding this comment.
I've scoped this specifically to quick tunnels, so it won't test falling through to other tunnel types.
rhyswilliamsza
commented
Dec 10, 2024
| @@ -313,9 +314,9 @@ func TunnelCommand(c *cli.Context) error { | |||
| // Run a quick tunnel | |||
| // A unauthenticated named tunnel hosted on <random>.<quick-tunnels-service>.com | |||
| // We don't support running proxy-dns and a quick tunnel at the same time as the same process | |||
| shouldRunQuickTunnel := c.IsSet("url") || c.IsSet(ingress.HelloWorldFlag) | |||
| shouldRunQuickTunnel := c.IsSet("url") || c.IsSet("unix-socket") || c.IsSet(ingress.HelloWorldFlag) | |||
There was a problem hiding this comment.
I haven't done any side-effect analysis to check whether anyone could be relying on --unix-socket forcing a trapdoor to proxy-dns, but that seems unlikely so it should be okay.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
From #1294:
This PR aims to address the above by adding
unix-socketas an accepted flag for spawning quick tunnels. I unfortunately couldn't find an elegant way to mock out theRunQuickTunnelcommand, so I had to add a small work around. Please let me know if there is a better standard for this.Thanks!