Skip to content

Commit 4161621

Browse files
committed
Allow debugging unsafe directories' ownership
When Git refuses to use an existing repository because it is owned by someone else than the current user, it can be a bit tricky on Windows to figure out what is going on. Let's help with that by offering some more information via the environment variable `GIT_TEST_DEBUG_UNSAFE_DIRECTORIES`. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 00bea99 commit 4161621

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

Documentation/config/safe.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,9 @@ use the uid of the user that did so.
3535
If that is not what you would prefer and want git to only trust
3636
repositories that are owned by root instead, then you should remove
3737
the `SUDO_UID` variable from root's environment.
38+
39+
Due to the permission model on Windows where ACLs are used instead of
40+
Unix' simpler permission model, it can be a bit tricky to figure out why
41+
a directory is considered unsafe. To help with this, Git will provide
42+
more detailed information when the environment variable
43+
`GIT_TEST_DEBUG_UNSAFE_DIRECTORIES` is set to `true`.

compat/mingw.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "../git-compat-util.h"
22
#include "win32.h"
33
#include <aclapi.h>
4+
#include <sddl.h>
45
#include <conio.h>
56
#include <wchar.h>
67
#include <winioctl.h>
@@ -3521,6 +3522,26 @@ int is_path_owned_by_current_sid(const char *path)
35213522
IsValidSid(current_user_sid) &&
35223523
EqualSid(sid, current_user_sid))
35233524
result = 1;
3525+
else if (git_env_bool("GIT_TEST_DEBUG_UNSAFE_DIRECTORIES", 0)) {
3526+
LPSTR str1, str2, to_free1 = NULL, to_free2 = NULL;
3527+
3528+
if (ConvertSidToStringSidA(sid, &str1))
3529+
to_free1 = str1;
3530+
else
3531+
str1 = "(inconvertible)";
3532+
3533+
if (!current_user_sid)
3534+
str2 = "(none)";
3535+
else if (!IsValidSid(current_user_sid))
3536+
str2 = "(invalid)";
3537+
else if (ConvertSidToStringSidA(current_user_sid, &str2))
3538+
to_free2 = str2;
3539+
else
3540+
str2 = "(inconvertible)";
3541+
warning("'%s' is owned by:\n\t'%s'\nbut the current user is:\n\t'%s'", path, str1, str2);
3542+
LocalFree(to_free1);
3543+
LocalFree(to_free2);
3544+
}
35243545
}
35253546

35263547
/*

0 commit comments

Comments
 (0)