Skip to content

Commit 4cad716

Browse files
committed
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 8c072d5 commit 4cad716

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

compat/mingw.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,6 +2713,7 @@ int is_path_owned_by_current_sid(const char *path)
27132713
else if (sid && IsValidSid(sid)) {
27142714
/* Now, verify that the SID matches the current user's */
27152715
static PSID current_user_sid;
2716+
BOOL is_member;
27162717

27172718
if (!current_user_sid)
27182719
current_user_sid = get_current_user_sid();
@@ -2721,6 +2722,15 @@ int is_path_owned_by_current_sid(const char *path)
27212722
IsValidSid(current_user_sid) &&
27222723
EqualSid(sid, current_user_sid))
27232724
result = 1;
2725+
else if (IsWellKnownSid(sid, WinBuiltinAdministratorsSid) &&
2726+
CheckTokenMembership(NULL, sid, &is_member) &&
2727+
is_member)
2728+
/*
2729+
* If owned by the Administrators group, and the
2730+
* current user is an administrator, we consider that
2731+
* okay, too.
2732+
*/
2733+
result = 1;
27242734
else if (git_env_bool("GIT_TEST_DEBUG_UNSAFE_DIRECTORIES", 0)) {
27252735
LPSTR str1, str2, to_free1 = NULL, to_free2 = NULL;
27262736

0 commit comments

Comments
 (0)