middleware.LimitWhitelist parses normal ip addresses as well as CIDR notation

middleware/limit_whitelist.go

@@ -2,27 +2,61 @@ package middleware
 
 import (
 	"context"
+	"net"
 
 	"github.com/gin-gonic/gin"
+	"github.com/tribalwarshelp/shared/mode"
 )
 
 var limitWhitelistContextKey ContextKey = "limitWhitelist"
 
+type NetworksAndIps struct {
+	Networks []*net.IPNet
+	Ips      []net.IP
+}
+
+func (networksAndIps NetworksAndIps) Contains(ip net.IP) bool {
+	for _, expectedIP := range networksAndIps.Ips {
+		if expectedIP.Equal(ip) {
+			return true
+		}
+	}
+	for _, subnetwork := range networksAndIps.Networks {
+		if subnetwork.Contains(ip) {
+			return true
+		}
+	}
+	return false
+}
+
 type LimitWhitelistConfig struct {
 	IPAddresses []string
 }
 
+func (cfg LimitWhitelistConfig) GetNetworksAndIps() NetworksAndIps {
+	networks := []*net.IPNet{}
+	ips := []net.IP{}
+	for _, ip := range cfg.IPAddresses {
+		_, network, err := net.ParseCIDR(ip)
+		if err == nil {
+			networks = append(networks, network)
+			continue
+		}
+
+		ips = append(ips, net.ParseIP(ip))
+	}
+	return NetworksAndIps{
+		Networks: networks,
+		Ips:      ips,
+	}
+}
+
 func LimitWhitelist(cfg LimitWhitelistConfig) gin.HandlerFunc {
+	networksAndIps := cfg.GetNetworksAndIps()
 	return func(c *gin.Context) {
 		ctx := c.Request.Context()
-		clientIP := c.ClientIP()
-		canExceedLimit := false
-		for _, ip := range cfg.IPAddresses {
-			if ip == clientIP {
-				canExceedLimit = true
-				break
-			}
-		}
+		clientIP := net.ParseIP(c.ClientIP())
+		canExceedLimit := networksAndIps.Contains(clientIP) || mode.Get() == mode.DevelopmentMode
 		ctx = StoreLimitWhitelistDataInContext(ctx, canExceedLimit)
 		c.Request = c.Request.WithContext(ctx)
 		c.Next()