archive
/
tailscale
mirror of https://github.com/tailscale/tailscale/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipn/ipnlocal: drop not required StateKey parameter

Browse Source 
This is #cleanup now that #7121 is merged.

Signed-off-by: Maisem Ali <maisem@tailscale.com>
pull/7124/head
Maisem Ali 2 years ago committed by Maisem Ali
parent 73d33e3f20
commit 04b57a371e
14 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File

2
cmd/tailscaled/tailscaled.go
Unescape Escape View File

@ -520,7 +520,7 @@ func getLocalBackend(ctx context.Context, logf logger.Logf, logid string) (_ *ip
return nil, fmt.Errorf("store.New: %w", err) return nil, fmt.Errorf("store.New: %w", err)
} }
lb, err := ipnlocal.NewLocalBackend(logf, logid, store, "", dialer, e, opts.LoginFlags) lb, err := ipnlocal.NewLocalBackend(logf, logid, store, dialer, e, opts.LoginFlags)
if err != nil { if err != nil {
return nil, fmt.Errorf("ipnlocal.NewLocalBackend: %w", err) return nil, fmt.Errorf("ipnlocal.NewLocalBackend: %w", err)
} }

2
cmd/tsconnect/wasm/wasm_js.go
Unescape Escape View File

@ -124,7 +124,7 @@ func newIPN(jsConfig js.Value) map[string]any {
logid := lpc.PublicID.String() logid := lpc.PublicID.String()
srv := ipnserver.New(logf, logid) srv := ipnserver.New(logf, logid)
lb, err := ipnlocal.NewLocalBackend(logf, logid, store, "", dialer, eng, controlclient.LoginEphemeral) lb, err := ipnlocal.NewLocalBackend(logf, logid, store, dialer, eng, controlclient.LoginEphemeral)
if err != nil { if err != nil {
log.Fatalf("ipnlocal.NewLocalBackend: %v", err) log.Fatalf("ipnlocal.NewLocalBackend: %v", err)
} }

4
ipn/ipnlocal/local.go
Unescape Escape View File

@ -243,12 +243,12 @@ type clientGen func(controlclient.Options) (controlclient.Client, error)
// but is not actually running. // but is not actually running.
// //
// If dialer is nil, a new one is made. // If dialer is nil, a new one is made.
func NewLocalBackend(logf logger.Logf, logid string, store ipn.StateStore, stateKey ipn.StateKey, dialer *tsdial.Dialer, e wgengine.Engine, loginFlags controlclient.LoginFlags) (*LocalBackend, error) { func NewLocalBackend(logf logger.Logf, logid string, store ipn.StateStore, dialer *tsdial.Dialer, e wgengine.Engine, loginFlags controlclient.LoginFlags) (*LocalBackend, error) {
if e == nil { if e == nil {
panic("ipn.NewLocalBackend: engine must not be nil") panic("ipn.NewLocalBackend: engine must not be nil")
} }
pm, err := newProfileManager(store, logf, stateKey) pm, err := newProfileManager(store, logf)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
ipn/ipnlocal/local_test.go
Unescape Escape View File

@ -491,7 +491,7 @@ func TestLazyMachineKeyGeneration(t *testing.T) {
t.Fatalf("NewFakeUserspaceEngine: %v", err) t.Fatalf("NewFakeUserspaceEngine: %v", err)
} }
t.Cleanup(eng.Close) t.Cleanup(eng.Close)
lb, err := NewLocalBackend(logf, "logid", store, "default", nil, eng, 0) lb, err := NewLocalBackend(logf, "logid", store, nil, eng, 0)
if err != nil { if err != nil {
t.Fatalf("NewLocalBackend: %v", err) t.Fatalf("NewLocalBackend: %v", err)
} }
@ -755,7 +755,7 @@ func TestStatusWithoutPeers(t *testing.T) {
} }
t.Cleanup(e.Close) t.Cleanup(e.Close)
b, err := NewLocalBackend(logf, "logid", store, "", nil, e, 0) b, err := NewLocalBackend(logf, "logid", store, nil, e, 0)
if err != nil { if err != nil {
t.Fatalf("NewLocalBackend: %v", err) t.Fatalf("NewLocalBackend: %v", err)
} }

2
ipn/ipnlocal/loglines_test.go
Unescape Escape View File

@ -54,7 +54,7 @@ func TestLocalLogLines(t *testing.T) {
} }
t.Cleanup(e.Close) t.Cleanup(e.Close)
lb, err := NewLocalBackend(logf, idA.String(), store, "", nil, e, 0) lb, err := NewLocalBackend(logf, idA.String(), store, nil, e, 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

12
ipn/ipnlocal/network-lock_test.go
Unescape Escape View File

@ -141,7 +141,7 @@ func TestTKAEnablementFlow(t *testing.T) {
temp := t.TempDir() temp := t.TempDir()
cc := fakeControlClient(t, client) cc := fakeControlClient(t, client)
pm := must.Get(newProfileManager(new(mem.Store), t.Logf, "")) pm := must.Get(newProfileManager(new(mem.Store), t.Logf))
must.Do(pm.SetPrefs((&ipn.Prefs{ must.Do(pm.SetPrefs((&ipn.Prefs{
Persist: &persist.Persist{ Persist: &persist.Persist{
PrivateNodeKey: nodePriv, PrivateNodeKey: nodePriv,
@ -182,7 +182,7 @@ func TestTKADisablementFlow(t *testing.T) {
nlPriv := key.NewNLPrivate() nlPriv := key.NewNLPrivate()
key := tka.Key{Kind: tka.Key25519, Public: nlPriv.Public().Verifier(), Votes: 2} key := tka.Key{Kind: tka.Key25519, Public: nlPriv.Public().Verifier(), Votes: 2}
pm := must.Get(newProfileManager(new(mem.Store), t.Logf, "")) pm := must.Get(newProfileManager(new(mem.Store), t.Logf))
must.Do(pm.SetPrefs((&ipn.Prefs{ must.Do(pm.SetPrefs((&ipn.Prefs{
Persist: &persist.Persist{ Persist: &persist.Persist{
PrivateNodeKey: nodePriv, PrivateNodeKey: nodePriv,
@ -377,7 +377,7 @@ func TestTKASync(t *testing.T) {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
nodePriv := key.NewNode() nodePriv := key.NewNode()
nlPriv := key.NewNLPrivate() nlPriv := key.NewNLPrivate()
pm := must.Get(newProfileManager(new(mem.Store), t.Logf, "")) pm := must.Get(newProfileManager(new(mem.Store), t.Logf))
must.Do(pm.SetPrefs((&ipn.Prefs{ must.Do(pm.SetPrefs((&ipn.Prefs{
Persist: &persist.Persist{ Persist: &persist.Persist{
PrivateNodeKey: nodePriv, PrivateNodeKey: nodePriv,
@ -604,7 +604,7 @@ func TestTKADisable(t *testing.T) {
disablementSecret := bytes.Repeat([]byte{0xa5}, 32) disablementSecret := bytes.Repeat([]byte{0xa5}, 32)
nlPriv := key.NewNLPrivate() nlPriv := key.NewNLPrivate()
pm := must.Get(newProfileManager(new(mem.Store), t.Logf, "")) pm := must.Get(newProfileManager(new(mem.Store), t.Logf))
must.Do(pm.SetPrefs((&ipn.Prefs{ must.Do(pm.SetPrefs((&ipn.Prefs{
Persist: &persist.Persist{ Persist: &persist.Persist{
PrivateNodeKey: nodePriv, PrivateNodeKey: nodePriv,
@ -697,7 +697,7 @@ func TestTKASign(t *testing.T) {
toSign := key.NewNode() toSign := key.NewNode()
nlPriv := key.NewNLPrivate() nlPriv := key.NewNLPrivate()
pm := must.Get(newProfileManager(new(mem.Store), t.Logf, "")) pm := must.Get(newProfileManager(new(mem.Store), t.Logf))
must.Do(pm.SetPrefs((&ipn.Prefs{ must.Do(pm.SetPrefs((&ipn.Prefs{
Persist: &persist.Persist{ Persist: &persist.Persist{
PrivateNodeKey: nodePriv, PrivateNodeKey: nodePriv,
@ -788,7 +788,7 @@ func TestTKAForceDisable(t *testing.T) {
nlPriv := key.NewNLPrivate() nlPriv := key.NewNLPrivate()
key := tka.Key{Kind: tka.Key25519, Public: nlPriv.Public().Verifier(), Votes: 2} key := tka.Key{Kind: tka.Key25519, Public: nlPriv.Public().Verifier(), Votes: 2}
pm := must.Get(newProfileManager(new(mem.Store), t.Logf, "")) pm := must.Get(newProfileManager(new(mem.Store), t.Logf))
must.Do(pm.SetPrefs((&ipn.Prefs{ must.Do(pm.SetPrefs((&ipn.Prefs{
Persist: &persist.Persist{ Persist: &persist.Persist{
PrivateNodeKey: nodePriv, PrivateNodeKey: nodePriv,

2
ipn/ipnlocal/peerapi_test.go
Unescape Escape View File

@ -642,7 +642,7 @@ func TestPeerAPIReplyToDNSQueries(t *testing.T) {
h.remoteAddr = netip.MustParseAddrPort("100.150.151.152:12345") h.remoteAddr = netip.MustParseAddrPort("100.150.151.152:12345")
eng, _ := wgengine.NewFakeUserspaceEngine(logger.Discard, 0) eng, _ := wgengine.NewFakeUserspaceEngine(logger.Discard, 0)
pm := must.Get(newProfileManager(new(mem.Store), t.Logf, "")) pm := must.Get(newProfileManager(new(mem.Store), t.Logf))
h.ps = &peerAPIServer{ h.ps = &peerAPIServer{
b: &LocalBackend{ b: &LocalBackend{
e: eng, e: eng,

18
ipn/ipnlocal/profiles.go
Unescape Escape View File

@ -452,7 +452,7 @@ func (pm *profileManager) CurrentPrefs() ipn.PrefsView {
// ReadStartupPrefsForTest reads the startup prefs from disk. It is only used for testing. // ReadStartupPrefsForTest reads the startup prefs from disk. It is only used for testing.
func ReadStartupPrefsForTest(logf logger.Logf, store ipn.StateStore) (ipn.PrefsView, error) { func ReadStartupPrefsForTest(logf logger.Logf, store ipn.StateStore) (ipn.PrefsView, error) {
pm, err := newProfileManager(store, logf, "") pm, err := newProfileManager(store, logf)
if err != nil { if err != nil {
return ipn.PrefsView{}, err return ipn.PrefsView{}, err
} }
@ -461,9 +461,8 @@ func ReadStartupPrefsForTest(logf logger.Logf, store ipn.StateStore) (ipn.PrefsV
// newProfileManager creates a new ProfileManager using the provided StateStore. // newProfileManager creates a new ProfileManager using the provided StateStore.
// It also loads the list of known profiles from the StateStore. // It also loads the list of known profiles from the StateStore.
// If a state key is provided, it will be used to load the current profile. func newProfileManager(store ipn.StateStore, logf logger.Logf) (*profileManager, error) {
func newProfileManager(store ipn.StateStore, logf logger.Logf, stateKey ipn.StateKey) (*profileManager, error) { return newProfileManagerWithGOOS(store, logf, envknob.GOOS())
return newProfileManagerWithGOOS(store, logf, stateKey, envknob.GOOS())
} }
func readAutoStartKey(store ipn.StateStore, goos string) (ipn.StateKey, error) { func readAutoStartKey(store ipn.StateStore, goos string) (ipn.StateKey, error) {
@ -496,14 +495,11 @@ func readKnownProfiles(store ipn.StateStore) (map[ipn.ProfileID]*ipn.LoginProfil
return knownProfiles, nil return knownProfiles, nil
} }
func newProfileManagerWithGOOS(store ipn.StateStore, logf logger.Logf, stateKey ipn.StateKey, goos string) (*profileManager, error) { func newProfileManagerWithGOOS(store ipn.StateStore, logf logger.Logf, goos string) (*profileManager, error) {
logf = logger.WithPrefix(logf, "pm: ") logf = logger.WithPrefix(logf, "pm: ")
if stateKey == "" { stateKey, err := readAutoStartKey(store, goos)
var err error if err != nil {
stateKey, err = readAutoStartKey(store, goos) return nil, err
if err != nil {
return nil, err
}
} }
knownProfiles, err := readKnownProfiles(store) knownProfiles, err := readKnownProfiles(store)

18
ipn/ipnlocal/profiles_test.go
Unescape Escape View File

@ -18,7 +18,7 @@ import (
func TestProfileCurrentUserSwitch(t *testing.T) { func TestProfileCurrentUserSwitch(t *testing.T) {
store := new(mem.Store) store := new(mem.Store)
pm, err := newProfileManagerWithGOOS(store, logger.Discard, "", "linux") pm, err := newProfileManagerWithGOOS(store, logger.Discard, "linux")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -56,7 +56,7 @@ func TestProfileCurrentUserSwitch(t *testing.T) {
t.Fatalf("CurrentPrefs() = %v, want emptyPrefs", pm.CurrentPrefs().Pretty()) t.Fatalf("CurrentPrefs() = %v, want emptyPrefs", pm.CurrentPrefs().Pretty())
} }
pm, err = newProfileManagerWithGOOS(store, logger.Discard, "", "linux") pm, err = newProfileManagerWithGOOS(store, logger.Discard, "linux")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -74,7 +74,7 @@ func TestProfileCurrentUserSwitch(t *testing.T) {
func TestProfileList(t *testing.T) { func TestProfileList(t *testing.T) {
store := new(mem.Store) store := new(mem.Store)
pm, err := newProfileManagerWithGOOS(store, logger.Discard, "", "linux") pm, err := newProfileManagerWithGOOS(store, logger.Discard, "linux")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -152,7 +152,7 @@ func TestProfileList(t *testing.T) {
func TestProfileManagement(t *testing.T) { func TestProfileManagement(t *testing.T) {
store := new(mem.Store) store := new(mem.Store)
pm, err := newProfileManagerWithGOOS(store, logger.Discard, "", "linux") pm, err := newProfileManagerWithGOOS(store, logger.Discard, "linux")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -250,7 +250,7 @@ func TestProfileManagement(t *testing.T) {
t.Logf("Recreate profile manager from store") t.Logf("Recreate profile manager from store")
// Recreate the profile manager to ensure that it can load the profiles // Recreate the profile manager to ensure that it can load the profiles
// from the store at startup. // from the store at startup.
pm, err = newProfileManagerWithGOOS(store, logger.Discard, "", "linux") pm, err = newProfileManagerWithGOOS(store, logger.Discard, "linux")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -266,7 +266,7 @@ func TestProfileManagement(t *testing.T) {
t.Logf("Recreate profile manager from store after deleting default profile") t.Logf("Recreate profile manager from store after deleting default profile")
// Recreate the profile manager to ensure that it can load the profiles // Recreate the profile manager to ensure that it can load the profiles
// from the store at startup. // from the store at startup.
pm, err = newProfileManagerWithGOOS(store, logger.Discard, "", "linux") pm, err = newProfileManagerWithGOOS(store, logger.Discard, "linux")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -303,7 +303,7 @@ func TestProfileManagement(t *testing.T) {
func TestProfileManagementWindows(t *testing.T) { func TestProfileManagementWindows(t *testing.T) {
store := new(mem.Store) store := new(mem.Store)
pm, err := newProfileManagerWithGOOS(store, logger.Discard, "", "windows") pm, err := newProfileManagerWithGOOS(store, logger.Discard, "windows")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -374,7 +374,7 @@ func TestProfileManagementWindows(t *testing.T) {
t.Logf("Recreate profile manager from store, should reset prefs") t.Logf("Recreate profile manager from store, should reset prefs")
// Recreate the profile manager to ensure that it can load the profiles // Recreate the profile manager to ensure that it can load the profiles
// from the store at startup. // from the store at startup.
pm, err = newProfileManagerWithGOOS(store, logger.Discard, "", "windows") pm, err = newProfileManagerWithGOOS(store, logger.Discard, "windows")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -399,7 +399,7 @@ func TestProfileManagementWindows(t *testing.T) {
} }
// Recreate the profile manager to ensure that it starts with test profile. // Recreate the profile manager to ensure that it starts with test profile.
pm, err = newProfileManagerWithGOOS(store, logger.Discard, "", "windows") pm, err = newProfileManagerWithGOOS(store, logger.Discard, "windows")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
ipn/ipnlocal/ssh_test.go
Unescape Escape View File

@ -49,7 +49,7 @@ type fakeSSHServer struct {
} }
func TestGetSSHUsernames(t *testing.T) { func TestGetSSHUsernames(t *testing.T) {
pm := must.Get(newProfileManager(new(mem.Store), t.Logf, "")) pm := must.Get(newProfileManager(new(mem.Store), t.Logf))
b := &LocalBackend{pm: pm, store: pm.Store()} b := &LocalBackend{pm: pm, store: pm.Store()}
b.sshServer = fakeSSHServer{} b.sshServer = fakeSSHServer{}
res, err := b.getSSHUsernames(new(tailcfg.C2NSSHUsernamesRequest)) res, err := b.getSSHUsernames(new(tailcfg.C2NSSHUsernamesRequest))

6
ipn/ipnlocal/state_test.go
Unescape Escape View File

@ -303,7 +303,7 @@ func TestStateMachine(t *testing.T) {
} }
t.Cleanup(e.Close) t.Cleanup(e.Close)
b, err := NewLocalBackend(logf, "logid", store, "", nil, e, 0) b, err := NewLocalBackend(logf, "logid", store, nil, e, 0)
if err != nil { if err != nil {
t.Fatalf("NewLocalBackend: %v", err) t.Fatalf("NewLocalBackend: %v", err)
} }
@ -943,7 +943,7 @@ func TestEditPrefsHasNoKeys(t *testing.T) {
} }
t.Cleanup(e.Close) t.Cleanup(e.Close)
b, err := NewLocalBackend(logf, "logid", new(mem.Store), "", nil, e, 0) b, err := NewLocalBackend(logf, "logid", new(mem.Store), nil, e, 0)
if err != nil { if err != nil {
t.Fatalf("NewLocalBackend: %v", err) t.Fatalf("NewLocalBackend: %v", err)
} }
@ -1022,7 +1022,7 @@ func TestWGEngineStatusRace(t *testing.T) {
eng, err := wgengine.NewFakeUserspaceEngine(logf, 0) eng, err := wgengine.NewFakeUserspaceEngine(logf, 0)
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
t.Cleanup(eng.Close) t.Cleanup(eng.Close)
b, err := NewLocalBackend(logf, "logid", new(mem.Store), "", nil, eng, 0) b, err := NewLocalBackend(logf, "logid", new(mem.Store), nil, eng, 0)
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
var cc *mockControl var cc *mockControl

2
ssh/tailssh/tailssh_test.go
Unescape Escape View File

@ -507,7 +507,7 @@ func TestSSH(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
lb, err := ipnlocal.NewLocalBackend(logf, "", lb, err := ipnlocal.NewLocalBackend(logf, "",
new(mem.Store), "", new(mem.Store),
new(tsdial.Dialer), new(tsdial.Dialer),
eng, 0) eng, 0)
if err != nil { if err != nil {

2
tsnet/tsnet.go
Unescape Escape View File

@ -338,7 +338,7 @@ func (s *Server) start() (reterr error) {
if s.Ephemeral { if s.Ephemeral {
loginFlags = controlclient.LoginEphemeral loginFlags = controlclient.LoginEphemeral
} }
lb, err := ipnlocal.NewLocalBackend(logf, logid, s.Store, "", s.dialer, eng, loginFlags) lb, err := ipnlocal.NewLocalBackend(logf, logid, s.Store, s.dialer, eng, loginFlags)
if err != nil { if err != nil {
return fmt.Errorf("NewLocalBackend: %v", err) return fmt.Errorf("NewLocalBackend: %v", err)
} }

4
wgengine/netstack/netstack_test.go
Unescape Escape View File

@ -49,7 +49,7 @@ func TestInjectInboundLeak(t *testing.T) {
t.Fatal("failed to get internals") t.Fatal("failed to get internals")
} }
lb, err := ipnlocal.NewLocalBackend(logf, "logid", new(mem.Store), "", dialer, eng, 0) lb, err := ipnlocal.NewLocalBackend(logf, "logid", new(mem.Store), dialer, eng, 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -113,7 +113,7 @@ func makeNetstack(t *testing.T, config func(*Impl)) *Impl {
} }
t.Cleanup(func() { ns.Close() }) t.Cleanup(func() { ns.Close() })
lb, err := ipnlocal.NewLocalBackend(logf, "logid", new(mem.Store), "", dialer, eng, 0) lb, err := ipnlocal.NewLocalBackend(logf, "logid", new(mem.Store), dialer, eng, 0)
if err != nil { if err != nil {
t.Fatalf("NewLocalBackend: %v", err) t.Fatalf("NewLocalBackend: %v", err)
} }

Write Preview
Loading…
Cancel
Save