R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CVE-2022-35252

Browse Source 
Merge: curl/curl@8dfc93e573
This commit is contained in:
Kawe Mazidjatari 2023-06-13 15:31:23 +02:00
parent e9ba4540cd
commit 0cbdc982fd
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
r5dev/thirdparty/curl/cookie.c vendored
View File

@ -347,6 +347,28 @@ static bool isip(const char *domain)
return FALSE; return FALSE;
} }
/*
RFC 6265 section 4.1.1 says a server should accept this range:
cookie-octet = %x21 / %x23-2B / %x2D-3A / %x3C-5B / %x5D-7E
But Firefox and Chrome as of June 2022 accept space, comma and double-quotes
fine. The prime reason for filtering out control bytes is that some HTTP
servers return 400 for requests that contain such.
*/
static int invalid_octets(const char *p)
{
/* Reject all bytes \x01 - \x1f (*except* \x09, TAB) + \x7f */
static const char badoctets[] = {
"\x01\x02\x03\x04\x05\x06\x07\x08\x0a"
"\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14"
"\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x7f"
};
size_t vlen, len;
/* scan for all the octets that are *not* in cookie-octet */
len = strcspn(p, badoctets);
vlen = strlen(p);
return (len != vlen);
}
/**************************************************************************** /****************************************************************************
* *
* Curl_cookie_add() * Curl_cookie_add()
@ -463,6 +485,11 @@ Curl_cookie_add(struct Curl_easy *data,
badcookie = TRUE; badcookie = TRUE;
break; break;
} }
if(invalid_octets(whatptr) || invalid_octets(name)) {
infof(data, "invalid octets in name/value, cookie dropped");
badcookie = TRUE;
break;
}
} }
else if(!len) { else if(!len) {
/* this was a "<name>=" with no content, and we must allow /* this was a "<name>=" with no content, and we must allow