Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix ip parsing in auditlog #367

Closed
wants to merge 1 commit into from
Closed

fix ip parsing in auditlog #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions cmd/api/src/api/middleware/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,7 @@ func parseUserIP(r *http.Request) string {
log.Errorf("No data found in X-Forwarded-For")
}

if parsedUrl, err := url.Parse(r.RemoteAddr); err != nil {
log.Errorf("Error parsing IP address from RemoteAddr: %s", err)
} else if hostName := parsedUrl.Hostname(); hostName == "" {
log.Errorf("Hostname not found in URL: %s", parsedUrl.String())
} else {
res += "Remote Address: " + parsedUrl.Hostname()
}

res += "Remote Address: " + r.RemoteAddr
return res
}

Expand Down
19 changes: 1 addition & 18 deletions cmd/api/src/api/middleware/middleware_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,23 +91,6 @@ func TestParseUserIP_XForwardedForMissing(t *testing.T) {
require.Contains(t, res, "Remote Address")
}

func TestParseUserIP_RemoteAddrError(t *testing.T) {
req, err := http.NewRequest("GET", "/teapot", nil)
require.Nil(t, err)

ip1 := "192.168.1.1:8080"
ip2 := "192.168.1.2"
ip3 := "192.168.1.3"
req.Header.Set("X-Forwarded-For", strings.Join([]string{ip1, ip2, ip3}, ","))
req.RemoteAddr = "0.0.0.0:3000"

res := parseUserIP(req)
require.Contains(t, res, "X-Forwarded-For")
require.Contains(t, res, ip1)
require.Contains(t, res, ip2)
require.NotContains(t, res, "Remote Address")
}

func TestParseUserIP_Success(t *testing.T) {
req, err := http.NewRequest("GET", "/teapot", nil)
require.Nil(t, err)
Expand All @@ -117,7 +100,7 @@ func TestParseUserIP_Success(t *testing.T) {
ip3 := "192.168.1.3"
req.Header.Set("X-Forwarded-For", strings.Join([]string{ip1, ip2, ip3}, ","))

req.RemoteAddr = "http://www.google.com/0.0.0.0:3000"
req.RemoteAddr = "0.0.0.0:3000"

res := parseUserIP(req)
require.Contains(t, res, "X-Forwarded-For")
Expand Down
Loading