wberube
/
echoip
mirror of https://github.com/mpolden/echoip
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify

This commit is contained in:
Martin Polden 2018-08-14 21:32:29 +02:00
parent 569c2f3879
commit a9c0587f87
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
http/http.go
View File

@ -49,12 +49,11 @@ func New(db geo.Reader) *Server {
} }
func ipFromForwardedForHeader(v string) string { func ipFromForwardedForHeader(v string) string {
// Handle both comma and comma+space separator sep := strings.Index(v, ",")
ips := strings.Fields(strings.Replace(v, ",", " ", -1)) if sep == -1 {
if len(ips) == 0 { return v
return ""
} }
return ips[0] return v[:sep]
} }
func ipFromRequest(headers []string, r *http.Request) (net.IP, error) { func ipFromRequest(headers []string, r *http.Request) (net.IP, error) {

1
http/http_test.go
View File

@ -163,6 +163,7 @@ func TestIPFromRequest(t *testing.T) {
{"127.0.0.1:9999", "X-Forwarded-For", "1.3.3.7", []string{"X-Real-IP", "X-Forwarded-For"}, "1.3.3.7"}, // Second trusted header matches {"127.0.0.1:9999", "X-Forwarded-For", "1.3.3.7", []string{"X-Real-IP", "X-Forwarded-For"}, "1.3.3.7"}, // Second trusted header matches
{"127.0.0.1:9999", "X-Forwarded-For", "1.3.3.7,4.2.4.2", []string{"X-Forwarded-For"}, "1.3.3.7"}, // X-Forwarded-For with multiple entries (commas separator) {"127.0.0.1:9999", "X-Forwarded-For", "1.3.3.7,4.2.4.2", []string{"X-Forwarded-For"}, "1.3.3.7"}, // X-Forwarded-For with multiple entries (commas separator)
{"127.0.0.1:9999", "X-Forwarded-For", "1.3.3.7, 4.2.4.2", []string{"X-Forwarded-For"}, "1.3.3.7"}, // X-Forwarded-For with multiple entries (space+comma separator) {"127.0.0.1:9999", "X-Forwarded-For", "1.3.3.7, 4.2.4.2", []string{"X-Forwarded-For"}, "1.3.3.7"}, // X-Forwarded-For with multiple entries (space+comma separator)
{"127.0.0.1:9999", "X-Forwarded-For", "", []string{"X-Forwarded-For"}, "127.0.0.1"}, // Empty header
} }
for _, tt := range tests { for _, tt := range tests {
r := &http.Request{ r := &http.Request{