obgm/libcoap
2
0 Fork 0
mirror of https://github.com/obgm/libcoap.git synced 2026-11-10 02:40:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

coap_uri.c: Do more libcoap functionality checking in coap_split_uri_sub()

Browse Source
This commit is contained in:
Jon Shallow authored and Jon Shallow committed 2023-04-22 10:46:36 +01:00
1 parent e533b980fa
commit dfaaa47405
2 files changed
+64 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/coap_address.c
+4 -4
View File
@@ -473,16 +473,16 @@ coap_resolve_address_info(const coap_str_const_t *server,
#endif /* defined(WITH_LWIP) */
switch (scheme) {
case COAP_URI_SCHEME_COAP:
update_port(&info->addr, port, 5683);
update_port(&info->addr, port, COAP_DEFAULT_PORT);
break;
case COAP_URI_SCHEME_COAPS:
update_port(&info->addr, secure_port, 5684);
update_port(&info->addr, secure_port, COAPS_DEFAULT_PORT);
break;
case COAP_URI_SCHEME_COAP_TCP:
update_port(&info->addr, port, 5683);
update_port(&info->addr, port, COAP_DEFAULT_PORT);
break;
case COAP_URI_SCHEME_COAPS_TCP:
update_port(&info->addr, secure_port, 5684);
update_port(&info->addr, secure_port, COAPS_DEFAULT_PORT);
break;
case COAP_URI_SCHEME_HTTP:
update_port(&info->addr, port, 80);
src/coap_uri.c
+60 -10
View File
@@ -49,14 +49,14 @@ typedef enum coap_uri_check_t {
} coap_uri_check_t;
coap_uri_info_t coap_uri_scheme[COAP_URI_SCHEME_LAST] = {
{ "coap", 5683, 0, COAP_URI_SCHEME_COAP },
{ "coaps", 5684, 0, COAP_URI_SCHEME_COAPS },
{ "coap+tcp", 5683, 0, COAP_URI_SCHEME_COAP_TCP },
{ "coaps+tcp", 5684, 0, COAP_URI_SCHEME_COAPS_TCP },
{ "http", 80, 1, COAP_URI_SCHEME_HTTP },
{ "https", 443, 1, COAP_URI_SCHEME_HTTPS },
{ "coap+ws", 80, 0, COAP_URI_SCHEME_COAP_WS },
{ "coaps+ws", 443, 0, COAP_URI_SCHEME_COAPS_WS }
{ "coap", COAP_DEFAULT_PORT, 0, COAP_URI_SCHEME_COAP },
{ "coaps", COAPS_DEFAULT_PORT, 0, COAP_URI_SCHEME_COAPS },
{ "coap+tcp", COAP_DEFAULT_PORT, 0, COAP_URI_SCHEME_COAP_TCP },
{ "coaps+tcp", COAPS_DEFAULT_PORT, 0, COAP_URI_SCHEME_COAPS_TCP },
{ "http", 80, 1, COAP_URI_SCHEME_HTTP },
{ "https", 443, 1, COAP_URI_SCHEME_HTTPS },
{ "coap+ws", 80, 0, COAP_URI_SCHEME_COAP_WS },
{ "coaps+ws", 443, 0, COAP_URI_SCHEME_COAPS_WS }
};
static int
@@ -100,8 +100,11 @@ coap_split_uri_sub(const uint8_t *str_var,
for (i = 0; i < COAP_URI_SCHEME_LAST; i++) {
if ((p - str_var) == (int)strlen(coap_uri_scheme[i].name) &&
memcmp(str_var, coap_uri_scheme[i].name, p - str_var) == 0) {
if (check_proxy != COAP_URI_CHECK_PROXY && coap_uri_scheme[i].proxy_only)
if (check_proxy != COAP_URI_CHECK_PROXY && coap_uri_scheme[i].proxy_only) {
coap_log_err("%.*s URI scheme not enabled (not a proxy)\n",
(int)(p - str_var), str_var);
return -1;
}
uri->scheme = coap_uri_scheme[i].scheme;
uri->port = coap_uri_scheme[i].port;
break;
@@ -109,9 +112,55 @@ coap_split_uri_sub(const uint8_t *str_var,
}
if (i == COAP_URI_SCHEME_LAST) {
/* scheme unknown */
coap_log_err("%.*s URI scheme unknown\n", (int)(p - str_var), str_var);
res = -1;
goto error;
}
switch (uri->scheme) {
case COAP_URI_SCHEME_COAP:
break;
case COAP_URI_SCHEME_COAPS:
if (!coap_dtls_is_supported()) {
coap_log_err(
"coaps URI scheme not supported in this version of libcoap\n");
return -1;
}
break;
case COAP_URI_SCHEME_COAP_TCP:
if (!coap_tcp_is_supported()) {
coap_log_err(
"coap+tcp URI scheme not supported in this version of libcoap\n");
return -1;
}
break;
case COAP_URI_SCHEME_COAPS_TCP:
if (!coap_tcp_is_supported()) {
coap_log_err(
"coaps+tcp URI scheme not supported in this version of libcoap\n");
return -1;
}
break;
case COAP_URI_SCHEME_COAP_WS:
if (!coap_ws_is_supported()) {
coap_log_err(
"coap+ws URI scheme not supported in this version of libcoap\n");
return -1;
}
break;
case COAP_URI_SCHEME_COAPS_WS:
if (!coap_wss_is_supported()) {
coap_log_err(
"coaps+ws URI scheme not supported in this version of libcoap\n");
return -1;
}
break;
case COAP_URI_SCHEME_HTTP:
case COAP_URI_SCHEME_HTTPS:
case COAP_URI_SCHEME_LAST:
default:
coap_log_warn("Unsupported URI type %d\n", uri->scheme);
return -1;
}
/* skip :// */
p += 3;
len -= 3;
@@ -252,7 +301,8 @@ coap_uri_into_options(coap_uri_t *uri,
add_option = 1;
break;
default:
if (uri->port != (coap_uri_scheme_is_secure(uri) ? 5684 : 5683))
if (uri->port != (coap_uri_scheme_is_secure(uri) ? COAPS_DEFAULT_PORT :
COAP_DEFAULT_PORT))
add_option = 1;
break;
}