TheArchive/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-10-25 02:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(machines): apply lint

Browse Source
This commit is contained in:
Adrien Raffin-Caboisse
2022-02-21 10:02:59 +01:00
parent 5ab62378ae
commit 4bbe0051f6
2 changed files with 16 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
machine.go
View File

@@ -142,13 +142,13 @@ func containsAddresses(inputs []string, addrs []string) bool {
return false
}
// matchSourceAndDestinationWithRule
// matchSourceAndDestinationWithRule.
func matchSourceAndDestinationWithRule(ruleSources []string, ruleDestinations []string, source []string, destination []string) bool {
return containsAddresses(ruleSources, source) && containsAddresses(ruleDestinations, destination)
}
// getFilteredByACLPeerss should return the list of peers authorized to be accessed from machine.
func getFilteredByACLPeers(machines []Machine, rules []tailcfg.FilterRule, machine *Machine) (Machines, error) {
func getFilteredByACLPeers(machines []Machine, rules []tailcfg.FilterRule, machine *Machine) Machines {
log.Trace().
Caller().
Str("machine", machine.Name).
@@ -203,7 +203,7 @@ func getFilteredByACLPeers(machines []Machine, rules []tailcfg.FilterRule, machi
Str("machine", machine.Name).
Msgf("Found some machines: %v", machines)
return authorizedPeers, nil
return authorizedPeers
}
func (h *Headscale) getDirectPeers(machine *Machine) (Machines, error) {
@@ -303,17 +303,10 @@ func (h *Headscale) getPeers(machine *Machine) (Machines, error) {
machines, err = h.ListAllMachines()
if err != nil {
log.Error().Err(err).Msg("Error retrieving list of machines")
return Machines{}, err
}
peers, err = getFilteredByACLPeers(machines, h.aclRules, machine)
if err != nil {
log.Error().
Caller().
Err(err).
Msg("Cannot fetch peers")
return Machines{}, err
}
peers = getFilteredByACLPeers(machines, h.aclRules, machine)
} else {
direct, err := h.getDirectPeers(machine)
if err != nil {