Merge pull request #331 from kinvolk/enhance-getting-requestIP

Allow More forgiving X-Forwarded-For handling
flatcar · Feb 12, 2021 · 7dac3d4 · 7dac3d4
2 parents 00aa799 + 869049c
commit 7dac3d4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmd/nebraska/controller.go b/cmd/nebraska/controller.go
@@ -826,8 +826,8 @@ func (ctl *controller) processOmahaRequest(c *gin.Context) {
 //
 
 func getRequestIP(r *http.Request) string {
-	ips := strings.Split(r.Header.Get("X-FORWARDED-FOR"), ", ")
-	if ips[0] != "" && net.ParseIP(ips[0]) != nil {
+	ips := strings.Split(r.Header.Get("X-FORWARDED-FOR"), ",")
+	if ips[0] != "" && net.ParseIP(strings.TrimSpace(ips[0])) != nil {
 		return ips[0]
 	}
 	ip, _, _ := net.SplitHostPort(r.RemoteAddr)