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

ipn/ipnlocal,cmd/tailscale: persist tailnet name in user profile

Browse Source 
This PR starts to persist the NetMap tailnet name in SetPrefs so that tailscaled
clients can use this value to disambiguate fast user switching from one tailnet
to another that are under the same exact login. We will also try to backfill
this information during backend starts and profile switches so that users don't
have to re-authenticate their profile. The first client to use this new
information is the CLI in 'tailscale switch -list' which now uses text/tabwriter
to display the ID, Tailnet, and Account. Since account names are ambiguous, we
allow the user to pass 'tailscale switch ID' to specify the exact tailnet they
want to switch to.

Updates #9286

Signed-off-by: Marwan Sulaiman <marwan@tailscale.com>
This commit is contained in:
Marwan Sulaiman
2023-11-16 21:40:23 -05:00
committed by Marwan Sulaiman
parent e75be017e4
commit 2dc0645368
10 changed files with 131 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
cmd/tailscale/cli/switch.go
View File

@@ -8,6 +8,8 @@ import (
"flag"
"fmt"
"os"
"strings"
"text/tabwriter"
"time"
"github.com/peterbourgon/ff/v3/ffcli"
@@ -25,10 +27,14 @@ var switchCmd = &ffcli.Command{
Exec: switchProfile,
UsageFunc: func(*ffcli.Command) string {
return `USAGE
switch <name>
switch <id>
switch --list
"tailscale switch" switches between logged in accounts.
"tailscale switch" switches between logged in accounts. You can
use the ID that's returned from 'tailnet switch -list'
to pick which profile you want to switch to. Alternatively, you
can use the Tailnet or the account names to switch as well.
This command is currently in alpha and may change in the future.`
},
}
@@ -42,12 +48,22 @@ func listProfiles(ctx context.Context) error {
if err != nil {
return err
}
tw := tabwriter.NewWriter(os.Stdout, 2, 2, 2, ' ', 0)
defer tw.Flush()
printRow := func(vals ...string) {
fmt.Fprintln(tw, strings.Join(vals, "\t"))
}
printRow("ID", "Tailnet", "Account")
for _, prof := range all {
name := prof.Name
if prof.ID == curP.ID {
fmt.Printf("%s *\n", prof.Name)
} else {
fmt.Println(prof.Name)
name += "*"
}
printRow(
string(prof.ID),
prof.NetworkProfile.DomainName,
name,
)
}
return nil
}
@@ -66,12 +82,30 @@ func switchProfile(ctx context.Context, args []string) error {
os.Exit(1)
}
var profID ipn.ProfileID
// Allow matching by ID, Tailnet, or Account
// in that order.
for _, p := range all {
if p.Name == args[0] {
if p.ID == ipn.ProfileID(args[0]) {
profID = p.ID
break
}
}
if profID == "" {
for _, p := range all {
if p.NetworkProfile.DomainName == args[0] {
profID = p.ID
break
}
}
}
if profID == "" {
for _, p := range all {
if p.Name == args[0] {
profID = p.ID
break
}
}
}
if profID == "" {
errf("No profile named %q\n", args[0])
os.Exit(1)