gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-06 13:14:24 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3515 from gravitl/master

Browse source 
Master
This commit is contained in:
Abhishek K 2025-06-18 08:52:46 +05:30 • committed by GitHub
commit 0197de24f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/node.go
View file

@ -178,7 +178,7 @@ func Authorize(
// check if host instead of user // check if host instead of user
if hostAllowed { if hostAllowed {
// TODO --- should ensure that node is only operating on itself // TODO --- should ensure that node is only operating on itself
if hostID, macAddr, _, err := logic.VerifyHostToken(authToken); err == nil && macAddr != "" { if hostID, _, _, err := logic.VerifyHostToken(authToken); err == nil {
r.Header.Set(hostIDHeader, hostID) r.Header.Set(hostIDHeader, hostID)
// this indicates request is from a node // this indicates request is from a node
// used for failover - if a getNode comes from node, this will trigger a metrics wipe // used for failover - if a getNode comes from node, this will trigger a metrics wipe

3
logic/peers.go
View file

@ -194,7 +194,8 @@ func GetPeerUpdateForHost(network string, host *models.Host, allNodes []models.N
continue continue
} }
if !node.Connected || node.PendingDelete || node.Action == models.NODE_DELETE || time.Since(node.LastCheckIn) > time.Hour { if !node.Connected || node.PendingDelete || node.Action == models.NODE_DELETE ||
(!node.LastCheckIn.IsZero() && time.Since(node.LastCheckIn) > time.Hour) {
continue continue
} }
acls, _ := ListAclsByNetwork(models.NetworkID(node.Network)) acls, _ := ListAclsByNetwork(models.NetworkID(node.Network))

2
migrate/migrate.go
View file

@ -581,7 +581,7 @@ func settings() {
} }
settings := logic.GetServerSettings() settings := logic.GetServerSettings()
if settings.AuditLogsRetentionPeriodInDays == 0 { if settings.AuditLogsRetentionPeriodInDays == 0 {
settings.AuditLogsRetentionPeriodInDays = 30 settings.AuditLogsRetentionPeriodInDays = 7
} }
if settings.DefaultDomain == "" { if settings.DefaultDomain == "" {
settings.DefaultDomain = servercfg.GetDefaultDomain() settings.DefaultDomain = servercfg.GetDefaultDomain()

1
pro/logic/failover.go
View file

@ -191,6 +191,7 @@ func GetFailOverPeerIps(peer, node *models.Node) []net.IPNet {
if failOverpeer.IsRelay { if failOverpeer.IsRelay {
for _, id := range failOverpeer.RelayedNodes { for _, id := range failOverpeer.RelayedNodes {
rNode, _ := logic.GetNodeByID(id) rNode, _ := logic.GetNodeByID(id)
logic.GetNodeEgressInfo(&rNode, eli, acls)
if rNode.Address.IP != nil { if rNode.Address.IP != nil {
allowed := net.IPNet{ allowed := net.IPNet{
IP: rNode.Address.IP, IP: rNode.Address.IP,