Skip to content

Commit 5020f3a

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 e3a6d3c commit 5020f3a

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
@@ -270,6 +270,7 @@ int mingw_core_config(const char *var, const char *value)
270270
return 0;
271271
}
272272

273+
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
273274
DECLARE_PROC_ADDR(kernel32.dll, BOOLEAN, CreateSymbolicLinkW, LPCWSTR, LPCWSTR, DWORD);
274275

275276
enum phantom_symlink_result {
@@ -314,7 +315,8 @@ static enum phantom_symlink_result process_phantom_symlink(
314315
return PHANTOM_SYMLINK_DONE;
315316

316317
/* otherwise recreate the symlink with directory flag */
317-
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
318+
if (DeleteFileW(wlink) &&
319+
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
318320
return PHANTOM_SYMLINK_DIRECTORY;
319321

320322
errno = err_win_to_posix(GetLastError());
@@ -2609,7 +2611,7 @@ int symlink(const char *target, const char *link)
26092611
wtarget[len] = '\\';
26102612

26112613
/* create file symlink */
2612-
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
2614+
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
26132615
errno = err_win_to_posix(GetLastError());
26142616
return -1;
26152617
}
@@ -3131,6 +3133,24 @@ static void maybe_redirect_std_handles(void)
31313133
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
31323134
}
31333135

3136+
static void adjust_symlink_flags(void)
3137+
{
3138+
/*
3139+
* Starting with Windows 10 Build 14972, symbolic links can be created
3140+
* using CreateSymbolicLink() without elevation by passing the flag
3141+
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
3142+
* parameter, provided the Developer Mode has been enabled. Some
3143+
* earlier Windows versions complain about this flag with an
3144+
* ERROR_INVALID_PARAMETER, hence we have to test the build number
3145+
* specifically.
3146+
*/
3147+
if (GetVersion() >= 14972 << 16) {
3148+
symlink_file_flags |= 2;
3149+
symlink_directory_flags |= 2;
3150+
}
3151+
3152+
}
3153+
31343154
#if defined(_MSC_VER)
31353155

31363156
#ifdef _DEBUG
@@ -3170,6 +3190,7 @@ int msc_startup(int argc, wchar_t **w_argv, wchar_t **w_env)
31703190
#endif
31713191

31723192
maybe_redirect_std_handles();
3193+
adjust_symlink_flags();
31733194

31743195
/* determine size of argv conversion buffer */
31753196
maxlen = wcslen(_wpgmptr);
@@ -3236,6 +3257,7 @@ void mingw_startup(void)
32363257
_startupinfo si;
32373258

32383259
maybe_redirect_std_handles();
3260+
adjust_symlink_flags();
32393261

32403262
/* get wide char arguments and environment */
32413263
si.newmode = 0;

0 commit comments

Comments
 (0)