Skip to content

Commit 6953f4a

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 e4500a4 commit 6953f4a

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
@@ -366,6 +366,8 @@ static const wchar_t *make_relative_to(const wchar_t *path,
366366
return out;
367367
}
368368

369+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
370+
369371
enum phantom_symlink_result {
370372
PHANTOM_SYMLINK_RETRY,
371373
PHANTOM_SYMLINK_DONE,
@@ -416,7 +418,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
416418
return PHANTOM_SYMLINK_DONE;
417419

418420
/* otherwise recreate the symlink with directory flag */
419-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
421+
if (DeleteFileW(wlink) &&
422+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
420423
return PHANTOM_SYMLINK_DIRECTORY;
421424

422425
errno = err_win_to_posix(GetLastError());
@@ -2902,7 +2905,7 @@ int symlink(const char *target, const char *link)
29022905
wtarget[len] = '\\';
29032906

29042907
/* create file symlink */
2905-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2908+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
29062909
errno = err_win_to_posix(GetLastError());
29072910
return -1;
29082911
}
@@ -3838,6 +3841,24 @@ static void maybe_redirect_std_handles(void)
38383841
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
38393842
}
38403843

3844+
static void adjust_symlink_flags(void)
3845+
{
3846+
/*
3847+
* Starting with Windows 10 Build 14972, symbolic links can be created
3848+
* using CreateSymbolicLink() without elevation by passing the flag
3849+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
3850+
* parameter, provided the Developer Mode has been enabled. Some
3851+
* earlier Windows versions complain about this flag with an
3852+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
3853+
* specifically.
3854+
*/
3855+
if (GetVersion() >= 14972 << 16) {
3856+
symlink_file_flags |= 2;
3857+
symlink_directory_flags |= 2;
3858+
}
3859+
3860+
}
3861+
38413862
#ifdef _MSC_VER
38423863
#ifdef _DEBUG
38433864
#include <crtdbg.h>
@@ -3872,6 +3893,7 @@ int wmain(int argc, const wchar_t **wargv)
38723893
#endif
38733894

38743895
maybe_redirect_std_handles();
3896+
adjust_symlink_flags();
38753897
fsync_object_files = 1;
38763898

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

0 commit comments

Comments
 (0)