development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

mingw: give more details about unsafe directory's ownership

Browse source 
Add domain/username in error message, if owner sid of repository and
user sid are not equal on windows systems.

Old error message:
'''
fatal: detected dubious ownership in repository at 'C:/Users/test/source/repos/git'
'C:/Users/test/source/repos/git' is owned by:
	'S-1-5-21-571067702-4104414259-3379520149-500'
but the current user is:
	'S-1-5-21-571067702-4104414259-3379520149-1001'
To add an exception for this directory, call:

	git config --global --add safe.directory C:/Users/test/source/repos/git
'''

New error message:
'''
fatal: detected dubious ownership in repository at 'C:/Users/test/source/repos/git'
'C:/Users/test/source/repos/git' is owned by:
        DESKTOP-L78JVA6/Administrator (S-1-5-21-571067702-4104414259-3379520149-500)
but the current user is:
        DESKTOP-L78JVA6/test (S-1-5-21-571067702-4104414259-3379520149-1001)
To add an exception for this directory, call:

        git config --global --add safe.directory C:/Users/test/source/repos/git
'''

Signed-off-by: Sören Krecker <soekkle@freenet.de>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sören Krecker 2024-01-08 18:38:37 +01:00 committed by Junio C Hamano
parent ec58344906
commit f755e092e8
1 changed files with 57 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
compat/mingw.c
View file

@ -2671,6 +2671,30 @@ static PSID get_current_user_sid(void)
return result;
}
static BOOL user_sid_to_user_name(PSID sid, LPSTR *str)
{
SID_NAME_USE pe_use;
DWORD len_user = 0, len_domain = 0;
BOOL translate_sid_to_user;
/*
* returns only FALSE, because the string pointers are NULL
*/
LookupAccountSidA(NULL, sid, NULL, &len_user, NULL, &len_domain,
&pe_use);
/*
* Alloc needed space of the strings
*/
ALLOC_ARRAY((*str), (size_t)len_domain + (size_t)len_user);
translate_sid_to_user = LookupAccountSidA(NULL, sid,
(*str) + len_domain, &len_user, *str, &len_domain, &pe_use);
if (!translate_sid_to_user)
FREE_AND_NULL(*str);
else
(*str)[len_domain] = '/';
return translate_sid_to_user;
}
static int acls_supported(const char *path)
{
size_t offset = offset_1st_component(path);
@ -2752,27 +2776,47 @@ int is_path_owned_by_current_sid(const char *path, struct strbuf *report)
strbuf_addf(report, "'%s' is on a file system that does"
"not record ownership\n", path);
} else if (report) {
LPSTR str1, str2, to_free1 = NULL, to_free2 = NULL;
LPSTR str1, str2, str3, str4, to_free1 = NULL,
to_free3 = NULL, to_local_free2 = NULL,
to_local_free4 = NULL;
if (ConvertSidToStringSidA(sid, &str1))
if (user_sid_to_user_name(sid, &str1))
to_free1 = str1;
else
str1 = "(inconvertible)";
if (!current_user_sid)
str2 = "(none)";
else if (!IsValidSid(current_user_sid))
str2 = "(invalid)";
else if (ConvertSidToStringSidA(current_user_sid, &str2))
to_free2 = str2;
if (ConvertSidToStringSidA(sid, &str2))
to_local_free2 = str2;
else
str2 = "(inconvertible)";
if (!current_user_sid) {
str3 = "(none)";
str4 = "(none)";
}
else if (!IsValidSid(current_user_sid)) {
str3 = "(invalid)";
str4 = "(invalid)";
} else {
if (user_sid_to_user_name(current_user_sid,
&str3))
to_free3 = str3;
else
str3 = "(inconvertible)";
if (ConvertSidToStringSidA(current_user_sid,
&str4))
to_local_free4 = str4;
else
str4 = "(inconvertible)";
}
strbuf_addf(report,
"'%s' is owned by:\n"
"\t'%s'\nbut the current user is:\n"
"\t'%s'\n", path, str1, str2);
LocalFree(to_free1);
LocalFree(to_free2);
"\t%s (%s)\nbut the current user is:\n"
"\t%s (%s)\n",
path, str1, str2, str3, str4);
free(to_free1);
LocalFree(to_local_free2);
free(to_free3);
LocalFree(to_local_free4);
}
}