ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advapi32: Add support for filtering credentials on MacOS in CredEnumerateW.

This commit is contained in:
Hans Leidekker 2012-12-07 17:09:25 +01:00 committed by Alexandre Julliard
parent c66b78a810
commit ffa6dbe0b1
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/advapi32/cred.c
View File

@ -716,7 +716,7 @@ static LPWSTR get_key_name_for_target(LPCWSTR target_name, DWORD type)
return key_name; return key_name;
} }
static BOOL credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) static BOOL registry_credential_matches_filter(HKEY hkeyCred, LPCWSTR filter)
{ {
LPWSTR target_name; LPWSTR target_name;
DWORD ret; DWORD ret;
@ -777,7 +777,7 @@ static DWORD registry_enumerate_credentials(HKEY hkeyMgr, LPCWSTR filter,
ret = RegOpenKeyExW(hkeyMgr, target_name, 0, KEY_QUERY_VALUE, &hkeyCred); ret = RegOpenKeyExW(hkeyMgr, target_name, 0, KEY_QUERY_VALUE, &hkeyCred);
if (ret != ERROR_SUCCESS) if (ret != ERROR_SUCCESS)
continue; continue;
if (!credential_matches_filter(hkeyCred, filter)) if (!registry_credential_matches_filter(hkeyCred, filter))
{ {
RegCloseKey(hkeyCred); RegCloseKey(hkeyCred);
continue; continue;
@ -801,6 +801,30 @@ static DWORD registry_enumerate_credentials(HKEY hkeyMgr, LPCWSTR filter,
} }
#ifdef __APPLE__ #ifdef __APPLE__
static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCHAR *filter)
{
int len;
WCHAR *target_name;
const WCHAR *p;
BOOL ret;
if (!filter) return TRUE;
len = MultiByteToWideChar(CP_UTF8, 0, data, data_len, NULL, 0);
if (!(target_name = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) return FALSE;
MultiByteToWideChar(CP_UTF8, 0, data, data_len, target_name, len);
target_name[len] = 0;
TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name));
p = strchrW(filter, '*');
ret = CompareStringW(GetThreadLocale(), 0, filter,
(p && !p[1] ? p - filter : -1), target_name,
(p && !p[1] ? p - filter : -1)) == CSTR_EQUAL;
HeapFree(GetProcessHeap(), 0, target_name);
return ret;
}
static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials, static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials,
char *buffer, DWORD *len, DWORD *count) char *buffer, DWORD *len, DWORD *count)
{ {
@ -821,6 +845,8 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials
SecKeychainAttributeInfo info; SecKeychainAttributeInfo info;
SecKeychainAttributeList *attr_list; SecKeychainAttributeList *attr_list;
UInt32 info_tags[] = { kSecServerItemAttr }; UInt32 info_tags[] = { kSecServerItemAttr };
BOOL match;
info.count = sizeof(info_tags)/sizeof(info_tags[0]); info.count = sizeof(info_tags)/sizeof(info_tags[0]);
info.tag = info_tags; info.tag = info_tags;
info.format = NULL; info.format = NULL;
@ -837,10 +863,15 @@ static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials
} }
else else
*len += sizeof(CREDENTIALW); *len += sizeof(CREDENTIALW);
if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServerItemAttr) continue; if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServerItemAttr)
TRACE("server item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data); {
/* FIXME: filter based on attr_list->attr[0].data */
SecKeychainItemFreeAttributesAndData(attr_list, NULL); SecKeychainItemFreeAttributesAndData(attr_list, NULL);
continue;
}
TRACE("server item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data);
match = mac_credential_matches_filter(attr_list->attr[0].data, attr_list->attr[0].length, filter);
SecKeychainItemFreeAttributesAndData(attr_list, NULL);
if (!match) continue;
ret = mac_read_credential_from_item(item, FALSE, ret = mac_read_credential_from_item(item, FALSE,
buffer ? credentials[*count] : NULL, buffer ? credentials[*count] : NULL,
buffer ? buffer + sizeof(CREDENTIALW) : NULL, buffer ? buffer + sizeof(CREDENTIALW) : NULL,