TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-27 19:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscale/cli: serve --set-path should not force background mode (#9905)

Browse Source 
A few people have run into issues with understanding why `--set-path` started in background mode, and/or why they couldn't use a path in foreground mode. This change allows `--set-path` to be used in either case (foreground or background).

updates #8489

Signed-off-by: Tyler Smalley <tyler@tailscale.com>
This commit is contained in:
Tyler Smalley 2023-10-24 09:56:41 -07:00 committed by GitHub
parent b2ae8fdf80
commit 269a498c1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/tailscale/cli/serve_v2.go
View File

@ -222,14 +222,6 @@ func (e *serveEnv) runServeCombined(subcmd serveMode) execFunc {
return fmt.Errorf("failed to clean the mount point: %w", err) return fmt.Errorf("failed to clean the mount point: %w", err)
} }
if e.setPath != "" {
// TODO(marwan-at-work): either
// 1. Warn the user that this is a side effect.
// 2. Force the user to pass --bg
// 3. Allow set-path to be in the foreground.
e.bg = true
}
srvType, srvPort, err := srvTypeAndPortFromFlags(e) srvType, srvPort, err := srvTypeAndPortFromFlags(e)
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "error: %v\n\n", err) fmt.Fprintf(os.Stderr, "error: %v\n\n", err)

42
cmd/tailscale/cli/serve_v2_test.go
View File

