mirror of
https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin.git
synced 2026-07-21 11:38:59 +02:00
🍱 fix loging
This commit is contained in:
+5
-5
@@ -33,7 +33,7 @@ func NewChecker(trustedIPs []string) (*Checker, error) {
|
||||
|
||||
_, ipAddr, err := net.ParseCIDR(ipMask)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("parsing CIDR trusted IPs %s: %w", ipAddr, err)
|
||||
return nil, fmt.Errorf("parsing CIDR trusted IPs %s: %s", ipAddr, err.Error())
|
||||
}
|
||||
checker.authorizedIPsNet = append(checker.authorizedIPsNet, ipAddr)
|
||||
logger.Debug(fmt.Sprintf("IP network %v is trusted", ipAddr))
|
||||
@@ -45,12 +45,12 @@ func NewChecker(trustedIPs []string) (*Checker, error) {
|
||||
// Contains checks if provided address is in the trusted IPs.
|
||||
func (ip *Checker) Contains(addr string) (bool, error) {
|
||||
if len(addr) == 0 {
|
||||
return false, errors.New("empty IP address")
|
||||
return false, errors.New("Contains:noAddress")
|
||||
}
|
||||
|
||||
ipAddr, err := parseIP(addr)
|
||||
if err != nil {
|
||||
return false, fmt.Errorf("unable to parse address: %s: %w", addr, err)
|
||||
return false, fmt.Errorf("Contains:parseAddress addr:%s %s", addr, err.Error())
|
||||
}
|
||||
|
||||
return ip.ContainsIP(ipAddr), nil
|
||||
@@ -76,7 +76,7 @@ func (ip *Checker) ContainsIP(addr net.IP) bool {
|
||||
func parseIP(addr string) (net.IP, error) {
|
||||
userIP := net.ParseIP(addr)
|
||||
if userIP == nil {
|
||||
return nil, fmt.Errorf("can't parse IP from address %s", addr)
|
||||
return nil, fmt.Errorf("parseIP:parseAddress %s", addr)
|
||||
}
|
||||
|
||||
return userIP, nil
|
||||
@@ -123,7 +123,7 @@ func GetRemoteIP(req *http.Request, strategy *PoolStrategy, customHeader string)
|
||||
}
|
||||
remoteIP, _, err := net.SplitHostPort(req.RemoteAddr)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("failed to extract ip from remote address: %w", err)
|
||||
return "", fmt.Errorf("GetRemoteIP:extractIP: %s", err.Error())
|
||||
}
|
||||
return remoteIP, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user