luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

socketpair: allow localhost MITM sniffers

Browse Source 
Windows allow programs to MITM connections to localhost. The previous
check here would detect that and error out. This new method writes data
to verify the pipe thus allowing MITM.

Reported-by: SerusDev on github
Fixes #10144
Closes #10169
This commit is contained in:
Daniel Stenberg 2022-12-27 17:19:51 +01:00
parent 5ab72b9a57
commit 7fa449ca0c
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/socketpair.c
View File

@ -65,7 +65,7 @@ int Curl_socketpair(int domain, int type, int protocol,
union { union {
struct sockaddr_in inaddr; struct sockaddr_in inaddr;
struct sockaddr addr; struct sockaddr addr;
} a, a2; } a;
curl_socket_t listener; curl_socket_t listener;
curl_socklen_t addrlen = sizeof(a.inaddr); curl_socklen_t addrlen = sizeof(a.inaddr);
int reuse = 1; int reuse = 1;
@ -107,24 +107,21 @@ int Curl_socketpair(int domain, int type, int protocol,
pfd[0].fd = listener; pfd[0].fd = listener;
pfd[0].events = POLLIN; pfd[0].events = POLLIN;
pfd[0].revents = 0; pfd[0].revents = 0;
(void)Curl_poll(pfd, 1, 10*1000); /* 10 seconds */ (void)Curl_poll(pfd, 1, 1000); /* one second */
socks[1] = accept(listener, NULL, NULL); socks[1] = accept(listener, NULL, NULL);
if(socks[1] == CURL_SOCKET_BAD) if(socks[1] == CURL_SOCKET_BAD)
goto error; goto error;
else {
struct curltime check;
struct curltime now = Curl_now();
/* verify that nothing else connected */ /* write data to the socket */
addrlen = sizeof(a.inaddr); swrite(socks[0], &now, sizeof(now));
if(getsockname(socks[0], &a.addr, &addrlen) == -1 || /* verify that we read the correct data */
addrlen < (int)sizeof(a.inaddr)) if((sizeof(now) != sread(socks[1], &check, sizeof(check)) ||
goto error; memcmp(&now, &check, sizeof(check))))
addrlen = sizeof(a2.inaddr);
if(getpeername(socks[1], &a2.addr, &addrlen) == -1 ||
addrlen < (int)sizeof(a2.inaddr))
goto error;
if(a.inaddr.sin_family != a2.inaddr.sin_family ||
a.inaddr.sin_addr.s_addr != a2.inaddr.sin_addr.s_addr ||
a.inaddr.sin_port != a2.inaddr.sin_port)
goto error; goto error;
}
sclose(listener); sclose(listener);
return 0; return 0;