Skip to content

Commit 22035f3

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 162b841 commit 22035f3

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
@@ -271,6 +271,8 @@ int mingw_core_config(const char *var, const char *value, void *cb)
271271
return 0;
272272
}
273273

274+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
275+
274276
enum phantom_symlink_result {
275277
PHANTOM_SYMLINK_RETRY,
276278
PHANTOM_SYMLINK_DONE,
@@ -356,7 +358,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
356358
return PHANTOM_SYMLINK_DONE;
357359

358360
/* otherwise recreate the symlink with directory flag */
359-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
361+
if (DeleteFileW(wlink) &&
362+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
360363
return PHANTOM_SYMLINK_DIRECTORY;
361364

362365
errno = err_win_to_posix(GetLastError());
@@ -2496,7 +2499,7 @@ int symlink(const char *target, const char *link)
24962499
wtarget[len] = '\\';
24972500

24982501
/* create file symlink */
2499-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2502+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
25002503
errno = err_win_to_posix(GetLastError());
25012504
return -1;
25022505
}
@@ -3011,6 +3014,24 @@ static void maybe_redirect_std_handles(void)
30113014
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
30123015
}
30133016

3017+
static void adjust_symlink_flags(void)
3018+
{
3019+
/*
3020+
* Starting with Windows 10 Build 14972, symbolic links can be created
3021+
* using CreateSymbolicLink() without elevation by passing the flag
3022+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
3023+
* parameter, provided the Developer Mode has been enabled. Some
3024+
* earlier Windows versions complain about this flag with an
3025+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
3026+
* specifically.
3027+
*/
3028+
if (GetVersion() >= 14972 << 16) {
3029+
symlink_file_flags |= 2;
3030+
symlink_directory_flags |= 2;
3031+
}
3032+
3033+
}
3034+
30143035
#ifdef _MSC_VER
30153036
#ifdef _DEBUG
30163037
#include <crtdbg.h>
@@ -3043,6 +3064,7 @@ int wmain(int argc, const wchar_t **wargv)
30433064
#endif
30443065

30453066
maybe_redirect_std_handles();
3067+
adjust_symlink_flags();
30463068

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

0 commit comments

Comments
 (0)