romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 20:43:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

telnet: refuse IAC codes in content

Browse source 
Ban the use of IAC (0xff) in telnet options set by the application. They
need to be escaped when sent but I can't see any valid reason for an
application to send them.

Of course, an application sending such data basically ask for trouble.

Reported in Joshua's sarif data

Closes #18657
This commit is contained in:
Daniel Stenberg 2025-09-21 10:48:00 +02:00
parent 989a274e45
commit a72e1552f2
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/telnet.c
View file

@ -925,6 +925,14 @@ static CURLcode check_telnet_options(struct Curl_easy *data,
return result; return result;
} }
/* if the option contains an IAC code, it should be escaped in the output, but
as we cannot think of any legit way to send that as part of the content we
rather just ban its use instead */
static bool bad_option(const char *data)
{
return !!strchr(data, CURL_IAC);
}
/* /*
* suboption() * suboption()
* *
@ -944,6 +952,8 @@ static CURLcode suboption(struct Curl_easy *data, struct TELNET *tn)
printsub(data, '<', (unsigned char *)tn->subbuffer, CURL_SB_LEN(tn) + 2); printsub(data, '<', (unsigned char *)tn->subbuffer, CURL_SB_LEN(tn) + 2);
switch(CURL_SB_GET(tn)) { switch(CURL_SB_GET(tn)) {
case CURL_TELOPT_TTYPE: case CURL_TELOPT_TTYPE:
if(bad_option(tn->subopt_ttype))
return CURLE_BAD_FUNCTION_ARGUMENT;
if(strlen(tn->subopt_ttype) > 1000) { if(strlen(tn->subopt_ttype) > 1000) {
failf(data, "Tool long telnet TTYPE"); failf(data, "Tool long telnet TTYPE");
return CURLE_SEND_ERROR; return CURLE_SEND_ERROR;
@ -961,6 +971,8 @@ static CURLcode suboption(struct Curl_easy *data, struct TELNET *tn)
printsub(data, '>', &temp[2], len-2); printsub(data, '>', &temp[2], len-2);
break; break;
case CURL_TELOPT_XDISPLOC: case CURL_TELOPT_XDISPLOC:
if(bad_option(tn->subopt_xdisploc))
return CURLE_BAD_FUNCTION_ARGUMENT;
if(strlen(tn->subopt_xdisploc) > 1000) { if(strlen(tn->subopt_xdisploc) > 1000) {
failf(data, "Tool long telnet XDISPLOC"); failf(data, "Tool long telnet XDISPLOC");
return CURLE_SEND_ERROR; return CURLE_SEND_ERROR;
@ -981,6 +993,8 @@ static CURLcode suboption(struct Curl_easy *data, struct TELNET *tn)
CURL_TELQUAL_IS); CURL_TELQUAL_IS);
for(v = tn->telnet_vars; v; v = v->next) { for(v = tn->telnet_vars; v; v = v->next) {
size_t tmplen = (strlen(v->data) + 1); size_t tmplen = (strlen(v->data) + 1);
if(bad_option(v->data))
return CURLE_BAD_FUNCTION_ARGUMENT;
/* Add the variable if it fits */ /* Add the variable if it fits */
if(len + tmplen < (int)sizeof(temp)-6) { if(len + tmplen < (int)sizeof(temp)-6) {
char *s = strchr(v->data, ','); char *s = strchr(v->data, ',');