mirror of
https://github.com/juanfont/headscale.git
synced 2024-12-20 19:09:07 +01:00
ed4e19996b
* upgrade tailscale Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * make Node object use actualy tailscale key types This commit changes the Node struct to have both a field for strings to store the keys in the database and a dedicated Key for each type of key. The keys are populated and stored with Gorm hooks to ensure the data is stored in the db. Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * use key types throughout the code Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * make sure machinekey is concistently used Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * use machine key in auth url Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * fix web register Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * use key type in notifier Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * fix relogin with webauth Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> --------- Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
82 lines
1.9 KiB
Go
82 lines
1.9 KiB
Go
package notifier
|
|
|
|
import (
|
|
"sync"
|
|
|
|
"github.com/juanfont/headscale/hscontrol/types"
|
|
"github.com/juanfont/headscale/hscontrol/util"
|
|
"github.com/rs/zerolog/log"
|
|
"tailscale.com/types/key"
|
|
)
|
|
|
|
type Notifier struct {
|
|
l sync.RWMutex
|
|
nodes map[string]chan<- types.StateUpdate
|
|
}
|
|
|
|
func NewNotifier() *Notifier {
|
|
return &Notifier{}
|
|
}
|
|
|
|
func (n *Notifier) AddNode(machineKey key.MachinePublic, c chan<- types.StateUpdate) {
|
|
log.Trace().Caller().Str("key", machineKey.ShortString()).Msg("acquiring lock to add node")
|
|
defer log.Trace().Caller().Str("key", machineKey.ShortString()).Msg("releasing lock to add node")
|
|
|
|
n.l.Lock()
|
|
defer n.l.Unlock()
|
|
|
|
if n.nodes == nil {
|
|
n.nodes = make(map[string]chan<- types.StateUpdate)
|
|
}
|
|
|
|
n.nodes[machineKey.String()] = c
|
|
|
|
log.Trace().
|
|
Str("machine_key", machineKey.ShortString()).
|
|
Int("open_chans", len(n.nodes)).
|
|
Msg("Added new channel")
|
|
}
|
|
|
|
func (n *Notifier) RemoveNode(machineKey key.MachinePublic) {
|
|
log.Trace().Caller().Str("key", machineKey.ShortString()).Msg("acquiring lock to remove node")
|
|
defer log.Trace().Caller().Str("key", machineKey.ShortString()).Msg("releasing lock to remove node")
|
|
|
|
n.l.Lock()
|
|
defer n.l.Unlock()
|
|
|
|
if n.nodes == nil {
|
|
return
|
|
}
|
|
|
|
delete(n.nodes, machineKey.String())
|
|
|
|
log.Trace().
|
|
Str("machine_key", machineKey.ShortString()).
|
|
Int("open_chans", len(n.nodes)).
|
|
Msg("Removed channel")
|
|
}
|
|
|
|
func (n *Notifier) NotifyAll(update types.StateUpdate) {
|
|
n.NotifyWithIgnore(update)
|
|
}
|
|
|
|
func (n *Notifier) NotifyWithIgnore(update types.StateUpdate, ignore ...string) {
|
|
log.Trace().Caller().Interface("type", update.Type).Msg("acquiring lock to notify")
|
|
defer log.Trace().
|
|
Caller().
|
|
Interface("type", update.Type).
|
|
Msg("releasing lock, finished notifing")
|
|
|
|
n.l.RLock()
|
|
defer n.l.RUnlock()
|
|
|
|
for key, c := range n.nodes {
|
|
if util.IsStringInSlice(ignore, key) {
|
|
continue
|
|
}
|
|
|
|
log.Trace().Caller().Str("machine", key).Strs("ignoring", ignore).Msg("sending update")
|
|
c <- update
|
|
}
|
|
}
|