kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00
Code Releases Activity

Merge pull request #15929 from cgundogan/pr/uriparser

Browse Source 
uri_parser: fix out-of-bounds and additional enhancements
This commit is contained in:
Martine Lenders 2021-02-05 17:06:01 +01:00 committed by GitHub
commit bc59d60be6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/uri_parser/uri_parser.c
View File

@ -75,9 +75,16 @@ void _consume_userinfo(uri_parser_result_t *result, char *uri,
if (userinfo_end) {
result->userinfo = uri;
result->userinfo_len = userinfo_end - uri;
/* shift host part beyond userinfo and '@' */
result->host += result->userinfo_len + 1;
result->host_len -= result->userinfo_len + 1;
/* shift host part beyond userinfo and '@', but only if possible */
unsigned offset = result->userinfo_len + 1;
if ((result->host + offset) > authority_end) {
result->host_len = 0;
return;
}
result->host_len -= offset;
result->host += offset;
}
}
@ -125,6 +132,11 @@ static char *_consume_authority(uri_parser_result_t *result, char *uri,
/* consume userinfo, if available */
_consume_userinfo(result, uri, authority_end);
/* host is empty */
if (result->host_len == 0) {
return authority_end;
}
char *ipv6_end = NULL;
/* validate IPv6 form */
if (result->host[0] == '[') {
@ -159,12 +171,6 @@ static char *_consume_authority(uri_parser_result_t *result, char *uri,
return NULL;
}
/* do not allow empty host if userinfo or port are set */
if ((result->host_len == 0) &&
(result->userinfo || result->port)) {
return NULL;
}
/* this includes the '/' */
return authority_end;
}
@ -218,6 +224,11 @@ static int _parse_absolute(uri_parser_result_t *result, char *uri,
return -1;
}
if (uri >= uri_end) {
/* nothing more to consume */
return 0;
}
if (has_authority) {
uri = _consume_authority(result, uri, uri_end);
if (uri == NULL) {
@ -225,8 +236,12 @@ static int _parse_absolute(uri_parser_result_t *result, char *uri,
}
}
/* parsing the path, starting with '/' */
return _parse_relative(result, uri, uri_end);
/* is there more to parse after authority? */
if (uri < uri_end) {
/* parsing the path, starting with '/' */
return _parse_relative(result, uri, uri_end);
}
return 0;
}
bool uri_parser_is_absolute(const char *uri, size_t uri_len)

19
tests/unittests/tests-uri_parser/tests-uri_parser.c
View File

@ -216,15 +216,15 @@ static const validate_t validate_uris[] = {
0),
VEC("coap://R@////////////////7///v=1",
true,
"coap",
"R",
"",
"",
"",
"",
"////////////////7///v=1",
"",
"",
"",
"",
-1),
0),
VEC("coa[:////[2001:db5ow:5own/Ov=1",
false,
"",
@ -412,6 +412,17 @@ static const validate_t validate_uris[] = {
"",
"",
0),
VEC("A://@",
true,
"A",
"",
"",
"",
"",
"",
"",
"",
0),
};
static char _failure_msg[VEC_MSG_LEN];