@ -85,7 +85,7 @@ func TestServeDevConfigMutations(t *testing.T) {
// --set-path runs in background // --set-path runs in background
add(step{reset: true}) add(step{reset: true})
add(step{ add(step{
command: cmd("serve --set-path=/ localhost:3000"), command: cmd("serve --bg --set-path=/ localhost:3000"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -138,7 +138,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ // support non Funnel port add(step{ // support non Funnel port
command: cmd("serve --http=9999 --set-path=/abc http://localhost:3001"), command: cmd("serve --http=9999 --bg --set-path=/abc http://localhost:3001"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{80: {HTTP: true}, 9999: {HTTP: true}}, TCP: map[uint16]*ipn.TCPPortHandler{80: {HTTP: true}, 9999: {HTTP: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -152,7 +152,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ add(step{
command: cmd("serve --http=9999 --set-path=/abc off"), command: cmd("serve --http=9999 --bg --set-path=/abc off"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{80: {HTTP: true}}, TCP: map[uint16]*ipn.TCPPortHandler{80: {HTTP: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -163,7 +163,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ add(step{
command: cmd("serve --http=8080 --set-path=/abc http://127.0.0.1:3001"), command: cmd("serve --http=8080 --bg --set-path=/abc http://127.0.0.1:3001"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{80: {HTTP: true}, 8080: {HTTP: true}}, TCP: map[uint16]*ipn.TCPPortHandler{80: {HTTP: true}, 8080: {HTTP: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -207,7 +207,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ // support non Funnel port add(step{ // support non Funnel port
command: cmd("serve --https=9999 --set-path=/abc http://localhost:3001"), command: cmd("serve --https=9999 --bg --set-path=/abc http://localhost:3001"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 9999: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 9999: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -221,7 +221,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ add(step{
command: cmd("serve --https=9999 --set-path=/abc off"), command: cmd("serve --https=9999 --bg --set-path=/abc off"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -232,7 +232,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ add(step{
command: cmd("serve --https=8443 --set-path=/abc http://127.0.0.1:3001"), command: cmd("serve --https=8443 --bg --set-path=/abc http://127.0.0.1:3001"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 8443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 8443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -264,7 +264,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ add(step{
command: cmd("serve --https=443 --set-path=/foo off"), command: cmd("serve --https=443 --bg --set-path=/foo off"),
want: nil, // nothing to save want: nil, // nothing to save
wantErr: anyErr(), wantErr: anyErr(),
}) // handler doesn't exist, so we get an error }) // handler doesn't exist, so we get an error
@ -294,11 +294,11 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ add(step{
command: cmd("serve --https=8443 --set-path=/abc off"), command: cmd("serve --https=8443 --bg --set-path=/abc off"),
want: &ipn.ServeConfig{}, want: &ipn.ServeConfig{},
}) })
add(step{ // clean mount: "bar" becomes "/bar" add(step{ // clean mount: "bar" becomes "/bar"
command: cmd("serve --https=443 --set-path=bar https://127.0.0.1:8443"), command: cmd("serve --https=443 --bg --set-path=bar https://127.0.0.1:8443"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -329,7 +329,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}) })
add(step{reset: true}) add(step{reset: true})
add(step{ add(step{
command: cmd("serve --https=443 --set-path=/foo localhost:3000"), command: cmd("serve --https=443 --bg --set-path=/foo localhost:3000"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -340,7 +340,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ // test a second handler on the same port add(step{ // test a second handler on the same port
command: cmd("serve --https=8443 --set-path=/foo localhost:3000"), command: cmd("serve --https=8443 --bg --set-path=/foo localhost:3000"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 8443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 8443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -414,10 +414,6 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}, },
}) })
// add(step{
// command: cmd("serve --tls-terminated-tcp=443 --bg tcp://127.0.0.1:8443"),
// want: nil, // nothing to save
// })
add(step{ add(step{
command: cmd("serve --tls-terminated-tcp=443 --bg tcp://localhost:8444"), command: cmd("serve --tls-terminated-tcp=443 --bg tcp://localhost:8444"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
@ -499,7 +495,7 @@ func TestServeDevConfigMutations(t *testing.T) {
os.MkdirAll(filepath.Join(td, "subdir"), 0700) os.MkdirAll(filepath.Join(td, "subdir"), 0700)
writeFile("subdir/file-a", "this is A") writeFile("subdir/file-a", "this is A")
add(step{ add(step{
command: cmd("serve --https=443 --set-path=/some/where " + filepath.Join(td, "subdir/file-a")), command: cmd("serve --https=443 --bg --set-path=/some/where " + filepath.Join(td, "subdir/file-a")),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -557,7 +553,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ // serving on secondary port doesn't change funnel on primary port add(step{ // serving on secondary port doesn't change funnel on primary port
command: cmd("serve --https=8443 --set-path=/bar localhost:3001"), command: cmd("serve --https=8443 --bg --set-path=/bar localhost:3001"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
AllowFunnel: map[ipn.HostPort]bool{"foo.test.ts.net:443": true}, AllowFunnel: map[ipn.HostPort]bool{"foo.test.ts.net:443": true},
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 8443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 8443: {HTTPS: true}},
@ -572,7 +568,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ // turn funnel on for secondary port add(step{ // turn funnel on for secondary port
command: cmd("funnel --https=8443 --set-path=/bar localhost:3001"), command: cmd("funnel --https=8443 --bg --set-path=/bar localhost:3001"),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
AllowFunnel: map[ipn.HostPort]bool{"foo.test.ts.net:443": true, "foo.test.ts.net:8443": true}, AllowFunnel: map[ipn.HostPort]bool{"foo.test.ts.net:443": true, "foo.test.ts.net:8443": true},
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 8443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}, 8443: {HTTPS: true}},
@ -637,7 +633,7 @@ func TestServeDevConfigMutations(t *testing.T) {
// tricky steps // tricky steps
add(step{reset: true}) add(step{reset: true})
add(step{ // a directory with a trailing slash mount point add(step{ // a directory with a trailing slash mount point
command: cmd("serve --https=443 --set-path=/dir " + filepath.Join(td, "subdir")), command: cmd("serve --https=443 --bg --set-path=/dir " + filepath.Join(td, "subdir")),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -648,7 +644,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ // this should overwrite the previous one add(step{ // this should overwrite the previous one
command: cmd("serve --https=443 --set-path=/dir " + filepath.Join(td, "foo")), command: cmd("serve --https=443 --bg --set-path=/dir " + filepath.Join(td, "foo")),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -660,7 +656,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}) })
add(step{reset: true}) // reset and do the opposite add(step{reset: true}) // reset and do the opposite
add(step{ // a file without a trailing slash mount point add(step{ // a file without a trailing slash mount point
command: cmd("serve --https=443 --set-path=/dir " + filepath.Join(td, "foo")), command: cmd("serve --https=443 --bg --set-path=/dir " + filepath.Join(td, "foo")),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{
@ -671,7 +667,7 @@ func TestServeDevConfigMutations(t *testing.T) {
}, },
}) })
add(step{ // this should overwrite the previous one add(step{ // this should overwrite the previous one
command: cmd("serve --https=443 --set-path=/dir " + filepath.Join(td, "subdir")), command: cmd("serve --https=443 --bg --set-path=/dir " + filepath.Join(td, "subdir")),
want: &ipn.ServeConfig{ want: &ipn.ServeConfig{
TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}}, TCP: map[uint16]*ipn.TCPPortHandler{443: {HTTPS: true}},
Web: map[ipn.HostPort]*ipn.WebServerConfig{ Web: map[ipn.HostPort]*ipn.WebServerConfig{