Skip to content

Commit 7b717ef

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 0ab2c46 commit 7b717ef

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
@@ -286,6 +286,8 @@ int mingw_core_config(const char *var, const char *value, void *cb)
286286
return 0;
287287
}
288288

289+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
290+
289291
enum phantom_symlink_result {
290292
PHANTOM_SYMLINK_RETRY,
291293
PHANTOM_SYMLINK_DONE,
@@ -371,7 +373,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
371373
return PHANTOM_SYMLINK_DONE;
372374

373375
/* otherwise recreate the symlink with directory flag */
374-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
376+
if (DeleteFileW(wlink) &&
377+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
375378
return PHANTOM_SYMLINK_DIRECTORY;
376379

377380
errno = err_win_to_posix(GetLastError());
@@ -2373,7 +2376,7 @@ int symlink(const char *target, const char *link)
23732376
wtarget[len] = '\\';
23742377

23752378
/* create file symlink */
2376-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2379+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
23772380
errno = err_win_to_posix(GetLastError());
23782381
return -1;
23792382
}
@@ -2861,6 +2864,24 @@ static void maybe_redirect_std_handles(void)
28612864
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
28622865
}
28632866

2867+
static void adjust_symlink_flags(void)
2868+
{
2869+
/*
2870+
* Starting with Windows 10 Build 14972, symbolic links can be created
2871+
* using CreateSymbolicLink() without elevation by passing the flag
2872+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
2873+
* parameter, provided the Developer Mode has been enabled. Some
2874+
* earlier Windows versions complain about this flag with an
2875+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
2876+
* specifically.
2877+
*/
2878+
if (GetVersion() >= 14972 << 16) {
2879+
symlink_file_flags |= 2;
2880+
symlink_directory_flags |= 2;
2881+
}
2882+
2883+
}
2884+
28642885
#ifdef _MSC_VER
28652886
#ifdef _DEBUG
28662887
#include <crtdbg.h>
@@ -2895,6 +2916,7 @@ int wmain(int argc, const wchar_t **wargv)
28952916
#endif
28962917

28972918
maybe_redirect_std_handles();
2919+
adjust_symlink_flags();
28982920
fsync_object_files = 1;
28992921

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

0 commit comments

Comments
 (0)