eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

make generateFilterRule a pol struct func

Browse source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2023-04-26 11:24:44 +02:00 • committed by Juan Font
parent 5bbbe437df
commit 200e3b88cc
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
acls.go
View file

@ -128,7 +128,7 @@ func (h *Headscale) UpdateACLRules() error {
return errEmptyPolicy
}
rules, err := generateFilterRules(machines, *h.aclPolicy, h.cfg.OIDC.StripEmaildomain)
rules, err := h.aclPolicy.generateFilterRules(machines, h.cfg.OIDC.StripEmaildomain)
if err != nil {
return err
}
@ -226,9 +226,8 @@ func expandACLPeerAddr(srcIP string) []string {
// generateFilterRules takes a set of machines and an ACLPolicy and generates a
// set of Tailscale compatible FilterRules used to allow traffic on clients.
func generateFilterRules(
func (pol *ACLPolicy) generateFilterRules(
machines []Machine,
pol ACLPolicy,
stripEmaildomain bool,
) ([]tailcfg.FilterRule, error) {
rules := []tailcfg.FilterRule{}