aboutsummaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2025-02-03 11:55:28 +0000
committerRon Yorston <rmy@pobox.com>2025-02-03 11:55:28 +0000
commit14ccc45d548c9dfa73594f155e920c83e2882081 (patch)
treeaf1fcbc52ba1240474f321346781144d983bdc8d /win32
parent820ade383860692d0b5abbba00a3e428f21b88e4 (diff)
downloadbusybox-w32-14ccc45d548c9dfa73594f155e920c83e2882081.tar.gz
busybox-w32-14ccc45d548c9dfa73594f155e920c83e2882081.tar.bz2
busybox-w32-14ccc45d548c9dfa73594f155e920c83e2882081.zip
win32: retry when command needs elevated privileges
Some installer programs have an entry in their manifest to indicate that they need elevated privileges. The shell in busybox-w32 was unable to run such programs. When a program fails to run with ERROR_ELEVATION_REQUIRED, try again using ShellExecuteEx() with the 'runas' verb to give it elevated privileges. Adds 272-288 bytes. (GitHub issue #481)
Diffstat (limited to 'win32')
-rw-r--r--win32/mingw.c22
-rw-r--r--win32/process.c42
2 files changed, 64 insertions, 0 deletions
diff --git a/win32/mingw.c b/win32/mingw.c
index 7a5198ccf..cb1f84f30 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -2538,3 +2538,25 @@ char * FAST_FUNC exe_relative_path(const char *tail)
2538 free(exepath); 2538 free(exepath);
2539 return relpath; 2539 return relpath;
2540} 2540}
2541
2542int mingw_shell_execute(SHELLEXECUTEINFO *info)
2543{
2544 DECLARE_PROC_ADDR(BOOL, ShellExecuteExA, SHELLEXECUTEINFOA *);
2545 char *lpath;
2546 int ret;
2547
2548 if (!INIT_PROC_ADDR(shell32.dll, ShellExecuteExA)) {
2549 errno = ENOSYS;
2550 return FALSE;
2551 }
2552
2553 // ShellExecuteEx() needs backslash as separator in UNC paths.
2554 lpath = xstrdup(info->lpFile);
2555 slash_to_bs(lpath);
2556 info->lpFile = lpath;
2557
2558 ret = ShellExecuteExA(info);
2559
2560 free(lpath);
2561 return ret;
2562}
diff --git a/win32/process.c b/win32/process.c
index fd89707ca..33f45ee42 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -501,6 +501,38 @@ static NORETURN void wait_for_child(HANDLE child, const char *cmd)
501 exit((int)code); 501 exit((int)code);
502} 502}
503 503
504static intptr_t
505shell_execute(const char *path, char *const *argv)
506{
507 SHELLEXECUTEINFO info;
508 char *args;
509
510 memset(&info, 0, sizeof(SHELLEXECUTEINFO));
511 info.cbSize = sizeof(SHELLEXECUTEINFO);
512 info.fMask = SEE_MASK_NOCLOSEPROCESS;
513 /* info.hwnd = NULL; */
514 info.lpVerb = "runas";
515 info.lpFile = path;
516
517 args = NULL;
518 if (*argv++) {
519 while (*argv) {
520 char *q = quote_arg(*argv++);
521 args = xappendword(args, q);
522 free(q);
523 }
524 }
525
526 info.lpParameters = args;
527 /* info.lpDirectory = NULL; */
528 info.nShow = SW_SHOWNORMAL;
529
530 mingw_shell_execute(&info);
531
532 free(args);
533 return info.hProcess ? (intptr_t)info.hProcess : -1;
534}
535
504int 536int
505mingw_execvp(const char *cmd, char *const *argv) 537mingw_execvp(const char *cmd, char *const *argv)
506{ 538{
@@ -514,6 +546,16 @@ int
514mingw_execve(const char *cmd, char *const *argv, char *const *envp) 546mingw_execve(const char *cmd, char *const *argv, char *const *envp)
515{ 547{
516 intptr_t ret = mingw_spawn_interpreter(P_NOWAIT, cmd, argv, envp, 0); 548 intptr_t ret = mingw_spawn_interpreter(P_NOWAIT, cmd, argv, envp, 0);
549
550 if (ret == -1 && GetLastError() == ERROR_ELEVATION_REQUIRED) {
551 // Command exists but failed because it wants elevated privileges.
552 // Try again using ShellExecuteEx().
553 SetLastError(0);
554 ret = shell_execute(cmd, argv);
555 if (GetLastError())
556 exit(1);
557 }
558
517 if (ret != -1) 559 if (ret != -1)
518 wait_for_child((HANDLE)ret, cmd); 560 wait_for_child((HANDLE)ret, cmd);
519 return ret; 561 return ret;