GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-09 00:56:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

ws: allow Upgrade in Connection header anywhere

Browse Source 
This will make it work for Firefox, which uses "Connection: keep-alive, Upgrade"
Reimplemented our own evutil_ascii_strcasestr function (same as
non-portable strcasestr)
This commit is contained in:
Dmitry Ilyin 2024-07-22 21:47:53 +03:00 committed by Azat Khuzhin
parent 9848df54cc
commit 00c94beaf0
4 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
evutil.c
View File

@ -2625,6 +2625,25 @@ int evutil_ascii_strncasecmp(const char *s1, const char *s2, size_t n)
return 0;
}
const char* evutil_ascii_strcasestr(const char* s, const char *find)
{
char c, sc;
size_t len;
if ((c = *find++) != 0) {
c = EVUTIL_TOLOWER_(c);
len = strlen(find);
do {
do {
if ((sc = *s++) == 0)
return (NULL);
} while ((char)EVUTIL_TOLOWER_(sc) != c);
} while (evutil_ascii_strncasecmp(s, find, len) != 0);
s--;
}
return s;
}
void
evutil_rtrim_lws_(char *str)
{

15
test/regress_ws.c
View File

@ -337,8 +337,8 @@ http_ws_readcb_bad(struct bufferevent *bev, void *arg)
free(line);
}
void
http_ws_test(void *arg)
static void
http_ws_test_with_connection(void *arg, const char* conn_value)
{
struct basic_test_data *data = arg;
struct bufferevent *bev = NULL;
@ -377,10 +377,10 @@ http_ws_test(void *arg)
evbuffer_add_printf(out, "GET /ws HTTP/1.1\r\n"
"Host: somehost\r\n"
"Connection: Upgrade\r\n"
"Connection: %s\r\n"
"Upgrade: websocket\r\n"
"Sec-WebSocket-Key: x3JJHMbDL1EzLkh9GBhXDw==\r\n"
"\r\n");
"\r\n", conn_value);
test_ok = 0;
event_base_dispatch(data->base);
@ -391,3 +391,10 @@ end:
if (bev)
bufferevent_free(bev);
}
void
http_ws_test(void *arg)
{
http_ws_test_with_connection(arg, "Upgrade");
http_ws_test_with_connection(arg, "keep-alive, Upgrade");
}

6
util-internal.h
View File

@ -569,6 +569,12 @@ int evutil_v4addr_is_local_(const struct in_addr *in);
EVENT2_EXPORT_SYMBOL
int evutil_v6addr_is_local_(const struct in6_addr *in);
/** As strcasestr, but always searching substring in locale-independent
ASCII. That's useful if you're handling data in ASCII-based protocols.
*/
EVENT2_EXPORT_SYMBOL
const char* evutil_ascii_strcasestr(const char* s, const char *find);
#ifdef __cplusplus
}
#endif

2
ws.c
View File

@ -386,7 +386,7 @@ evws_new_session(
goto error;
connection = evhttp_find_header(in_hdrs, "Connection");
if (connection == NULL || evutil_ascii_strcasecmp(connection, "Upgrade"))
if (connection == NULL || evutil_ascii_strcasestr(connection, "Upgrade") == NULL)
goto error;
ws_key = evhttp_find_header(in_hdrs, "Sec-WebSocket-Key");