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

Merge branch 'main' into registration-simplification

Browse Source
This commit is contained in:
Kristoffer Dalby
2022-03-02 07:31:02 +00:00
committed by GitHub
parent 1f8c7f427b 0c0653df8b
commit e4d81bbb16
5 changed files with 349 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
machine.go
View File

@@ -174,6 +174,12 @@ func getFilteredByACLPeers(
machine.IPAddresses.ToStringSlice(),
peer.IPAddresses.ToStringSlice(),
) || // match source and destination
matchSourceAndDestinationWithRule(
rule.SrcIPs,
dst,
peer.IPAddresses.ToStringSlice(),
machine.IPAddresses.ToStringSlice(),
) || // match return path
matchSourceAndDestinationWithRule(
rule.SrcIPs,
dst,
@@ -183,9 +189,21 @@ func getFilteredByACLPeers(
matchSourceAndDestinationWithRule(
rule.SrcIPs,
dst,
[]string{"*"},
[]string{"*"},
) || // match source and all destination
matchSourceAndDestinationWithRule(
rule.SrcIPs,
dst,
[]string{"*"},
peer.IPAddresses.ToStringSlice(),
) || // match source and all destination
matchSourceAndDestinationWithRule(
rule.SrcIPs,
dst,
[]string{"*"},
machine.IPAddresses.ToStringSlice(),
) { // match return path
) { // match all sources and source
peers[peer.ID] = peer
}
}