sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

webclient: Require a port in proxy string

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2022-05-23 15:08:21 +09:00 committed by Xiang Xiao
parent 4798f01449
commit f7b0ad4b74
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netutils/webclient/webclient.c
View File

@ -574,7 +574,8 @@ static inline int wget_parsestatus(struct webclient_context *ctx,
* Name: parseurl * Name: parseurl
****************************************************************************/ ****************************************************************************/
static int parseurl(FAR const char *url, FAR struct wget_target_s *targ) static int parseurl(FAR const char *url, FAR struct wget_target_s *targ,
bool require_port)
{ {
struct url_s url_s; struct url_s url_s;
int ret; int ret;
@ -594,6 +595,11 @@ static int parseurl(FAR const char *url, FAR struct wget_target_s *targ)
if (url_s.port == 0) if (url_s.port == 0)
{ {
if (require_port)
{
return -EINVAL;
}
if (!strcmp(targ->scheme, "https")) if (!strcmp(targ->scheme, "https"))
{ {
targ->port = 443; targ->port = 443;
@ -743,7 +749,7 @@ static inline int wget_parseheaders(struct webclient_context *ctx,
ninfo("Redirect to location: '%s'\n", ninfo("Redirect to location: '%s'\n",
ws->line + strlen(g_httplocation)); ws->line + strlen(g_httplocation));
ret = parseurl(ws->line + strlen(g_httplocation), ret = parseurl(ws->line + strlen(g_httplocation),
&ws->target); &ws->target, false);
ninfo("New hostname='%s' filename='%s'\n", ninfo("New hostname='%s' filename='%s'\n",
ws->target.hostname, ws->target.filename); ws->target.hostname, ws->target.filename);
found = true; found = true;
@ -1146,7 +1152,7 @@ int webclient_perform(FAR struct webclient_context *ctx)
* from the URL. * from the URL.
*/ */
ret = parseurl(ctx->url, &ws->target); ret = parseurl(ctx->url, &ws->target, false);
if (ret != 0) if (ret != 0)
{ {
nwarn("WARNING: Malformed URL: %s\n", ctx->url); nwarn("WARNING: Malformed URL: %s\n", ctx->url);
@ -1157,7 +1163,13 @@ int webclient_perform(FAR struct webclient_context *ctx)
if (ctx->proxy != NULL) if (ctx->proxy != NULL)
{ {
ret = parseurl(ctx->proxy, &ws->proxy); /* Note: reject a proxy string w/o port number specified.
* It's better to be explicit because the default number varies
* among HTTP client implementations.
* (80, 1080, 3128, 8080, ...)
*/
ret = parseurl(ctx->proxy, &ws->proxy, true);
if (ret != 0) if (ret != 0)
{ {
nerr("ERROR: Malformed proxy setting: %s\n", ctx->proxy); nerr("ERROR: Malformed proxy setting: %s\n", ctx->proxy);