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

Refactor: Improve Code Readability with Constants and Early Returns #842

Closed
wants to merge 4 commits into from
Closed

Refactor: Improve Code Readability with Constants and Early Returns #842

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72b4f65
Refactor: Improve Code Readability with Constants and Early Returns
k-vanio Aug 13, 2023
0ec89a4
Refactor: Alphabetically sort constants for improved readability
k-vanio Aug 28, 2023
7edfacc
Enhanced X-Forwarded-For Validation: Implemented thorough checks to v…
k-vanio Aug 30, 2023
0b01520
Enhancing IP Address Validation in XFF
k-vanio Aug 30, 2023
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
37 changes: 23 additions & 14 deletions middleware/realip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import (
"strings"
)

var trueClientIP = http.CanonicalHeaderKey("True-Client-IP")
var xForwardedFor = http.CanonicalHeaderKey("X-Forwarded-For")
var xRealIP = http.CanonicalHeaderKey("X-Real-IP")
const (
trueClientIP = "True-Client-IP"
xForwardedFor = "X-Forwarded-For"
xRealIP = "X-Real-IP"
)

// RealIP is a middleware that sets a http.Request's RemoteAddr to the results
// of parsing either the True-Client-IP, X-Real-IP or the X-Forwarded-For headers
Expand Down Expand Up @@ -40,21 +42,28 @@ func RealIP(h http.Handler) http.Handler {
}

func realIP(r *http.Request) string {
var ip string
if tcip := r.Header.Get(trueClientIP); isValidIP(tcip) {
return tcip
}

if tcip := r.Header.Get(trueClientIP); tcip != "" {
ip = tcip
} else if xrip := r.Header.Get(xRealIP); xrip != "" {
ip = xrip
} else if xff := r.Header.Get(xForwardedFor); xff != "" {
if xrip := r.Header.Get(xRealIP); isValidIP(xrip) {
return xrip
}

if xff := r.Header.Get(xForwardedFor); xff != "" {
i := strings.Index(xff, ",")
if i == -1 {
i = len(xff)
}
ip = xff[:i]
}
if ip == "" || net.ParseIP(ip) == nil {
return ""

if xff = xff[:i]; isValidIP(xff) {
return xff
}
}
return ip

return ""
}

func isValidIP(ip string) bool {
return ip != "" && net.ParseIP(ip) != nil
}