Commit 5bc01a7ddbb765616b52d4504036fbbb0e483e8e
2022-07-04T16:01:01
fs: allow ownership match if user is in admin group Allow the user ownership to match if the file is owned by the admin group and the user is in the admin group, even if the current process is not running as administrator directly.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/src/util/fs_path.c b/src/util/fs_path.c
index 7ff6b27..1eb41ef 100644
--- a/src/util/fs_path.c
+++ b/src/util/fs_path.c
@@ -1885,6 +1885,7 @@ int git_fs_path_owner_is(
git_fs_path_owner_t owner_type)
{
PSID owner_sid = NULL, user_sid = NULL;
+ BOOL is_admin, admin_owned;
int error;
if (mock_owner) {
@@ -1905,12 +1906,22 @@ int git_fs_path_owner_is(
}
}
- if ((owner_type & GIT_FS_PATH_OWNER_ADMINISTRATOR) != 0) {
- if (IsWellKnownSid(owner_sid, WinBuiltinAdministratorsSid) ||
- IsWellKnownSid(owner_sid, WinLocalSystemSid)) {
- *out = true;
- goto done;
- }
+ admin_owned =
+ IsWellKnownSid(owner_sid, WinBuiltinAdministratorsSid) ||
+ IsWellKnownSid(owner_sid, WinLocalSystemSid);
+
+ if (admin_owned &&
+ (owner_type & GIT_FS_PATH_OWNER_ADMINISTRATOR) != 0) {
+ *out = true;
+ goto done;
+ }
+
+ if (admin_owned &&
+ (owner_type & GIT_FS_PATH_USER_IS_ADMINISTRATOR) != 0 &&
+ CheckTokenMembership(NULL, owner_sid, &is_admin) &&
+ is_admin) {
+ *out = true;
+ goto done;
}
*out = false;
@@ -1962,6 +1973,7 @@ int git_fs_path_owner_is(
return 0;
}
+
#endif
int git_fs_path_owner_is_current_user(bool *out, const char *path)
diff --git a/src/util/fs_path.h b/src/util/fs_path.h
index 2dc6d56..fd045a3 100644
--- a/src/util/fs_path.h
+++ b/src/util/fs_path.h
@@ -740,8 +740,15 @@ typedef enum {
/** The file must be owned by the system account. */
GIT_FS_PATH_OWNER_ADMINISTRATOR = (1 << 1),
+ /**
+ * The file may be owned by a system account if the current
+ * user is in an administrator group. Windows only; this is
+ * a noop on non-Windows systems.
+ */
+ GIT_FS_PATH_USER_IS_ADMINISTRATOR = (1 << 2),
+
/** The file may be owned by another user. */
- GIT_FS_PATH_OWNER_OTHER = (1 << 2)
+ GIT_FS_PATH_OWNER_OTHER = (1 << 3)
} git_fs_path_owner_t;
/**