Skip to content

Commit a51eee8

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 3f66e55 commit a51eee8

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

291+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
292+
291293
enum phantom_symlink_result {
292294
PHANTOM_SYMLINK_RETRY,
293295
PHANTOM_SYMLINK_DONE,
@@ -373,7 +375,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
373375
return PHANTOM_SYMLINK_DONE;
374376

375377
/* otherwise recreate the symlink with directory flag */
376-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
378+
if (DeleteFileW(wlink) &&
379+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
377380
return PHANTOM_SYMLINK_DIRECTORY;
378381

379382
errno = err_win_to_posix(GetLastError());
@@ -2376,7 +2379,7 @@ int symlink(const char *target, const char *link)
23762379
wtarget[len] = '\\';
23772380

23782381
/* create file symlink */
2379-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2382+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
23802383
errno = err_win_to_posix(GetLastError());
23812384
return -1;
23822385
}
@@ -2864,6 +2867,24 @@ static void maybe_redirect_std_handles(void)
28642867
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
28652868
}
28662869

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

29002921
maybe_redirect_std_handles();
2922+
adjust_symlink_flags();
29012923
fsync_object_files = 1;
29022924

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

0 commit comments

Comments
 (0)