Skip to content

Commit a180859

Browse files
committed
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 ffd1516 commit a180859

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

compat/mingw.c

+24-2
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ int mingw_core_config(const char *var, const char *value, void *cb)
270270
return 0;
271271
}
272272

273+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
274+
273275
enum phantom_symlink_result {
274276
PHANTOM_SYMLINK_RETRY,
275277
PHANTOM_SYMLINK_DONE,
@@ -355,7 +357,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
355357
return PHANTOM_SYMLINK_DONE;
356358

357359
/* otherwise recreate the symlink with directory flag */
358-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
360+
if (DeleteFileW(wlink) &&
361+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
359362
return PHANTOM_SYMLINK_DIRECTORY;
360363

361364
errno = err_win_to_posix(GetLastError());
@@ -2412,7 +2415,7 @@ int symlink(const char *target, const char *link)
24122415
wtarget[len] = '\\';
24132416

24142417
/* create file symlink */
2415-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2418+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
24162419
errno = err_win_to_posix(GetLastError());
24172420
return -1;
24182421
}
@@ -2932,6 +2935,24 @@ static void maybe_redirect_std_handles(void)
29322935
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
29332936
}
29342937

2938+
static void adjust_symlink_flags(void)
2939+
{
2940+
/*
2941+
* Starting with Windows 10 Build 14972, symbolic links can be created
2942+
* using CreateSymbolicLink() without elevation by passing the flag
2943+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
2944+
* parameter, provided the Developer Mode has been enabled. Some
2945+
* earlier Windows versions complain about this flag with an
2946+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
2947+
* specifically.
2948+
*/
2949+
if (GetVersion() >= 14972 << 16) {
2950+
symlink_file_flags |= 2;
2951+
symlink_directory_flags |= 2;
2952+
}
2953+
2954+
}
2955+
29352956
#ifdef _MSC_VER
29362957
#ifdef _DEBUG
29372958
#include <crtdbg.h>
@@ -2968,6 +2989,7 @@ int wmain(int argc, const wchar_t **wargv)
29682989
#endif
29692990

29702991
maybe_redirect_std_handles();
2992+
adjust_symlink_flags();
29712993

29722994
/* determine size of argv and environ conversion buffer */
29732995
maxlen = wcslen(wargv[0]);

0 commit comments

Comments
 (0)