curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-15 00:22:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

cf-haproxy: make CURLOPT_HAPROXY_CLIENT_IP set the *source* IP

Browse Source 
... as documented.

Update test 3201 and 3202 accordingly.

Reported-by: Markus Sommer
Fixes #11619
Closes #11626
This commit is contained in:
Daniel Stenberg 2023-08-08 13:49:21 +02:00
parent d1f41d6ae7
commit f0fed4e131
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cf-haproxy.c
View File

@ -86,12 +86,12 @@ static CURLcode cf_haproxy_date_out_set(struct Curl_cfilter*cf,
if(data->set.str[STRING_HAPROXY_CLIENT_IP]) if(data->set.str[STRING_HAPROXY_CLIENT_IP])
client_ip = data->set.str[STRING_HAPROXY_CLIENT_IP]; client_ip = data->set.str[STRING_HAPROXY_CLIENT_IP];
else else
client_ip = data->info.conn_primary_ip; client_ip = data->info.conn_local_ip;
result = Curl_dyn_addf(&ctx->data_out, "PROXY %s %s %s %i %i\r\n", result = Curl_dyn_addf(&ctx->data_out, "PROXY %s %s %s %i %i\r\n",
tcp_version, tcp_version,
data->info.conn_local_ip,
client_ip, client_ip,
data->info.conn_primary_ip,
data->info.conn_local_port, data->info.conn_local_port,
data->info.conn_primary_port); data->info.conn_primary_port);

2
tests/data/test3201
View File

@ -48,7 +48,7 @@ proxy
# Verify data after the test has been "shot" # Verify data after the test has been "shot"
<verify> <verify>
<strippart> <strippart>
s/^PROXY TCP4 %CLIENTIP 192.168.1.1 (\d*) %HTTPPORT/proxy-line/ s/^PROXY TCP4 192.168.1.1 %HOSTIP (\d*) %HTTPPORT/proxy-line/
</strippart> </strippart>
<protocol> <protocol>
proxy-line proxy-line

4
tests/data/test3202
View File

@ -53,10 +53,10 @@ proxy
# Strip off the (random) local port number. This test used to use a fixed # Strip off the (random) local port number. This test used to use a fixed
# local port number that frequently causes the test to fail # local port number that frequently causes the test to fail
<strippart> <strippart>
s/PROXY TCP6 ::1 2001:db8:: (\d+) (\d+)/PROXY TCP6 ::1 2001:db8:: $2/ s/^PROXY TCP6 2001:db8:: ::1 (\d*) %HTTP6PORT/proxy-line/
</strippart> </strippart>
<protocol> <protocol>
PROXY TCP6 ::1 2001:db8:: %HTTP6PORT proxy-line
GET /%TESTNUMBER HTTP/1.1 GET /%TESTNUMBER HTTP/1.1
Host: %HOST6IP:%HTTP6PORT Host: %HOST6IP:%HTTP6PORT
User-Agent: curl/%VERSION User-Agent: curl/%VERSION