jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

browser-wpadebug: Use more robust mechanism for starting browser

Browse source 
Use os_exec() to run the external browser to avoid undesired command
line processing for control interface event strings. Previously, it
could have been possible for some of the event strings to include
unsanitized data which is not suitable for system() use.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2014-10-06 18:51:22 +03:00 committed by Jouni Malinen
parent 3d8a3ffcf0
commit 2b28ef6ca8
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/utils/browser-wpadebug.c
View file

@ -76,7 +76,7 @@ int hs20_web_browser(const char *url)
os_memset(&data, 0, sizeof(data)); os_memset(&data, 0, sizeof(data));
ret = os_snprintf(cmd, sizeof(cmd), ret = os_snprintf(cmd, sizeof(cmd),
"am start -a android.action.MAIN " "start -a android.action.MAIN "
"-c android.intent.category.LAUNCHER " "-c android.intent.category.LAUNCHER "
"-n w1.fi.wpadebug/.WpaWebViewActivity " "-n w1.fi.wpadebug/.WpaWebViewActivity "
"-e w1.fi.wpadebug.URL '%s'", url); "-e w1.fi.wpadebug.URL '%s'", url);
@ -97,7 +97,7 @@ int hs20_web_browser(const char *url)
return -1; return -1;
} }
if (system(cmd) != 0) { if (os_exec("/system/bin/am", cmd, 1) != 0) {
wpa_printf(MSG_INFO, "Failed to launch wpadebug browser"); wpa_printf(MSG_INFO, "Failed to launch wpadebug browser");
eloop_cancel_timeout(browser_timeout, NULL, NULL); eloop_cancel_timeout(browser_timeout, NULL, NULL);
http_server_deinit(http); http_server_deinit(http);
@ -112,10 +112,11 @@ int hs20_web_browser(const char *url)
eloop_destroy(); eloop_destroy();
wpa_printf(MSG_INFO, "Closing Android browser"); wpa_printf(MSG_INFO, "Closing Android browser");
if (system("am start -a android.action.MAIN " if (os_exec("/system/bin/am",
"-c android.intent.category.LAUNCHER " "start -a android.action.MAIN "
"-n w1.fi.wpadebug/.WpaWebViewActivity " "-c android.intent.category.LAUNCHER "
"-e w1.fi.wpadebug.URL FINISH") != 0) { "-n w1.fi.wpadebug/.WpaWebViewActivity "
"-e w1.fi.wpadebug.URL FINISH", 1) != 0) {
wpa_printf(MSG_INFO, "Failed to close wpadebug browser"); wpa_printf(MSG_INFO, "Failed to close wpadebug browser");
} }