Skip to content

Commit 816e705

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 bfa4e05 commit 816e705

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
@@ -362,6 +362,8 @@ static const wchar_t *make_relative_to(const wchar_t *path,
362362
return out;
363363
}
364364

365+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
366+
365367
enum phantom_symlink_result {
366368
PHANTOM_SYMLINK_RETRY,
367369
PHANTOM_SYMLINK_DONE,
@@ -412,7 +414,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
412414
return PHANTOM_SYMLINK_DONE;
413415

414416
/* otherwise recreate the symlink with directory flag */
415-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
417+
if (DeleteFileW(wlink) &&
418+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
416419
return PHANTOM_SYMLINK_DIRECTORY;
417420

418421
errno = err_win_to_posix(GetLastError());
@@ -3103,7 +3106,7 @@ int symlink(const char *target, const char *link)
31033106
wtarget[len] = '\\';
31043107

31053108
/* create file symlink */
3106-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
3109+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
31073110
errno = err_win_to_posix(GetLastError());
31083111
return -1;
31093112
}
@@ -4067,6 +4070,24 @@ static void maybe_redirect_std_handles(void)
40674070
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
40684071
}
40694072

4073+
static void adjust_symlink_flags(void)
4074+
{
4075+
/*
4076+
* Starting with Windows 10 Build 14972, symbolic links can be created
4077+
* using CreateSymbolicLink() without elevation by passing the flag
4078+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
4079+
* parameter, provided the Developer Mode has been enabled. Some
4080+
* earlier Windows versions complain about this flag with an
4081+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
4082+
* specifically.
4083+
*/
4084+
if (GetVersion() >= 14972 << 16) {
4085+
symlink_file_flags |= 2;
4086+
symlink_directory_flags |= 2;
4087+
}
4088+
4089+
}
4090+
40704091
#ifdef _MSC_VER
40714092
#ifdef _DEBUG
40724093
#include <crtdbg.h>
@@ -4102,6 +4123,7 @@ int wmain(int argc, const wchar_t **wargv)
41024123
#endif
41034124

41044125
maybe_redirect_std_handles();
4126+
adjust_symlink_flags();
41054127
fsync_object_files = 1;
41064128

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

0 commit comments

Comments
 (0)