Skip to content

Fixed parsing code for --ip-header commandline option #758

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −3
Open

Fixed parsing code for --ip-header commandline option #758

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: 6 additions & 3 deletions llamafile/server/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,15 @@ Client::transport()
if (is_loopback_ip(client_ip_) || client_ip_trusted_) {
std::string_view ip_header = get_header(FLAG_ip_header);
if (!ip_header.empty()) {
long ip;
if ((ip = parse_ip(ip_header)) == -1) {
// Extract the first IP (before any commas)
size_t comma = ip_header.find(',');
std::string_view first_ip = ip_header.substr(0, comma);
long ip = parse_ip(first_ip);
if (ip != -1) {
effective_ip_ = ip;
effective_ip_trusted_ = is_trusted_ip(ip);
} else {
SLOG("client's --ip-header wasn't a single ipv4 address");
SLOG("client's --ip-header didn't start with a valid IPv4 address: ", ip_header);
effective_ip_trusted_ = false;
}
}
Expand Down