control/controlclient: fix crash in tests elsewhere when GetNLPublicKey is nil
caused tests in another repo to fail with a crash, calling
a nil func. This might not be the right fix, but fixes the build.
@@ -67,7 +67,7 @@ type Direct struct {
linkMon *monitor.Mon // or nil
discoPubKey key.DiscoPublic
getMachinePrivKey func() (key.MachinePrivate, error)
- getNLPublicKey func() (key.NLPublic, error)
+ getNLPublicKey func() (key.NLPublic, error) // or nil
debugFlags []string
keepSharerAndUserSplit bool
skipIPForwardingCheck bool
@@ -108,6 +108,9 @@ type Options struct {
LinkMonitor *monitor.Mon // optional link monitor
PopBrowserURL func(url string) // optional func to open browser
Dialer *tsdial.Dialer // non-nil
+
+ // GetNLPublicKey specifies an optional function to use
+ // Network Lock. If nil, it's not used.
GetNLPublicKey func() (key.NLPublic, error)
// Status is called when there's a change in status.
@@ -427,10 +430,13 @@ func (c *Direct) doLogin(ctx context.Context, opt loginOpt) (mustRegen bool, new
oldNodeKey = persist.OldPrivateNodeKey.Public()
}
- nlPub, err := c.getNLPublicKey()
+ var nlPub key.NLPublic
+ if c.getNLPublicKey != nil {
+ nlPub, err = c.getNLPublicKey()
if err != nil {
return false, "", fmt.Errorf("get nl key: %v", err)
}
+ }
if tryingNewKey.IsZero() {
if opt.Logout {
