Skip to content

Commit d94c722

Browse files
dschoGit for Windows Build Agent
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 0f90a93 commit d94c722

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
@@ -319,6 +319,8 @@ int mingw_core_config(const char *var, const char *value, void *cb)
319319
return 0;
320320
}
321321

322+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
323+
322324
enum phantom_symlink_result {
323325
PHANTOM_SYMLINK_RETRY,
324326
PHANTOM_SYMLINK_DONE,
@@ -404,7 +406,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
404406
return PHANTOM_SYMLINK_DONE;
405407

406408
/* otherwise recreate the symlink with directory flag */
407-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
409+
if (DeleteFileW(wlink) &&
410+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
408411
return PHANTOM_SYMLINK_DIRECTORY;
409412

410413
errno = err_win_to_posix(GetLastError());
@@ -2873,7 +2876,7 @@ int symlink(const char *target, const char *link)
28732876
wtarget[len] = '\\';
28742877

28752878
/* create file symlink */
2876-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2879+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
28772880
errno = err_win_to_posix(GetLastError());
28782881
return -1;
28792882
}
@@ -3760,6 +3763,24 @@ static void maybe_redirect_std_handles(void)
37603763
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
37613764
}
37623765

3766+
static void adjust_symlink_flags(void)
3767+
{
3768+
/*
3769+
* Starting with Windows 10 Build 14972, symbolic links can be created
3770+
* using CreateSymbolicLink() without elevation by passing the flag
3771+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
3772+
* parameter, provided the Developer Mode has been enabled. Some
3773+
* earlier Windows versions complain about this flag with an
3774+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
3775+
* specifically.
3776+
*/
3777+
if (GetVersion() >= 14972 << 16) {
3778+
symlink_file_flags |= 2;
3779+
symlink_directory_flags |= 2;
3780+
}
3781+
3782+
}
3783+
37633784
#ifdef _MSC_VER
37643785
#ifdef _DEBUG
37653786
#include <crtdbg.h>
@@ -3794,6 +3815,7 @@ int wmain(int argc, const wchar_t **wargv)
37943815
#endif
37953816

37963817
maybe_redirect_std_handles();
3818+
adjust_symlink_flags();
37973819
fsync_object_files = 1;
37983820

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

0 commit comments

Comments
 (0)