Skip to content

Commit f6ca033

Browse files
dschovdye
authored andcommitted
mingw: try to create symlinks without elevated permissions
With Windows 10 Build 14972 in Developer Mode, a new flag is supported by CreateSymbolicLink() to create symbolic links even when running outside of an elevated session (which was previously required). This new flag is called SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE and has the numeric value 0x02. Previous Windows 10 versions will not understand that flag and return an ERROR_INVALID_PARAMETER, therefore we have to be careful to try passing that flag only when the build number indicates that it is supported. For more information about the new flag, see this blog post: https://blogs.windows.com/buildingapps/2016/12/02/symlinks-windows-10/ This patch is loosely based on the patch submitted by Samuel D. Leslie as #1184. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent ff4e3e8 commit f6ca033

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

compat/mingw.c

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@ int mingw_core_config(const char *var, const char *value, void *cb)
299299
return 0;
300300
}
301301

302+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
303+
302304
enum phantom_symlink_result {
303305
PHANTOM_SYMLINK_RETRY,
304306
PHANTOM_SYMLINK_DONE,
@@ -384,7 +386,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
384386
return PHANTOM_SYMLINK_DONE;
385387

386388
/* otherwise recreate the symlink with directory flag */
387-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
389+
if (DeleteFileW(wlink) &&
390+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
388391
return PHANTOM_SYMLINK_DIRECTORY;
389392

390393
errno = err_win_to_posix(GetLastError());
@@ -2815,7 +2818,7 @@ int symlink(const char *target, const char *link)
28152818
wtarget[len] = '\\';
28162819

28172820
/* create file symlink */
2818-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2821+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
28192822
errno = err_win_to_posix(GetLastError());
28202823
return -1;
28212824
}
@@ -3551,6 +3554,24 @@ static void maybe_redirect_std_handles(void)
35513554
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
35523555
}
35533556

3557+
static void adjust_symlink_flags(void)
3558+
{
3559+
/*
3560+
* Starting with Windows 10 Build 14972, symbolic links can be created
3561+
* using CreateSymbolicLink() without elevation by passing the flag
3562+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
3563+
* parameter, provided the Developer Mode has been enabled. Some
3564+
* earlier Windows versions complain about this flag with an
3565+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
3566+
* specifically.
3567+
*/
3568+
if (GetVersion() >= 14972 << 16) {
3569+
symlink_file_flags |= 2;
3570+
symlink_directory_flags |= 2;
3571+
}
3572+
3573+
}
3574+
35543575
#ifdef _MSC_VER
35553576
#ifdef _DEBUG
35563577
#include <crtdbg.h>
@@ -3585,6 +3606,7 @@ int wmain(int argc, const wchar_t **wargv)
35853606
#endif
35863607

35873608
maybe_redirect_std_handles();
3609+
adjust_symlink_flags();
35883610
fsync_object_files = 1;
35893611

35903612
/* determine size of argv and environ conversion buffer */

0 commit comments

Comments
 (0)