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

webclient: Be a bit strict on Location header

Browse Source 
* Record Location header explicitly

* Bail out / warn on unexpected cases
This commit is contained in:
YAMAMOTO Takashi 2022-06-06 18:02:48 +09:00 committed by Petro Karashchenko
parent 0c4c811434
commit 065a130bc8
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
netutils/webclient/webclient.c
View File

@ -168,6 +168,7 @@ enum webclient_state_e
#define WGET_FLAG_GOT_CONTENT_LENGTH 1U #define WGET_FLAG_GOT_CONTENT_LENGTH 1U
#define WGET_FLAG_CHUNKED 2U #define WGET_FLAG_CHUNKED 2U
#define WGET_FLAG_GOT_LOCATION 4U
struct wget_target_s struct wget_target_s
{ {
@ -576,7 +577,8 @@ static inline int wget_parsestatus(struct webclient_context *ctx,
*/ */
ws->state = WEBCLIENT_STATE_HEADERS; ws->state = WEBCLIENT_STATE_HEADERS;
ws->internal_flags &= ~WGET_FLAG_CHUNKED; ws->internal_flags &= ~(WGET_FLAG_CHUNKED |
WGET_FLAG_GOT_LOCATION);
ndx = 0; ndx = 0;
break; break;
} }
@ -788,8 +790,14 @@ static inline int wget_parseheaders(struct webclient_context *ctx,
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, false); &ws->target, false);
if (ret != 0)
{
goto exit;
}
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);
ws->internal_flags |= WGET_FLAG_GOT_LOCATION;
found = true; found = true;
} }
else if (strncasecmp(ws->line, g_httpcontsize, else if (strncasecmp(ws->line, g_httpcontsize,
@ -1979,6 +1987,11 @@ int webclient_perform(FAR struct webclient_context *ctx)
FAR char *orig_buffer = ws->buffer; FAR char *orig_buffer = ws->buffer;
int orig_buflen = ws->buflen; int orig_buflen = ws->buflen;
if ((ws->internal_flags & WGET_FLAG_GOT_LOCATION) != 0)
{
nwarn("WARNING: Unexpected Location header\n");
}
if (ws->state == WEBCLIENT_STATE_CHUNKED_DATA) if (ws->state == WEBCLIENT_STATE_CHUNKED_DATA)
{ {
uintmax_t chunk_left = uintmax_t chunk_left =
@ -2052,6 +2065,13 @@ int webclient_perform(FAR struct webclient_context *ctx)
} }
else else
{ {
if ((ws->internal_flags & WGET_FLAG_GOT_LOCATION) == 0)
{
nerr("ERROR: Redirect w/o Location header\n");
ret = -EPROTO;
goto errout_with_errno;
}
ws->nredirect++; ws->nredirect++;
if (ws->nredirect > CONFIG_WEBCLIENT_MAX_REDIRECT) if (ws->nredirect > CONFIG_WEBCLIENT_MAX_REDIRECT)
{ {