better rate limiting by IP

server/ip_utils.go

@@ -1,33 +1,12 @@
 package server
 
 import (
-	"net"
 	"net/http"
-	"strings"
 )
 
 //custom vary by to use real remote IP without port
 type ipVaryBy struct{}
 
 func (ip ipVaryBy) Key(r *http.Request) string {
-	return getIPAddress(r)
-}
-
-func getIPAddress(r *http.Request) string {
-	hdr := r.Header
-	hdrRealIP := hdr.Get("X-Real-Ip")
-	hdrForwardedFor := hdr.Get("X-Forwarded-For")
-	if hdrRealIP == "" && hdrForwardedFor == "" {
-		hdrRealIP, _, _ := net.SplitHostPort(r.RemoteAddr)
-		return hdrRealIP
-	}
-	if hdrForwardedFor != "" {
-		// X-Forwarded-For is potentially a list of addresses separated with ","
-		parts := strings.Split(hdrForwardedFor, ",")
-		for i, p := range parts {
-			parts[i] = strings.TrimSpace(p)
-		}
-		return parts[0]
-	}
-	return hdrRealIP
+	return r.RemoteAddr
 }

server/server.go

@@ -90,7 +90,6 @@ func (s *Server) Start() error {
 
 	// rate limiting
 	// TODO add rate limiting after static handler and possible the main page
-	// TODO use IP set by proxyheaders!
 	throttleHandler := makeThrottleHandler(
 		s.apiConfig.APIRequestsPerMinute,
 		s.apiConfig.APIRequestsBurst,