IPStrategy for selecting IP in whitelist

middlewares/ip_whitelister.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/containous/traefik/ip"
 	"github.com/containous/traefik/log"
 	"github.com/containous/traefik/middlewares/tracing"
-	"github.com/containous/traefik/whitelist"
 	"github.com/pkg/errors"
 	"github.com/urfave/negroni"
 )
@@ -14,22 +14,25 @@ import (
 // IPWhiteLister is a middleware that provides Checks of the Requesting IP against a set of Whitelists
 type IPWhiteLister struct {
 	handler     negroni.Handler
-	whiteLister *whitelist.IP
+	whiteLister *ip.Checker
+	strategy    ip.Strategy
 }
 
 // NewIPWhiteLister builds a new IPWhiteLister given a list of CIDR-Strings to whitelist
-func NewIPWhiteLister(whiteList []string, useXForwardedFor bool) (*IPWhiteLister, error) {
+func NewIPWhiteLister(whiteList []string, strategy ip.Strategy) (*IPWhiteLister, error) {
 	if len(whiteList) == 0 {
 		return nil, errors.New("no white list provided")
 	}
 
-	whiteLister := IPWhiteLister{}
-
-	ip, err := whitelist.NewIP(whiteList, false, useXForwardedFor)
+	checker, err := ip.NewChecker(whiteList)
 	if err != nil {
 		return nil, fmt.Errorf("parsing CIDR whitelist %s: %v", whiteList, err)
 	}
-	whiteLister.whiteLister = ip
+
+	whiteLister := IPWhiteLister{
+		strategy:    strategy,
+		whiteLister: checker,
+	}
 
 	whiteLister.handler = negroni.HandlerFunc(whiteLister.handle)
 	log.Debugf("configured IP white list: %s", whiteList)
@@ -38,13 +41,13 @@ func NewIPWhiteLister(whiteList []string, useXForwardedFor bool) (*IPWhiteLister
 }
 
 func (wl *IPWhiteLister) handle(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
-	err := wl.whiteLister.IsAuthorized(r)
+	err := wl.whiteLister.IsAuthorized(wl.strategy.GetIP(r))
 	if err != nil {
 		tracing.SetErrorAndDebugLog(r, "request %+v - rejecting: %v", r, err)
 		reject(w)
 		return
 	}
-
+	log.Debugf("Accept %s: %+v", wl.strategy.GetIP(r), r)
 	tracing.SetErrorAndDebugLog(r, "request %+v matched white list %s - passing", r, wl.whiteLister)
 	next.ServeHTTP(w, r)
 }