mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-11-04 02:05:46 +00:00 
			
		
		
		
	Convert acls.go
This commit is contained in:
		
							
								
								
									
										9
									
								
								acls.go
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								acls.go
									
									
									
									
									
								
							@@ -4,11 +4,12 @@ import (
 | 
			
		||||
	"encoding/json"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"io"
 | 
			
		||||
	"log"
 | 
			
		||||
	"os"
 | 
			
		||||
	"strconv"
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	"github.com/rs/zerolog/log"
 | 
			
		||||
 | 
			
		||||
	"github.com/tailscale/hujson"
 | 
			
		||||
	"inet.af/netaddr"
 | 
			
		||||
	"tailscale.com/tailcfg"
 | 
			
		||||
@@ -66,7 +67,8 @@ func (h *Headscale) generateACLRules() (*[]tailcfg.FilterRule, error) {
 | 
			
		||||
		for j, u := range a.Users {
 | 
			
		||||
			srcs, err := h.generateACLPolicySrcIP(u)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				log.Printf("Error parsing ACL %d, User %d", i, j)
 | 
			
		||||
				log.Error().
 | 
			
		||||
					Msgf("Error parsing ACL %d, User %d", i, j)
 | 
			
		||||
				return nil, err
 | 
			
		||||
			}
 | 
			
		||||
			srcIPs = append(srcIPs, *srcs...)
 | 
			
		||||
@@ -77,7 +79,8 @@ func (h *Headscale) generateACLRules() (*[]tailcfg.FilterRule, error) {
 | 
			
		||||
		for j, d := range a.Ports {
 | 
			
		||||
			dests, err := h.generateACLPolicyDestPorts(d)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				log.Printf("Error parsing ACL %d, Port %d", i, j)
 | 
			
		||||
				log.Error().
 | 
			
		||||
					Msgf("Error parsing ACL %d, Port %d", i, j)
 | 
			
		||||
				return nil, err
 | 
			
		||||
			}
 | 
			
		||||
			destPorts = append(destPorts, *dests...)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user