Skip to content

Commit 921e8f9

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 1c40752 commit 921e8f9

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
@@ -296,6 +296,8 @@ int mingw_core_config(const char *var, const char *value, void *cb)
296296
return 0;
297297
}
298298

299+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
300+
299301
enum phantom_symlink_result {
300302
PHANTOM_SYMLINK_RETRY,
301303
PHANTOM_SYMLINK_DONE,
@@ -381,7 +383,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
381383
return PHANTOM_SYMLINK_DONE;
382384

383385
/* otherwise recreate the symlink with directory flag */
384-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
386+
if (DeleteFileW(wlink) &&
387+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
385388
return PHANTOM_SYMLINK_DIRECTORY;
386389

387390
errno = err_win_to_posix(GetLastError());
@@ -2675,7 +2678,7 @@ int symlink(const char *target, const char *link)
26752678
wtarget[len] = '\\';
26762679

26772680
/* create file symlink */
2678-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2681+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
26792682
errno = err_win_to_posix(GetLastError());
26802683
return -1;
26812684
}
@@ -3231,6 +3234,24 @@ static void maybe_redirect_std_handles(void)
32313234
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
32323235
}
32333236

3237+
static void adjust_symlink_flags(void)
3238+
{
3239+
/*
3240+
* Starting with Windows 10 Build 14972, symbolic links can be created
3241+
* using CreateSymbolicLink() without elevation by passing the flag
3242+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
3243+
* parameter, provided the Developer Mode has been enabled. Some
3244+
* earlier Windows versions complain about this flag with an
3245+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
3246+
* specifically.
3247+
*/
3248+
if (GetVersion() >= 14972 << 16) {
3249+
symlink_file_flags |= 2;
3250+
symlink_directory_flags |= 2;
3251+
}
3252+
3253+
}
3254+
32343255
#ifdef _MSC_VER
32353256
#ifdef _DEBUG
32363257
#include <crtdbg.h>
@@ -3265,6 +3286,7 @@ int wmain(int argc, const wchar_t **wargv)
32653286
#endif
32663287

32673288
maybe_redirect_std_handles();
3289+
adjust_symlink_flags();
32683290
fsync_object_files = 1;
32693291

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

0 commit comments

Comments
 (0)