fix: formatting

This commit is contained in:
Stefan Bildl 2023-04-02 16:27:43 +02:00
parent 12d42118de
commit 47c45da82d

38
gin.go
View File

@ -395,7 +395,7 @@ func prepareTrustedCIDRs(trustedProxies []string) ([]*net.IPNet, error) {
cidrArr := make([]*net.IPNet, 0, len(trustedProxies)) cidrArr := make([]*net.IPNet, 0, len(trustedProxies))
for _, trustedProxy := range trustedProxies { for _, trustedProxy := range trustedProxies {
cidrNet, err := prepareCIDR(trustedProxy) cidrNet, err := prepareCIDR(trustedProxy)
if err != nil { if err != nil {
return cidrArr, err return cidrArr, err
} }
@ -422,28 +422,28 @@ func (engine *Engine) SetTrustedProxies(trustedProxies []string) error {
// converts a string CIDR or single IP to a IPNet instance // converts a string CIDR or single IP to a IPNet instance
func prepareCIDR(ipOrCidr string) (*net.IPNet, error) { func prepareCIDR(ipOrCidr string) (*net.IPNet, error) {
// not a CIDR, try to convert to cidr notation // not a CIDR, try to convert to cidr notation
if !strings.Contains(ipOrCidr, "/") { if !strings.Contains(ipOrCidr, "/") {
ip := parseIP(ipOrCidr) ip := parseIP(ipOrCidr)
if ip == nil { if ip == nil {
return nil, &net.ParseError{Type: "IP address", Text: ipOrCidr} return nil, &net.ParseError{Type: "IP address", Text: ipOrCidr}
} }
switch len(ip) { switch len(ip) {
case net.IPv4len: case net.IPv4len:
ipOrCidr += "/32" ipOrCidr += "/32"
case net.IPv6len: case net.IPv6len:
ipOrCidr += "/128" ipOrCidr += "/128"
} }
} }
_, cidrNet, err := net.ParseCIDR(ipOrCidr) _, cidrNet, err := net.ParseCIDR(ipOrCidr)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return cidrNet, err return cidrNet, err
} }
// isUnsafeTrustedProxies checks if Engine.trustedCIDRs contains all IPs, it's not safe if it has (returns true) // isUnsafeTrustedProxies checks if Engine.trustedCIDRs contains all IPs, it's not safe if it has (returns true)