Skip to content

✨ refactor(ip): Simplify IP address extraction logic using chained && #6

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

Merged
habibi-dev merged 1 commit into from
Oct 6, 2025
Merged

✨ refactor(ip): Simplify IP address extraction logic using chained && #6

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
23 changes: 11 additions & 12 deletions src/services/ip/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,19 @@ pub fn routers_list() -> Vec<(&'static str, MethodRouter)> {
}

pub fn get_client_ip(headers: &HeaderMap) -> Option<IpAddr> {
// 1) X-Forwarded-For → first IP
if let Some(val) = headers.get("x-forwarded-for").and_then(|v| v.to_str().ok()) {
if let Some(first) = val.split(',').next() {
if let Ok(ip) = first.trim().parse::<IpAddr>() {
return Some(ip);
}
}
// X-Forwarded-For: take the first IP
if let Some(val) = headers.get("x-forwarded-for").and_then(|v| v.to_str().ok())
&& let Some(first) = val.split(',').next()
&& let Ok(ip) = first.trim().parse::<IpAddr>()
{
return Some(ip);
}

// 2) X-Real-IP
if let Some(val) = headers.get("x-real-ip").and_then(|v| v.to_str().ok()) {
if let Ok(ip) = val.trim().parse::<IpAddr>() {
return Some(ip);
}
// X-Real-IP
if let Some(val) = headers.get("x-real-ip").and_then(|v| v.to_str().ok())
&& let Ok(ip) = val.trim().parse::<IpAddr>()
{
return Some(ip);
}

None
Expand Down