Skip to content

Commit e4313bf

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 1a9315b commit e4313bf

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

300+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
301+
300302
enum phantom_symlink_result {
301303
PHANTOM_SYMLINK_RETRY,
302304
PHANTOM_SYMLINK_DONE,
@@ -382,7 +384,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
382384
return PHANTOM_SYMLINK_DONE;
383385

384386
/* otherwise recreate the symlink with directory flag */
385-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
387+
if (DeleteFileW(wlink) &&
388+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
386389
return PHANTOM_SYMLINK_DIRECTORY;
387390

388391
errno = err_win_to_posix(GetLastError());
@@ -2680,7 +2683,7 @@ int symlink(const char *target, const char *link)
26802683
wtarget[len] = '\\';
26812684

26822685
/* create file symlink */
2683-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2686+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
26842687
errno = err_win_to_posix(GetLastError());
26852688
return -1;
26862689
}
@@ -3314,6 +3317,24 @@ static void maybe_redirect_std_handles(void)
33143317
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
33153318
}
33163319

3320+
static void adjust_symlink_flags(void)
3321+
{
3322+
/*
3323+
* Starting with Windows 10 Build 14972, symbolic links can be created
3324+
* using CreateSymbolicLink() without elevation by passing the flag
3325+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
3326+
* parameter, provided the Developer Mode has been enabled. Some
3327+
* earlier Windows versions complain about this flag with an
3328+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
3329+
* specifically.
3330+
*/
3331+
if (GetVersion() >= 14972 << 16) {
3332+
symlink_file_flags |= 2;
3333+
symlink_directory_flags |= 2;
3334+
}
3335+
3336+
}
3337+
33173338
#ifdef _MSC_VER
33183339
#ifdef _DEBUG
33193340
#include <crtdbg.h>
@@ -3348,6 +3369,7 @@ int wmain(int argc, const wchar_t **wargv)
33483369
#endif
33493370

33503371
maybe_redirect_std_handles();
3372+
adjust_symlink_flags();
33513373
fsync_object_files = 1;
33523374

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

0 commit comments

Comments
 (0)