emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

httpd: extract query string only after proxying check

Browse Source 
function                                             old     new   delta
handle_incoming_and_exit                            2398    2370     -28

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-04-16 13:35:56 +02:00
parent 62ba9e5ac3
commit 2efa726b22
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
networking/httpd.c
View File

@ -411,7 +411,7 @@ struct globals {
char *rmt_ip_str; /* for $REMOTE_ADDR and $REMOTE_PORT */ char *rmt_ip_str; /* for $REMOTE_ADDR and $REMOTE_PORT */
const char *bind_addr_or_port; const char *bind_addr_or_port;
const char *g_query; char *g_query;
const char *opt_c_configFile; const char *opt_c_configFile;
const char *home_httpd; const char *home_httpd;
const char *index_page; const char *index_page;
@ -2166,14 +2166,6 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
strcpy(urlcopy, urlp); strcpy(urlcopy, urlp);
/* NB: urlcopy ptr is never changed after this */ /* NB: urlcopy ptr is never changed after this */
/* Extract url args if present */
/* g_query = NULL; - already is */
tptr = strchr(urlcopy, '?');
if (tptr) {
*tptr++ = '\0';
g_query = tptr;
}
#if ENABLE_FEATURE_HTTPD_PROXY #if ENABLE_FEATURE_HTTPD_PROXY
{ {
int proxy_fd; int proxy_fd;
@ -2194,12 +2186,10 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
* When /urlSFX is requested, reverse proxy it * When /urlSFX is requested, reverse proxy it
* to http://hostname[:port]/new/pathSFX * to http://hostname[:port]/new/pathSFX
*/ */
fdprintf(proxy_fd, "%s %s%s%s%s %s\r\n", fdprintf(proxy_fd, "%s %s%s %s\r\n",
prequest, /* "GET" or "POST" */ prequest, /* "GET" or "POST" */
proxy_entry->url_to, /* "/new/path" */ proxy_entry->url_to, /* "/new/path" */
urlcopy + strlen(proxy_entry->url_from), /* "SFX" */ urlcopy + strlen(proxy_entry->url_from), /* "SFX" */
(g_query ? "?" : ""), /* "?" (maybe) */
(g_query ? g_query : ""), /* query string (maybe) */
HTTP_slash /* HTTP/xyz" or "" */ HTTP_slash /* HTTP/xyz" or "" */
); );
cgi_io_loop_and_exit(proxy_fd, proxy_fd, /*max POST length:*/ INT_MAX); cgi_io_loop_and_exit(proxy_fd, proxy_fd, /*max POST length:*/ INT_MAX);
@ -2207,6 +2197,11 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
} }
#endif #endif
/* Extract url args if present */
g_query = strchr(urlcopy, '?');
if (g_query)
*g_query++ = '\0';
/* Decode URL escape sequences */ /* Decode URL escape sequences */
tptr = percent_decode_in_place(urlcopy, /*strict:*/ 1); tptr = percent_decode_in_place(urlcopy, /*strict:*/ 1);
if (tptr == NULL) if (tptr == NULL)