global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-19 23:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1188 from dscho/unprivileged-symlinks

Browse Source 
Support creating symlinks outside elevated sessions
This commit is contained in:
Johannes Schindelin
2018-06-08 18:35:44 +02:00
parent e0848c71e2 68a06ba6f7
commit 4b646af01d
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
compat/mingw.c
View File

@@ -271,6 +271,7 @@ int mingw_core_config(const char *var, const char *value, void *cb)
return 0;
}
static DWORD symlink_file_flags = 0, symlink_directory_flags = 1;
DECLARE_PROC_ADDR(kernel32.dll, BOOLEAN, CreateSymbolicLinkW, LPCWSTR, LPCWSTR, DWORD);
enum phantom_symlink_result {
@@ -358,7 +359,8 @@ process_phantom_symlink(const wchar_t *wtarget, const wchar_t *wlink)
return PHANTOM_SYMLINK_DONE;
/* otherwise recreate the symlink with directory flag */
if (DeleteFileW(wlink) && CreateSymbolicLinkW(wlink, wtarget, 1))
if (DeleteFileW(wlink) &&
CreateSymbolicLinkW(wlink, wtarget, symlink_directory_flags))
return PHANTOM_SYMLINK_DIRECTORY;
errno = err_win_to_posix(GetLastError());
@@ -2613,7 +2615,7 @@ int symlink(const char *target, const char *link)
wtarget[len] = '\\';
/* create file symlink */
if (!CreateSymbolicLinkW(wlink, wtarget, 0)) {
if (!CreateSymbolicLinkW(wlink, wtarget, symlink_file_flags)) {
errno = err_win_to_posix(GetLastError());
return -1;
}
@@ -3135,6 +3137,24 @@ static void maybe_redirect_std_handles(void)
GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
}
static void adjust_symlink_flags(void)
{
/*
* Starting with Windows 10 Build 14972, symbolic links can be created
* using CreateSymbolicLink() without elevation by passing the flag
* SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x02) as last
* parameter, provided the Developer Mode has been enabled. Some
* earlier Windows versions complain about this flag with an
* ERROR_INVALID_PARAMETER, hence we have to test the build number
* specifically.
*/
if (GetVersion() >= 14972 << 16) {
symlink_file_flags |= 2;
symlink_directory_flags |= 2;
}
}
#if defined(_MSC_VER)
#ifdef _DEBUG
@@ -3174,6 +3194,7 @@ int msc_startup(int argc, wchar_t **w_argv, wchar_t **w_env)
#endif
maybe_redirect_std_handles();
adjust_symlink_flags();
/* determine size of argv conversion buffer */
maxlen = wcslen(_wpgmptr);
@@ -3240,6 +3261,7 @@ void mingw_startup(void)
_startupinfo si;
maybe_redirect_std_handles();
adjust_symlink_flags();
/* get wide char arguments and environment */
si.newmode = 0;