Skip to content

Commit c26f3fb

Browse files
dschovdye
authored andcommitted
mingw: handle a file owned by the Administrators group correctly
When an Administrator creates a file or directory, the created file/directory is owned not by the Administrator SID, but by the _Administrators Group_ SID. The reason is that users with administrator privileges usually run in unprivileged ("non-elevated") mode, and their user SID does not change when running in elevated mode. This is is relevant e.g. when running a GitHub workflow on a build agent, which runs in elevated mode: cloning a Git repository in a script step will cause the worktree to be owned by the Administrators Group SID, for example. Let's handle this case as following: if the current user is an administrator, Git should consider a worktree owned by the Administrators Group as if it were owned by said user. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent e21a8b6 commit c26f3fb

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

compat/mingw.c

+10
Original file line numberDiff line numberDiff line change
@@ -3514,6 +3514,7 @@ int is_path_owned_by_current_sid(const char *path)
35143514
else if (sid && IsValidSid(sid)) {
35153515
/* Now, verify that the SID matches the current user's */
35163516
static PSID current_user_sid;
3517+
BOOL is_member;
35173518

35183519
if (!current_user_sid)
35193520
current_user_sid = get_current_user_sid();
@@ -3522,6 +3523,15 @@ int is_path_owned_by_current_sid(const char *path)
35223523
IsValidSid(current_user_sid) &&
35233524
EqualSid(sid, current_user_sid))
35243525
result = 1;
3526+
else if (IsWellKnownSid(sid, WinBuiltinAdministratorsSid) &&
3527+
CheckTokenMembership(NULL, sid, &is_member) &&
3528+
is_member)
3529+
/*
3530+
* If owned by the Administrators group, and the
3531+
* current user is an administrator, we consider that
3532+
* okay, too.
3533+
*/
3534+
result = 1;
35253535
else if (git_env_bool("GIT_TEST_DEBUG_UNSAFE_DIRECTORIES", 0)) {
35263536
LPSTR str1, str2, to_free1 = NULL, to_free2 = NULL;
35273537

0 commit comments

Comments
 (0)