Skip to content

W
wine-winehq
Commit e54f6d8f authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

mountmgr: Move the macOS credentials support to the Unix library.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 07c9dd9b
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 146 deletions
dlls/mountmgr.sys/cred.c
View file @ e54f6d8f
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#if 0
#pragma makedep unix
#endif
#include "config.h" #include "config.h"
#include <stdarg.h> #include <stdarg.h>
...@@ -43,13 +47,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); ...@@ -43,13 +47,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr);
#ifdef __APPLE__ #ifdef __APPLE__
#define TICKSPERSEC 10000000
#define SECSPERDAY 86400
/* 1601 to 1970 is 369 years plus 89 leap days */
#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY)
#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC)
/* implementation of Wine extension to use host APIs to find symbol file by GUID */ /* implementation of Wine extension to use host APIs to find symbol file by GUID */
NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS query_symbol_file( void *args )
{ {
char *result = buff; const struct ioctl_params *params = args;
char *result = params->buff;
CFStringRef query_cfstring; CFStringRef query_cfstring;
MDQueryRef mdquery; MDQueryRef mdquery;
const GUID *id = buff; const GUID *id = params->buff;
NTSTATUS status = STATUS_NO_MEMORY; NTSTATUS status = STATUS_NO_MEMORY;
if (!(query_cfstring = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, if (!(query_cfstring = CFStringCreateWithFormat(kCFAllocatorDefault, NULL,
...@@ -73,9 +84,9 @@ NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info ...@@ -73,9 +84,9 @@ NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info
if (item_path) if (item_path)
{ {
if (CFStringGetCString( item_path, result, outsize, kCFStringEncodingUTF8 )) if (CFStringGetCString( item_path, result, params->outsize, kCFStringEncodingUTF8 ))
{ {
*info = strlen( result ) + 1; *params->info = strlen( result ) + 1;
status = STATUS_SUCCESS; status = STATUS_SUCCESS;
TRACE("found %s\n", debugstr_a(result)); TRACE("found %s\n", debugstr_a(result));
} }
...@@ -96,6 +107,28 @@ static inline BOOL check_credential_string( const void *buf, ULONG buflen, ULONG ...@@ -96,6 +107,28 @@ static inline BOOL check_credential_string( const void *buf, ULONG buflen, ULONG
return TRUE; return TRUE;
} }
static WCHAR *cred_umbstowcs( const char *src, ULONG srclen, ULONG *retlen )
{
WCHAR *ret = malloc( (srclen + 1) * sizeof(WCHAR) );
if (ret)
{
*retlen = ntdll_umbstowcs( src, srclen, ret, srclen );
ret[*retlen] = 0;
}
return ret;
}
static char *cred_wcstoumbs( const WCHAR *src, ULONG srclen, ULONG *retlen )
{
char *ret = malloc( srclen * 3 + 1 );
if (ret)
{
*retlen = ntdll_wcstoumbs( src, srclen, ret, srclen * 3, FALSE );
ret[*retlen] = 0;
}
return ret;
}
static SecKeychainItemRef find_credential( const WCHAR *name ) static SecKeychainItemRef find_credential( const WCHAR *name )
{ {
int status; int status;
...@@ -111,7 +144,7 @@ static SecKeychainItemRef find_credential( const WCHAR *name ) ...@@ -111,7 +144,7 @@ static SecKeychainItemRef find_credential( const WCHAR *name )
SecKeychainAttributeList *attr_list; SecKeychainAttributeList *attr_list;
UInt32 info_tags[] = { kSecServiceItemAttr }; UInt32 info_tags[] = { kSecServiceItemAttr };
WCHAR *itemname; WCHAR *itemname;
int len; ULONG len;
info.count = ARRAY_SIZE(info_tags); info.count = ARRAY_SIZE(info_tags);
info.tag = info_tags; info.tag = info_tags;
...@@ -127,22 +160,20 @@ static SecKeychainItemRef find_credential( const WCHAR *name ) ...@@ -127,22 +160,20 @@ static SecKeychainItemRef find_credential( const WCHAR *name )
CFRelease( item ); CFRelease( item );
continue; continue;
} }
len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, NULL, 0 ); itemname = cred_umbstowcs( attr_list->attr[0].data, attr_list->attr[0].length, &len );
if (!(itemname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) if (!itemname)
{ {
CFRelease( item ); CFRelease( item );
CFRelease( search ); CFRelease( search );
return NULL; return NULL;
} }
MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[0].data, attr_list->attr[0].length, itemname, len );
itemname[len] = 0;
if (strcmpiW( itemname, name )) if (strcmpiW( itemname, name ))
{ {
CFRelease( item ); CFRelease( item );
RtlFreeHeap( GetProcessHeap(), 0, itemname ); free( itemname );
continue; continue;
} }
RtlFreeHeap( GetProcessHeap(), 0, itemname ); free( itemname );
SecKeychainItemFreeAttributesAndData( attr_list, NULL ); SecKeychainItemFreeAttributesAndData( attr_list, NULL );
CFRelease( search ); CFRelease( search );
return item; return item;
...@@ -156,11 +187,11 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password, ...@@ -156,11 +187,11 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password,
ULONG buflen, ULONG *retlen ) ULONG buflen, ULONG *retlen )
{ {
struct mountmgr_credential *cred = buf; struct mountmgr_credential *cred = buf;
int status, len; int status;
ULONG size; ULONG size, len;
UInt32 i, cred_blob_len = 0; UInt32 i, cred_blob_len = 0;
void *cred_blob; void *cred_blob;
WCHAR *ptr; WCHAR *str;
BOOL user_name_present = FALSE; BOOL user_name_present = FALSE;
SecKeychainAttributeInfo info; SecKeychainAttributeInfo info;
SecKeychainAttributeList *attr_list = NULL; SecKeychainAttributeList *attr_list = NULL;
...@@ -206,17 +237,17 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password, ...@@ -206,17 +237,17 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password,
if (cred) cred->targetname_offset = cred->targetname_size = 0; if (cred) cred->targetname_offset = cred->targetname_size = 0;
if (!attr_list->attr[i].data) continue; if (!attr_list->attr[i].data) continue;
len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, NULL, 0 ); if (!(str = cred_umbstowcs( attr_list->attr[i].data, attr_list->attr[i].length, &len )))
continue;
size = (len + 1) * sizeof(WCHAR); size = (len + 1) * sizeof(WCHAR);
if (cred && *retlen + size <= buflen) if (cred && *retlen + size <= buflen)
{ {
cred->targetname_offset = data_offset; cred->targetname_offset = data_offset;
cred->targetname_size = size; cred->targetname_size = size;
ptr = (WCHAR *)((char *)cred + cred->targetname_offset); memcpy( (char *)cred + cred->targetname_offset, str, size );
MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, ptr, len );
ptr[len] = 0;
data_offset += size; data_offset += size;
} }
free( str );
*retlen += size; *retlen += size;
break; break;
case kSecAccountItemAttr: case kSecAccountItemAttr:
...@@ -225,17 +256,17 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password, ...@@ -225,17 +256,17 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password,
if (cred) cred->username_offset = cred->username_size = 0; if (cred) cred->username_offset = cred->username_size = 0;
if (!attr_list->attr[i].data) continue; if (!attr_list->attr[i].data) continue;
len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, NULL, 0 ); if (!(str = cred_umbstowcs( attr_list->attr[i].data, attr_list->attr[i].length, &len )))
continue;
size = (len + 1) * sizeof(WCHAR); size = (len + 1) * sizeof(WCHAR);
if (cred && *retlen + size <= buflen) if (cred && *retlen + size <= buflen)
{ {
cred->username_offset = data_offset; cred->username_offset = data_offset;
cred->username_size = size; cred->username_size = size;
ptr = (WCHAR *)((char *)cred + cred->username_offset); memcpy( (char *)cred + cred->username_offset, str, size );
MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, ptr, len );
ptr[len] = 0;
data_offset += size; data_offset += size;
} }
free( str );
*retlen += size; *retlen += size;
break; break;
} }
...@@ -244,22 +275,22 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password, ...@@ -244,22 +275,22 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password,
if (cred) cred->comment_offset = cred->comment_size = 0; if (cred) cred->comment_offset = cred->comment_size = 0;
if (!attr_list->attr[i].data) continue; if (!attr_list->attr[i].data) continue;
len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, NULL, 0 ); if (!(str = cred_umbstowcs( attr_list->attr[i].data, attr_list->attr[i].length, &len )))
continue;
size = (len + 1) * sizeof(WCHAR); size = (len + 1) * sizeof(WCHAR);
if (cred && *retlen + size <= buflen) if (cred && *retlen + size <= buflen)
{ {
cred->comment_offset = data_offset; cred->comment_offset = data_offset;
cred->comment_size = size; cred->comment_size = size;
ptr = (WCHAR *)((char *)cred + cred->comment_offset); memcpy( (char *)cred + cred->comment_offset, str, size );
len = MultiByteToWideChar( CP_UTF8, 0, attr_list->attr[i].data, attr_list->attr[i].length, ptr, len );
ptr[len] = 0;
data_offset += size; data_offset += size;
} }
free( str );
*retlen += size; *retlen += size;
break; break;
case kSecCreationDateItemAttr: case kSecCreationDateItemAttr:
{ {
LARGE_INTEGER wintime; ULONGLONG ticks;
struct tm tm; struct tm tm;
time_t time; time_t time;
...@@ -272,9 +303,9 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password, ...@@ -272,9 +303,9 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password,
memset( &tm, 0, sizeof(tm) ); memset( &tm, 0, sizeof(tm) );
strptime( attr_list->attr[i].data, "%Y%m%d%H%M%SZ", &tm ); strptime( attr_list->attr[i].data, "%Y%m%d%H%M%SZ", &tm );
time = mktime( &tm ); time = mktime( &tm );
RtlSecondsSince1970ToTime( time, &wintime ); ticks = time * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970;
cred->last_written.dwLowDateTime = wintime.u.LowPart; cred->last_written.dwLowDateTime = ticks;
cred->last_written.dwHighDateTime = wintime.u.HighPart; cred->last_written.dwHighDateTime = ticks >> 32;
} }
break; break;
} }
...@@ -284,50 +315,51 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password, ...@@ -284,50 +315,51 @@ static NTSTATUS fill_credential( SecKeychainItemRef item, BOOL require_password,
} }
} }
if (cred) if (cred) cred->blob_offset = cred->blob_size = 0;
str = cred_umbstowcs( cred_blob, cred_blob_len, &len );
size = len * sizeof(WCHAR);
if (cred && *retlen + size <= buflen)
{ {
if (*retlen + cred_blob_len <= buflen) cred->blob_offset = data_offset;
{ cred->blob_size = size;
len = MultiByteToWideChar( CP_UTF8, 0, cred_blob, cred_blob_len, NULL, 0 ); memcpy( (char *)cred + cred->blob_offset, str, size );
cred->blob_offset = data_offset;
cred->blob_size = len * sizeof(WCHAR);
ptr = (WCHAR *)((char *)cred + cred->blob_offset);
MultiByteToWideChar( CP_UTF8, 0, cred_blob, cred_blob_len, ptr, len );
}
else cred->blob_offset = cred->blob_size = 0;
} }
*retlen += cred_blob_len; free( str );
*retlen += size;
if (attr_list) SecKeychainItemFreeAttributesAndData( attr_list, cred_blob ); if (attr_list) SecKeychainItemFreeAttributesAndData( attr_list, cred_blob );
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
NTSTATUS read_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS read_credential( void *args )
{ {
struct mountmgr_credential *cred = buff; const struct ioctl_params *params = args;
struct mountmgr_credential *cred = params->buff;
const WCHAR *targetname; const WCHAR *targetname;
SecKeychainItemRef item; SecKeychainItemRef item;
ULONG size; ULONG size;
NTSTATUS status; NTSTATUS status;
if (!check_credential_string( buff, insize, cred->targetname_size, cred->targetname_offset )) if (!check_credential_string( params->buff, params->insize, cred->targetname_size, cred->targetname_offset ))
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
targetname = (const WCHAR *)((const char *)cred + cred->targetname_offset); targetname = (const WCHAR *)((const char *)cred + cred->targetname_offset);
if (!(item = find_credential( targetname ))) return STATUS_NOT_FOUND; if (!(item = find_credential( targetname ))) return STATUS_NOT_FOUND;
status = fill_credential( item, TRUE, cred, sizeof(*cred), outsize, &size ); status = fill_credential( item, TRUE, cred, sizeof(*cred), params->outsize, &size );
CFRelease( item ); CFRelease( item );
if (status != STATUS_SUCCESS) return status; if (status != STATUS_SUCCESS) return status;
*info = size; *params->info = size;
return (size > outsize) ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS; return (size > params->outsize) ? STATUS_BUFFER_OVERFLOW : STATUS_SUCCESS;
} }
NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS write_credential( void *args )
{ {
const struct mountmgr_credential *cred = buff; const struct ioctl_params *params = args;
int status, len, len_password = 0; const struct mountmgr_credential *cred = params->buff;
int status;
ULONG len, len_password = 0;
const WCHAR *ptr; const WCHAR *ptr;
SecKeychainItemRef keychain_item; SecKeychainItemRef keychain_item;
char *targetname, *username = NULL, *password = NULL; char *targetname, *username = NULL, *password = NULL;
...@@ -335,31 +367,25 @@ NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ...@@ -335,31 +367,25 @@ NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info
SecKeychainAttributeList attr_list; SecKeychainAttributeList attr_list;
NTSTATUS ret = STATUS_NO_MEMORY; NTSTATUS ret = STATUS_NO_MEMORY;
if (!check_credential_string( buff, insize, cred->targetname_size, cred->targetname_offset ) || if (!check_credential_string( params->buff, params->insize, cred->targetname_size, cred->targetname_offset ) ||
!check_credential_string( buff, insize, cred->username_size, cred->username_offset ) || !check_credential_string( params->buff, params->insize, cred->username_size, cred->username_offset ) ||
((cred->blob_size && cred->blob_size % sizeof(WCHAR)) || cred->blob_offset + cred->blob_size > insize) || ((cred->blob_size && cred->blob_size % sizeof(WCHAR)) || cred->blob_offset + cred->blob_size > params->insize) ||
(cred->comment_size && !check_credential_string( buff, insize, cred->comment_size, cred->comment_offset )) || (cred->comment_size && !check_credential_string( params->buff, params->insize, cred->comment_size, cred->comment_offset )) ||
sizeof(*cred) + cred->targetname_size + cred->username_size + cred->blob_size + cred->comment_size > insize) sizeof(*cred) + cred->targetname_size + cred->username_size + cred->blob_size + cred->comment_size > params->insize)
{ {
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
ptr = (const WCHAR *)((const char *)cred + cred->targetname_offset); ptr = (const WCHAR *)((const char *)cred + cred->targetname_offset);
len = WideCharToMultiByte( CP_UTF8, 0, ptr, -1, NULL, 0, NULL, NULL ); if (!(targetname = cred_wcstoumbs( ptr, cred->targetname_size / sizeof(WCHAR), &len ))) goto error;
if (!(targetname = RtlAllocateHeap( GetProcessHeap(), 0, len ))) goto error;
WideCharToMultiByte( CP_UTF8, 0, ptr, -1, targetname, len, NULL, NULL );
ptr = (const WCHAR *)((const char *)cred + cred->username_offset); ptr = (const WCHAR *)((const char *)cred + cred->username_offset);
len = WideCharToMultiByte( CP_UTF8, 0, ptr, -1, NULL, 0, NULL, NULL ); if (!(username = cred_wcstoumbs( ptr, cred->username_size / sizeof(WCHAR), &len ))) goto error;
if (!(username = RtlAllocateHeap( GetProcessHeap(), 0, len ))) goto error;
WideCharToMultiByte( CP_UTF8, 0, ptr, -1, username, len, NULL, NULL );
if (cred->blob_size) if (cred->blob_size)
{ {
ptr = (const WCHAR *)((const char *)cred + cred->blob_offset); ptr = (const WCHAR *)((const char *)cred + cred->blob_offset);
len_password = WideCharToMultiByte( CP_UTF8, 0, ptr, cred->blob_size / sizeof(WCHAR), NULL, 0, NULL, NULL ); if (!(password = cred_wcstoumbs( ptr, cred->blob_size / sizeof(WCHAR), &len_password ))) goto error;
if (!(password = RtlAllocateHeap( GetProcessHeap(), 0, len_password ))) goto error;
WideCharToMultiByte( CP_UTF8, 0, ptr, cred->blob_size / sizeof(WCHAR), password, len_password, NULL, NULL );
} }
TRACE("adding target %s, username %s using Keychain\n", targetname, username ); TRACE("adding target %s, username %s using Keychain\n", targetname, username );
...@@ -372,11 +398,11 @@ NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ...@@ -372,11 +398,11 @@ NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info
NULL, &keychain_item ); NULL, &keychain_item );
if (status != noErr) ERR( "SecKeychainFindGenericPassword returned %d\n", status ); if (status != noErr) ERR( "SecKeychainFindGenericPassword returned %d\n", status );
} }
RtlFreeHeap( GetProcessHeap(), 0, username ); free( username );
RtlFreeHeap( GetProcessHeap(), 0, targetname ); free( targetname );
if (status != noErr) if (status != noErr)
{ {
RtlFreeHeap( GetProcessHeap(), 0, password ); free( password );
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
if (cred->comment_size) if (cred->comment_size)
...@@ -385,10 +411,8 @@ NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ...@@ -385,10 +411,8 @@ NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info
attr_list.attr = attrs; attr_list.attr = attrs;
attrs[0].tag = kSecCommentItemAttr; attrs[0].tag = kSecCommentItemAttr;
ptr = (const WCHAR *)((const char *)cred + cred->comment_offset); ptr = (const WCHAR *)((const char *)cred + cred->comment_offset);
attrs[0].length = WideCharToMultiByte( CP_UTF8, 0, ptr, -1, NULL, 0, NULL, NULL ); if (!(attrs[0].data = cred_wcstoumbs( ptr, cred->comment_size / sizeof(WCHAR), &len ))) goto error;
if (attrs[0].length) attrs[0].length--; attrs[0].length = len - 1;
if (!(attrs[0].data = RtlAllocateHeap( GetProcessHeap(), 0, attrs[0].length ))) goto error;
WideCharToMultiByte( CP_UTF8, 0, ptr, -1, attrs[0].data, attrs[0].length, NULL, NULL );
} }
else else
{ {
...@@ -398,27 +422,28 @@ NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ...@@ -398,27 +422,28 @@ NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info
status = SecKeychainItemModifyAttributesAndData( keychain_item, &attr_list, cred->blob_preserve ? 0 : len_password, status = SecKeychainItemModifyAttributesAndData( keychain_item, &attr_list, cred->blob_preserve ? 0 : len_password,
cred->blob_preserve ? NULL : password ); cred->blob_preserve ? NULL : password );
if (cred->comment_size) RtlFreeHeap( GetProcessHeap(), 0, attrs[0].data ); if (cred->comment_size) free( attrs[0].data );
RtlFreeHeap( GetProcessHeap(), 0, password ); free( password );
/* FIXME: set TargetAlias attribute */ /* FIXME: set TargetAlias attribute */
CFRelease( keychain_item ); CFRelease( keychain_item );
if (status != noErr) return STATUS_UNSUCCESSFUL; if (status != noErr) return STATUS_UNSUCCESSFUL;
return STATUS_SUCCESS; return STATUS_SUCCESS;
error: error:
RtlFreeHeap( GetProcessHeap(), 0, username ); free( username );
RtlFreeHeap( GetProcessHeap(), 0, targetname ); free( targetname );
RtlFreeHeap( GetProcessHeap(), 0, password ); free( password );
return ret; return ret;
} }
NTSTATUS delete_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS delete_credential( void *args )
{ {
const struct mountmgr_credential *cred = buff; const struct ioctl_params *params = args;
const struct mountmgr_credential *cred = params->buff;
const WCHAR *targetname; const WCHAR *targetname;
SecKeychainItemRef item; SecKeychainItemRef item;
if (!check_credential_string( buff, insize, cred->targetname_size, cred->targetname_offset )) if (!check_credential_string( params->buff, params->insize, cred->targetname_size, cred->targetname_offset ))
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
targetname = (const WCHAR *)((const char *)cred + cred->targetname_offset); targetname = (const WCHAR *)((const char *)cred + cred->targetname_offset);
...@@ -431,24 +456,20 @@ NTSTATUS delete_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ...@@ -431,24 +456,20 @@ NTSTATUS delete_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info
static BOOL match_credential( void *data, UInt32 data_len, const WCHAR *filter ) static BOOL match_credential( void *data, UInt32 data_len, const WCHAR *filter )
{ {
int len; ULONG len;
WCHAR *targetname; WCHAR *targetname;
const WCHAR *p; const WCHAR *p;
BOOL ret; BOOL ret;
if (!*filter) return TRUE; if (!*filter) return TRUE;
if (!(targetname = cred_umbstowcs( data, data_len, &len ))) return FALSE;
len = MultiByteToWideChar( CP_UTF8, 0, data, data_len, NULL, 0 );
if (!(targetname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return FALSE;
MultiByteToWideChar( CP_UTF8, 0, data, data_len, targetname, len );
targetname[len] = 0;
TRACE( "comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(targetname) ); TRACE( "comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(targetname) );
p = strchrW( filter, '*' ); p = strchrW( filter, '*' );
ret = CompareStringW( GetThreadLocale(), NORM_IGNORECASE, filter, if (*p && !p[1]) ret = !strncmpiW( filter, targetname, p - filter );
(p && !p[1]) ? p - filter : -1, targetname, (p && !p[1]) ? p - filter : -1 ) == CSTR_EQUAL; else ret = !strcmpiW( filter, targetname );
RtlFreeHeap( GetProcessHeap(), 0, targetname ); free( targetname );
return ret; return ret;
} }
...@@ -523,16 +544,19 @@ static NTSTATUS search_credentials( const WCHAR *filter, struct mountmgr_credent ...@@ -523,16 +544,19 @@ static NTSTATUS search_credentials( const WCHAR *filter, struct mountmgr_credent
return ret; return ret;
} }
NTSTATUS enumerate_credentials( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS enumerate_credentials( void *args )
{ {
struct mountmgr_credential_list *list = buff; const struct ioctl_params *params = args;
struct mountmgr_credential_list *list = params->buff;
WCHAR *filter; WCHAR *filter;
ULONG size, count; ULONG size, count;
Boolean saved_user_interaction_allowed; Boolean saved_user_interaction_allowed;
NTSTATUS status; NTSTATUS status;
if (!check_credential_string( buff, insize, list->filter_size, list->filter_offset )) return STATUS_INVALID_PARAMETER; if (!check_credential_string( params->buff, params->insize, list->filter_size, list->filter_offset ))
if (!(filter = strdupW( (const WCHAR *)((const char *)list + list->filter_offset) ))) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER;
if (!(filter = malloc( list->filter_size ))) return STATUS_NO_MEMORY;
memcpy( filter, (const char *)list + list->filter_offset, list->filter_size );
SecKeychainGetUserInteractionAllowed( &saved_user_interaction_allowed ); SecKeychainGetUserInteractionAllowed( &saved_user_interaction_allowed );
SecKeychainSetUserInteractionAllowed( false ); SecKeychainSetUserInteractionAllowed( false );
...@@ -540,53 +564,53 @@ NTSTATUS enumerate_credentials( void *buff, ULONG insize, ULONG outsize, ULONG * ...@@ -540,53 +564,53 @@ NTSTATUS enumerate_credentials( void *buff, ULONG insize, ULONG outsize, ULONG *
if ((status = search_credentials( filter, NULL, &count, &size )) == STATUS_SUCCESS) if ((status = search_credentials( filter, NULL, &count, &size )) == STATUS_SUCCESS)
{ {
if (size > outsize) if (size > params->outsize)
{ {
if (size >= sizeof(list->size)) list->size = size; if (size >= sizeof(list->size)) list->size = size;
*info = sizeof(list->size); *params->info = sizeof(list->size);
status = STATUS_BUFFER_OVERFLOW; status = STATUS_BUFFER_OVERFLOW;
} }
else else
{ {
list->size = size; list->size = size;
list->count = count; list->count = count;
*info = size; *params->info = size;
status = search_credentials( filter, list, NULL, NULL ); status = search_credentials( filter, list, NULL, NULL );
} }
} }
SecKeychainSetUserInteractionAllowed( saved_user_interaction_allowed ); SecKeychainSetUserInteractionAllowed( saved_user_interaction_allowed );
RtlFreeHeap( GetProcessHeap(), 0, filter ); free( filter );
return status; return status;
} }
#else /* __APPLE__ */ #else /* __APPLE__ */
NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS query_symbol_file( void *args )
{ {
FIXME( "not supported\n" ); FIXME( "not supported\n" );
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS read_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS read_credential( void *args )
{ {
FIXME( "not supported\n" ); FIXME( "not supported\n" );
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS write_credential( void *args )
{ {
FIXME( "not supported\n" ); FIXME( "not supported\n" );
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS delete_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS delete_credential( void *args )
{ {
FIXME( "not supported\n" ); FIXME( "not supported\n" );
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
} }
NTSTATUS enumerate_credentials( void *buff, ULONG insize, ULONG outsize, ULONG *info ) NTSTATUS enumerate_credentials( void *args )
{ {
FIXME( "not supported\n" ); FIXME( "not supported\n" );
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
......
dlls/mountmgr.sys/device.c
View file @ e54f6d8f
...@@ -139,7 +139,7 @@ static char *strdupA( const char *str ) ...@@ -139,7 +139,7 @@ static char *strdupA( const char *str )
return ret; return ret;
} }
WCHAR *strdupW( const WCHAR *str ) static WCHAR *strdupW( const WCHAR *str )
{ {
WCHAR *ret; WCHAR *ret;
......
dlls/mountmgr.sys/mountmgr.c
View file @ e54f6d8f
...@@ -433,10 +433,12 @@ static void WINAPI query_symbol_file_callback( TP_CALLBACK_INSTANCE *instance, v ...@@ -433,10 +433,12 @@ static void WINAPI query_symbol_file_callback( TP_CALLBACK_INSTANCE *instance, v
IRP *irp = context; IRP *irp = context;
IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
ULONG info = 0; ULONG info = 0;
NTSTATUS status = query_symbol_file( irp->AssociatedIrp.SystemBuffer, struct ioctl_params params = { irp->AssociatedIrp.SystemBuffer,
irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&info ); &info };
NTSTATUS status = MOUNTMGR_CALL( query_symbol_file, &params );
irp->IoStatus.Information = info; irp->IoStatus.Information = info;
irp->IoStatus.u.Status = status; irp->IoStatus.u.Status = status;
IoCompleteRequest( irp, IO_NO_INCREMENT ); IoCompleteRequest( irp, IO_NO_INCREMENT );
...@@ -550,52 +552,52 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) ...@@ -550,52 +552,52 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp )
status = STATUS_NO_MEMORY; status = STATUS_NO_MEMORY;
break; break;
case IOCTL_MOUNTMGR_READ_CREDENTIAL: case IOCTL_MOUNTMGR_READ_CREDENTIAL:
if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) if (irpsp->Parameters.DeviceIoControl.InputBufferLength >= sizeof(struct mountmgr_credential))
{ {
status = STATUS_INVALID_PARAMETER; struct ioctl_params params = { irp->AssociatedIrp.SystemBuffer,
break; irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&info };
status = MOUNTMGR_CALL( read_credential, &params );
irp->IoStatus.Information = info;
} }
status = read_credential( irp->AssociatedIrp.SystemBuffer, else status = STATUS_INVALID_PARAMETER;
irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&info );
irp->IoStatus.Information = info;
break; break;
case IOCTL_MOUNTMGR_WRITE_CREDENTIAL: case IOCTL_MOUNTMGR_WRITE_CREDENTIAL:
if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) if (irpsp->Parameters.DeviceIoControl.InputBufferLength >= sizeof(struct mountmgr_credential))
{ {
status = STATUS_INVALID_PARAMETER; struct ioctl_params params = { irp->AssociatedIrp.SystemBuffer,
break; irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&info };
status = MOUNTMGR_CALL( write_credential, &params );
irp->IoStatus.Information = info;
} }
status = write_credential( irp->AssociatedIrp.SystemBuffer, else status = STATUS_INVALID_PARAMETER;
irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&info );
irp->IoStatus.Information = info;
break; break;
case IOCTL_MOUNTMGR_DELETE_CREDENTIAL: case IOCTL_MOUNTMGR_DELETE_CREDENTIAL:
if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential)) if (irpsp->Parameters.DeviceIoControl.InputBufferLength >= sizeof(struct mountmgr_credential))
{ {
status = STATUS_INVALID_PARAMETER; struct ioctl_params params = { irp->AssociatedIrp.SystemBuffer,
break; irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&info };
status = MOUNTMGR_CALL( delete_credential, &params );
irp->IoStatus.Information = info;
} }
status = delete_credential( irp->AssociatedIrp.SystemBuffer, else status = STATUS_INVALID_PARAMETER;
irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&info );
irp->IoStatus.Information = info;
break; break;
case IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS: case IOCTL_MOUNTMGR_ENUMERATE_CREDENTIALS:
if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(struct mountmgr_credential_list)) if (irpsp->Parameters.DeviceIoControl.InputBufferLength >= sizeof(struct mountmgr_credential))
{ {
status = STATUS_INVALID_PARAMETER; struct ioctl_params params = { irp->AssociatedIrp.SystemBuffer,
break; irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&info };
status = MOUNTMGR_CALL( enumerate_credentials, &params );
irp->IoStatus.Information = info;
} }
status = enumerate_credentials( irp->AssociatedIrp.SystemBuffer, else status = STATUS_INVALID_PARAMETER;
irpsp->Parameters.DeviceIoControl.InputBufferLength,
irpsp->Parameters.DeviceIoControl.OutputBufferLength,
&info );
irp->IoStatus.Information = info;
break; break;
default: default:
FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode );
......
dlls/mountmgr.sys/mountmgr.h
View file @ e54f6d8f
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
#define WINE_MOUNTMGR_EXTENSIONS #define WINE_MOUNTMGR_EXTENSIONS
#include "ddk/mountmgr.h" #include "ddk/mountmgr.h"
extern WCHAR *strdupW( const WCHAR * ) DECLSPEC_HIDDEN;
/* device functions */ /* device functions */
enum device_type enum device_type
......
dlls/mountmgr.sys/unixlib.c
View file @ e54f6d8f
...@@ -439,4 +439,9 @@ const unixlib_entry_t __wine_unix_call_funcs[] = ...@@ -439,4 +439,9 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
set_shell_folder, set_shell_folder,
get_shell_folder, get_shell_folder,
dhcp_request, dhcp_request,
query_symbol_file,
read_credential,
write_credential,
delete_credential,
enumerate_credentials,
}; };
dlls/mountmgr.sys/unixlib.h
View file @ e54f6d8f
...@@ -127,6 +127,14 @@ struct dhcp_request_params ...@@ -127,6 +127,14 @@ struct dhcp_request_params
ULONG *ret_size; ULONG *ret_size;
}; };
struct ioctl_params
{
void *buff;
ULONG insize;
ULONG outsize;
ULONG *info;
};
enum mountmgr_funcs enum mountmgr_funcs
{ {
unix_run_loop, unix_run_loop,
...@@ -142,6 +150,11 @@ enum mountmgr_funcs ...@@ -142,6 +150,11 @@ enum mountmgr_funcs
unix_set_shell_folder, unix_set_shell_folder,
unix_get_shell_folder, unix_get_shell_folder,
unix_dhcp_request, unix_dhcp_request,
unix_query_symbol_file,
unix_read_credential,
unix_write_credential,
unix_delete_credential,
unix_enumerate_credentials,
}; };
extern unixlib_handle_t mountmgr_handle; extern unixlib_handle_t mountmgr_handle;
...@@ -155,8 +168,8 @@ extern void run_dbus_loop(void) DECLSPEC_HIDDEN; ...@@ -155,8 +168,8 @@ extern void run_dbus_loop(void) DECLSPEC_HIDDEN;
extern void run_diskarbitration_loop(void) DECLSPEC_HIDDEN; extern void run_diskarbitration_loop(void) DECLSPEC_HIDDEN;
extern NTSTATUS dhcp_request( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS dhcp_request( void *args ) DECLSPEC_HIDDEN;
extern NTSTATUS query_symbol_file( void *buff, ULONG insize, ULONG outsize, ULONG *info ) DECLSPEC_HIDDEN; extern NTSTATUS query_symbol_file( void *args ) DECLSPEC_HIDDEN;
extern NTSTATUS read_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ) DECLSPEC_HIDDEN; extern NTSTATUS read_credential( void *args ) DECLSPEC_HIDDEN;
extern NTSTATUS write_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ) DECLSPEC_HIDDEN; extern NTSTATUS write_credential( void *args ) DECLSPEC_HIDDEN;
extern NTSTATUS delete_credential( void *buff, ULONG insize, ULONG outsize, ULONG *info ) DECLSPEC_HIDDEN; extern NTSTATUS delete_credential( void *args ) DECLSPEC_HIDDEN;
extern NTSTATUS enumerate_credentials( void *buff, ULONG insize, ULONG outsize, ULONG *info ) DECLSPEC_HIDDEN; extern NTSTATUS enumerate_credentials( void *args ) DECLSPEC_HIDDEN;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment