Cleanup

api/api.go

@@ -78,20 +78,17 @@ func (a *API) EnablePortTesting() {
 }
 
 func ipFromRequest(r *http.Request) (net.IP, error) {
-	var host string
+	remoteIP := r.Header.Get("X-Real-IP")
-	realIP := r.Header.Get("X-Real-IP")
+	if remoteIP == "" {
-	var err error
+		host, _, err := net.SplitHostPort(r.RemoteAddr)
-	if realIP != "" {
-		host = realIP
-	} else {
-		host, _, err = net.SplitHostPort(r.RemoteAddr)
 		if err != nil {
 			return nil, err
 		}
+		remoteIP = host
 	}
-	ip := net.ParseIP(host)
+	ip := net.ParseIP(remoteIP)
 	if ip == nil {
-		return nil, fmt.Errorf("could not parse IP: %s", host)
+		return nil, fmt.Errorf("could not parse IP: %s", remoteIP)
 	}
 	return ip, nil
 }