TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-03 06:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient,tailcfg:types: remove MaxKeyduration from NetMap

Browse Source 
This reverts most of 124dc10261ea (#10401).

Removing in favour of adding this in CapMaps instead (#14829).

Updates tailscale/corp#16016

Signed-off-by: James Sanderson <jsanderson@tailscale.com>
This commit is contained in:
James Sanderson 2025-01-30 14:20:27 +00:00 committed by James 'zofrex' Sanderson
parent 717fa68f3a
commit 45f29a208a
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
control/controlclient/map.go
View File

@ -89,7 +89,6 @@ type mapSession struct {
lastPopBrowserURL string lastPopBrowserURL string
lastTKAInfo *tailcfg.TKAInfo lastTKAInfo *tailcfg.TKAInfo
lastNetmapSummary string // from NetworkMap.VeryConcise lastNetmapSummary string // from NetworkMap.VeryConcise
lastMaxExpiry time.Duration
} }
// newMapSession returns a mostly unconfigured new mapSession. // newMapSession returns a mostly unconfigured new mapSession.
@ -384,9 +383,6 @@ func (ms *mapSession) updateStateFromResponse(resp *tailcfg.MapResponse) {
if resp.TKAInfo != nil { if resp.TKAInfo != nil {
ms.lastTKAInfo = resp.TKAInfo ms.lastTKAInfo = resp.TKAInfo
} }
if resp.MaxKeyDuration > 0 {
ms.lastMaxExpiry = resp.MaxKeyDuration
}
} }
var ( var (
@ -819,7 +815,6 @@ func (ms *mapSession) netmap() *netmap.NetworkMap {
DERPMap: ms.lastDERPMap, DERPMap: ms.lastDERPMap,
ControlHealth: ms.lastHealth, ControlHealth: ms.lastHealth,
TKAEnabled: ms.lastTKAInfo != nil && !ms.lastTKAInfo.Disabled, TKAEnabled: ms.lastTKAInfo != nil && !ms.lastTKAInfo.Disabled,
MaxKeyDuration: ms.lastMaxExpiry,
} }
if ms.lastTKAInfo != nil && ms.lastTKAInfo.Head != "" { if ms.lastTKAInfo != nil && ms.lastTKAInfo.Head != "" {

4
tailcfg/tailcfg.go
View File

@ -2022,10 +2022,6 @@ type MapResponse struct {
// auto-update setting doesn't change if the tailnet admin flips the // auto-update setting doesn't change if the tailnet admin flips the
// default after the node registered. // default after the node registered.
DefaultAutoUpdate opt.Bool `json:",omitempty"` DefaultAutoUpdate opt.Bool `json:",omitempty"`
// MaxKeyDuration describes the MaxKeyDuration setting for the tailnet.
// If zero, the value is unchanged.
MaxKeyDuration time.Duration `json:",omitempty"`
} }
// ClientVersion is information about the latest client version that's available // ClientVersion is information about the latest client version that's available

3
types/netmap/netmap.go
View File

@ -79,9 +79,6 @@ type NetworkMap struct {
// UserProfiles contains the profile information of UserIDs referenced // UserProfiles contains the profile information of UserIDs referenced
// in SelfNode and Peers. // in SelfNode and Peers.
UserProfiles map[tailcfg.UserID]tailcfg.UserProfileView UserProfiles map[tailcfg.UserID]tailcfg.UserProfileView
// MaxKeyDuration describes the MaxKeyDuration setting for the tailnet.
MaxKeyDuration time.Duration
} }
// User returns nm.SelfNode.User if nm.SelfNode is non-nil, otherwise it returns // User returns nm.SelfNode.User if nm.SelfNode is non-nil, otherwise it returns

3
types/netmap/nodemut.go
View File

@ -176,6 +176,5 @@ func mapResponseContainsNonPatchFields(res *tailcfg.MapResponse) bool {
// function is called, so it should never be set anyway. But for // function is called, so it should never be set anyway. But for
// completedness, and for tests, check it too: // completedness, and for tests, check it too:
res.PeersChanged != nil || res.PeersChanged != nil ||
res.DefaultAutoUpdate != "" || res.DefaultAutoUpdate != ""
res.MaxKeyDuration > 0
} }