ProfessionalUwU/echoip
1
0
Fork 0
mirror of https://github.com/mpolden/echoip.git synced 2025-03-27 13:35:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle multiple IPs in X-Forwarded-For

Browse Source
This commit is contained in:
Martin Polden 2018-08-14 21:04:58 +02:00
parent 122fd3dcfa
commit 33a8516004
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
http/http.go
View File

@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"html/template" "html/template"
"path/filepath" "path/filepath"
"strings"
"github.com/mpolden/ipd/iputil" "github.com/mpolden/ipd/iputil"
"github.com/mpolden/ipd/iputil/geo" "github.com/mpolden/ipd/iputil/geo"
@ -47,10 +48,22 @@ func New(db geo.Reader) *Server {
return &Server{gr: db} return &Server{gr: db}
} }
func ipFromForwardedForHeader(v string) string {
// Handle both comma and comma+space separator
ips := strings.Fields(strings.Replace(v, ",", " ", -1))
if len(ips) == 0 {
return ""
}
return ips[0]
}
func ipFromRequest(headers []string, r *http.Request) (net.IP, error) { func ipFromRequest(headers []string, r *http.Request) (net.IP, error) {
remoteIP := "" remoteIP := ""
for _, header := range headers { for _, header := range headers {
remoteIP = r.Header.Get(header) remoteIP = r.Header.Get(header)
if http.CanonicalHeaderKey(header) == "X-Forwarded-For" {
remoteIP = ipFromForwardedForHeader(remoteIP)
}
if remoteIP != "" { if remoteIP != "" {
break break
} }

4
http/http_test.go
View File

@ -87,7 +87,7 @@ func TestDisabledHandlers(t *testing.T) {
server := testServer() server := testServer()
server.LookupPort = nil server.LookupPort = nil
server.LookupAddr = nil server.LookupAddr = nil
server.db, _ = geo.New("", "") server.gr, _ = geo.Open("", "")
s := httptest.NewServer(server.Handler()) s := httptest.NewServer(server.Handler())
var tests = []struct { var tests = []struct {
@ -161,6 +161,8 @@ func TestIPFromRequest(t *testing.T) {
{"127.0.0.1:9999", "X-Real-IP", "1.3.3.7", []string{"X-Foo-Bar"}, "127.0.0.1"}, // Trusted header does not match {"127.0.0.1:9999", "X-Real-IP", "1.3.3.7", []string{"X-Foo-Bar"}, "127.0.0.1"}, // Trusted header does not match
{"127.0.0.1:9999", "X-Real-IP", "1.3.3.7", []string{"X-Real-IP", "X-Forwarded-For"}, "1.3.3.7"}, // Trusted header matches {"127.0.0.1:9999", "X-Real-IP", "1.3.3.7", []string{"X-Real-IP", "X-Forwarded-For"}, "1.3.3.7"}, // 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", []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 (space+comma separator)
} }
for _, tt := range tests { for _, tt := range tests {
r := &http.Request{ r := &http.Request{