wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Zebediah Figura : msi: Pass the given record to the callback.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 4e49ae3cc69b595f791410b3060dc18ddb9412cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e49ae3cc69b595f791410b30… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 21:53:30 2017 -0500 msi: Pass the given record to the callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 3 +-- dlls/msi/tests/package.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index eae01e0..e195764 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1818,8 +1818,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC if (gUIHandlerRecord && (gUIFilterRecord & log_type)) { - MSIHANDLE rec = MsiCreateRecord( 1 ); - MsiRecordSetStringW( rec, 0, message ); + MSIHANDLE rec = alloc_msihandle(&record->hdr); TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, hRecord=%u)\n", gUIHandlerRecord, gUIContextRecord, eMessageType, rec); rc = gUIHandlerRecord( gUIContextRecord, eMessageType, rec ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a7cec7f..146d1fc 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9096,7 +9096,6 @@ static INT CALLBACK externalui_record_callback(void *context, UINT message_type, r = MsiRecordGetFieldCount(hrecord); ok(r == 1, "expected 1, got %u\n", r); r = MsiRecordGetInteger(hrecord, 1); - todo_wine ok(r == 12345, "expected 12345, got %u\n", r); return retval; }

1 0

Zebediah Figura : msi: Store string and record callback data separately.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: df31a7c1ece45ad5492bd96a4ad43611b3dde072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df31a7c1ece45ad5492bd96a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 21:53:28 2017 -0500 msi: Store string and record callback data separately. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/msi_main.c | 2 ++ dlls/msi/msipriv.h | 2 ++ dlls/msi/package.c | 13 ++++++++----- dlls/msi/tests/package.c | 12 ++++++++++-- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 1357a64..bbfdd6f 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -109,7 +109,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIHANDLE rec = MsiCreateRecord(1); MsiRecordSetStringW(rec, 0, error); - gUIHandlerRecord(gUIContext, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, rec); + gUIHandlerRecord(gUIContextRecord, MB_RETRYCANCEL | INSTALLMESSAGE_ERROR, rec); MsiCloseHandle(rec); } } diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 8a11e83..ce8a7be 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4222,8 +4222,8 @@ UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD handler, *prev = gUIHandlerRecord; gUIHandlerRecord = handler; - gUIFilter = filter; - gUIContext = context; + gUIFilterRecord = filter; + gUIContextRecord = context; return ERROR_SUCCESS; } diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 0955856..11cbf41 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -44,7 +44,9 @@ INSTALLUI_HANDLERA gUIHandlerA = NULL; INSTALLUI_HANDLERW gUIHandlerW = NULL; INSTALLUI_HANDLER_RECORD gUIHandlerRecord = NULL; DWORD gUIFilter = 0; +DWORD gUIFilterRecord = 0; LPVOID gUIContext = NULL; +LPVOID gUIContextRecord = NULL; WCHAR *gszLogFile = NULL; HINSTANCE msi_hInstance; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2e9e91e..cc42316 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -972,7 +972,9 @@ extern INSTALLUI_HANDLERA gUIHandlerA DECLSPEC_HIDDEN; extern INSTALLUI_HANDLERW gUIHandlerW DECLSPEC_HIDDEN; extern INSTALLUI_HANDLER_RECORD gUIHandlerRecord DECLSPEC_HIDDEN; extern DWORD gUIFilter DECLSPEC_HIDDEN; +extern DWORD gUIFilterRecord DECLSPEC_HIDDEN; extern LPVOID gUIContext DECLSPEC_HIDDEN; +extern LPVOID gUIContextRecord DECLSPEC_HIDDEN; extern WCHAR *gszLogFile DECLSPEC_HIDDEN; extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8f86352..eae01e0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1811,27 +1811,30 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC p[0] = 0; } - TRACE("%p %p %p %x %x %s\n", gUIHandlerA, gUIHandlerW, gUIHandlerRecord, - gUIFilter, log_type, debugstr_w(message)); - /* convert it to ASCII */ len = WideCharToMultiByte( CP_ACP, 0, message, -1, NULL, 0, NULL, NULL ); msg = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL ); - if (gUIHandlerRecord && (gUIFilter & log_type)) + if (gUIHandlerRecord && (gUIFilterRecord & log_type)) { MSIHANDLE rec = MsiCreateRecord( 1 ); MsiRecordSetStringW( rec, 0, message ); - rc = gUIHandlerRecord( gUIContext, eMessageType, rec ); + TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, hRecord=%u)\n", + gUIHandlerRecord, gUIContextRecord, eMessageType, rec); + rc = gUIHandlerRecord( gUIContextRecord, eMessageType, rec ); MsiCloseHandle( rec ); } if (!rc && gUIHandlerW && (gUIFilter & log_type)) { + TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n", + gUIHandlerW, gUIContext, eMessageType, debugstr_w(message)); rc = gUIHandlerW( gUIContext, eMessageType, message ); } else if (!rc && gUIHandlerA && (gUIFilter & log_type)) { + TRACE("Calling UI handler %p(pvContext=%p, iMessageType=%08x, szMessage=%s)\n", + gUIHandlerA, gUIContext, eMessageType, debugstr_a(msg)); rc = gUIHandlerA( gUIContext, eMessageType, msg ); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e18f0f0..a7cec7f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9159,11 +9159,19 @@ static void test_externalui(void) retval = 1; externalui_ran = externalui_record_ran = 0; r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - todo_wine ok(r == 1, "expected 1, got %u\n", r); - todo_wine ok(externalui_ran == 0, "external UI callback should not have run\n"); ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + /* filter and context should be kept separately */ + r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_ERROR, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 0, "external UI record callback should not have run\n"); } else win_skip("MsiSetExternalUIRecord is not available\n");

1 0

Zebediah Figura : msi: Use an external UI record handler before a string handler.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: cef67993c5164bb12ff0547152d604f3fcc3d549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef67993c5164bb12ff054715… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 21:53:27 2017 -0500 msi: Use an external UI record handler before a string handler. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 20 +++++----- dlls/msi/tests/package.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 10 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 330f80f..8f86352 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1819,21 +1819,21 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC msg = msi_alloc( len ); WideCharToMultiByte( CP_ACP, 0, message, -1, msg, len, NULL, NULL ); - if (gUIHandlerW && (gUIFilter & log_type)) - { - rc = gUIHandlerW( gUIContext, eMessageType, message ); - } - else if (gUIHandlerA && (gUIFilter & log_type)) - { - rc = gUIHandlerA( gUIContext, eMessageType, msg ); - } - else if (gUIHandlerRecord && (gUIFilter & log_type)) + if (gUIHandlerRecord && (gUIFilter & log_type)) { MSIHANDLE rec = MsiCreateRecord( 1 ); MsiRecordSetStringW( rec, 0, message ); rc = gUIHandlerRecord( gUIContext, eMessageType, rec ); MsiCloseHandle( rec ); } + if (!rc && gUIHandlerW && (gUIFilter & log_type)) + { + rc = gUIHandlerW( gUIContext, eMessageType, message ); + } + else if (!rc && gUIHandlerA && (gUIFilter & log_type)) + { + rc = gUIHandlerA( gUIContext, eMessageType, msg ); + } if (!rc && package->log_file != INVALID_HANDLE_VALUE && (eMessageType & 0xff000000) != INSTALLMESSAGE_PROGRESS) @@ -1882,7 +1882,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIREC break; } - return ERROR_SUCCESS; + return rc; } INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType, diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 10ef84a..e18f0f0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -39,6 +39,7 @@ static char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA)(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); +static UINT (WINAPI *pMsiSetExternalUIRecord)(INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); @@ -67,6 +68,7 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiApplyMultiplePatchesA); GET_PROC(hmsi, MsiGetComponentPathExA); + GET_PROC(hmsi, MsiSetExternalUIRecord); GET_PROC(hshell32, SHGetFolderPathA); GET_PROC(hadvapi32, CheckTokenMembership); @@ -9074,6 +9076,102 @@ error: DeleteFileA( msifile ); } +static int externalui_ran; + +static INT CALLBACK externalui_callback(void *context, UINT message_type, LPCSTR message) +{ + externalui_ran = 1; + ok(message_type == INSTALLMESSAGE_USER, "expected INSTALLMESSAGE_USER, got %08x\n", message_type); + return 0; +} + +static int externalui_record_ran; + +static INT CALLBACK externalui_record_callback(void *context, UINT message_type, MSIHANDLE hrecord) +{ + INT retval = context ? *((INT *)context) : 0; + UINT r; + externalui_record_ran = 1; + ok(message_type == INSTALLMESSAGE_USER, "expected INSTALLMESSAGE_USER, got %08x\n", message_type); + r = MsiRecordGetFieldCount(hrecord); + ok(r == 1, "expected 1, got %u\n", r); + r = MsiRecordGetInteger(hrecord, 1); + todo_wine + ok(r == 12345, "expected 12345, got %u\n", r); + return retval; +} + +static void test_externalui(void) +{ + /* test that external UI handlers work correctly */ + + INSTALLUI_HANDLERA prev; + INSTALLUI_HANDLER_RECORD prev_record; + MSIHANDLE hpkg, hrecord; + UINT r; + + prev = MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + r = package_from_db(create_package_db(), &hpkg); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA(msifile); + return; + } + ok(r == ERROR_SUCCESS, "Expected a valid package %u\n", r); + + hrecord = MsiCreateRecord(1); + ok(hrecord, "Expected a valid record\n"); + r = MsiRecordSetStringA(hrecord, 0, "test message [1]"); + ok(r == ERROR_SUCCESS, "MsiSetString failed %u\n", r); + r = MsiRecordSetInteger(hrecord, 1, 12345); + ok(r == ERROR_SUCCESS, "MsiSetInteger failed %u\n", r); + + externalui_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + + if (pMsiSetExternalUIRecord) + { + INT retval = 0; + + prev = MsiSetExternalUIA(prev, 0, NULL); + ok(prev == externalui_callback, "wrong callback function %p\n", prev); + r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_USER, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + retval = 1; + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + todo_wine + ok(r == 1, "expected 1, got %u\n", r); + todo_wine + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + } + else + win_skip("MsiSetExternalUIRecord is not available\n"); + + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -9131,6 +9229,7 @@ START_TEST(package) test_MsiApplyPatch(); test_MsiEnumComponentCosts(); test_MsiDatabaseCommit(); + test_externalui(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0

Zebediah Figura : include: Add missing MSI message values.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 37f17fdba2b3fa8707a322f498bcd9750323f8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f17fdba2b3fa8707a322f49… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 18 22:00:06 2017 -0500 include: Add missing MSI message values. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msi.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/include/msi.h b/include/msi.h index b227fbd..417b606 100644 --- a/include/msi.h +++ b/include/msi.h @@ -103,7 +103,10 @@ typedef enum tagINSTALLMESSAGE INSTALLMESSAGE_COMMONDATA = 0x0b000000, INSTALLMESSAGE_INITIALIZE = 0x0c000000, INSTALLMESSAGE_TERMINATE = 0x0d000000, - INSTALLMESSAGE_SHOWDIALOG = 0x0e000000 + INSTALLMESSAGE_SHOWDIALOG = 0x0e000000, + INSTALLMESSAGE_RMFILESINUSE = 0x19000000, + INSTALLMESSAGE_INSTALLSTART = 0x1A000000, + INSTALLMESSAGE_INSTALLEND = 0x1B000000, } INSTALLMESSAGE; typedef enum tagREINSTALLMODE @@ -128,18 +131,22 @@ typedef enum tagINSTALLLOGMODE INSTALLLOGMODE_WARNING = (1 << (INSTALLMESSAGE_WARNING >> 24)), INSTALLLOGMODE_USER = (1 << (INSTALLMESSAGE_USER >> 24)), INSTALLLOGMODE_INFO = (1 << (INSTALLMESSAGE_INFO >> 24)), + INSTALLLOGMODE_FILESINUSE = (1 << (INSTALLMESSAGE_FILESINUSE >> 24)), INSTALLLOGMODE_RESOLVESOURCE = (1 << (INSTALLMESSAGE_RESOLVESOURCE >> 24)), INSTALLLOGMODE_OUTOFDISKSPACE = (1 << (INSTALLMESSAGE_OUTOFDISKSPACE >> 24)), INSTALLLOGMODE_ACTIONSTART = (1 << (INSTALLMESSAGE_ACTIONSTART >> 24)), INSTALLLOGMODE_ACTIONDATA = (1 << (INSTALLMESSAGE_ACTIONDATA >> 24)), - INSTALLLOGMODE_COMMONDATA = (1 << (INSTALLMESSAGE_COMMONDATA >> 24)), - INSTALLLOGMODE_PROPERTYDUMP = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), - INSTALLLOGMODE_VERBOSE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), - INSTALLLOGMODE_EXTRADEBUG = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), INSTALLLOGMODE_PROGRESS = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), + INSTALLLOGMODE_PROPERTYDUMP = (1 << (INSTALLMESSAGE_PROGRESS >> 24)), + INSTALLLOGMODE_COMMONDATA = (1 << (INSTALLMESSAGE_COMMONDATA >> 24)), INSTALLLOGMODE_INITIALIZE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), + INSTALLLOGMODE_VERBOSE = (1 << (INSTALLMESSAGE_INITIALIZE >> 24)), INSTALLLOGMODE_TERMINATE = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), - INSTALLLOGMODE_SHOWDIALOG = (1 << (INSTALLMESSAGE_SHOWDIALOG >> 24)) + INSTALLLOGMODE_EXTRADEBUG = (1 << (INSTALLMESSAGE_TERMINATE >> 24)), + INSTALLLOGMODE_SHOWDIALOG = (1 << (INSTALLMESSAGE_SHOWDIALOG >> 24)), + INSTALLLOGMODE_RMFILESINUSE = (1 << (INSTALLMESSAGE_RMFILESINUSE >> 24)), + INSTALLLOGMODE_INSTALLSTART = (1 << (INSTALLMESSAGE_INSTALLSTART >> 24)), + INSTALLLOGMODE_INSTALLEND = (1 << (INSTALLMESSAGE_INSTALLEND >> 24)), } INSTALLLOGMODE; typedef enum tagINSTALLLOGATTRIBUTES

1 0

Marcus Meissner : webservices: Free header on error exit (Coverity).
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: b65f0f2a97f59e131ba3e24ae0f37358c755b968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b65f0f2a97f59e131ba3e24ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 18 15:44:40 2017 +0200 webservices: Free header on error exit (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 74c6fd1..f27aceac 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1008,7 +1008,7 @@ static HRESULT build_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_T if (!(header = alloc_header( type, FALSE, get_header_name(type), NULL ))) return E_OUTOFMEMORY; - if (!msg->writer && (hr = WsCreateWriter( NULL, 0, &msg->writer, NULL )) != S_OK) return hr; + if (!msg->writer && (hr = WsCreateWriter( NULL, 0, &msg->writer, NULL )) != S_OK) goto done; if ((hr = WsCreateXmlBuffer( msg->heap, NULL, 0, &buf, NULL )) != S_OK) goto done; if ((hr = WsSetOutputToBuffer( msg->writer, buf, NULL, 0, NULL )) != S_OK) goto done; if ((hr = write_standard_header( msg, type, value_type, option, value, size )) != S_OK) goto done;

1 0

Matteo Bruni : advapi32/tests: Add a token mandatory label test.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 894837168c76f20bd5699fcf3e08171357364161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894837168c76f20bd5699fcf3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 16 20:41:37 2017 +0200 advapi32/tests: Add a token mandatory label test. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8044cae..3c68205 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6716,6 +6716,86 @@ static void test_maximum_allowed(void) CloseHandle(handle); } +static void test_token_label(void) +{ + static SID medium_sid = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_MEDIUM_RID}}; + static SID high_sid = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + SECURITY_DESCRIPTOR_CONTROL control; + SYSTEM_MANDATORY_LABEL_ACE *ace; + BOOL ret, present, defaulted; + SECURITY_DESCRIPTOR *sd; + ACL *sacl = NULL, *dacl; + DWORD size, revision; + HANDLE token; + char *str; + SID *sid; + + ret = OpenProcessToken(GetCurrentProcess(), READ_CONTROL | WRITE_OWNER, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + ret = GetSecurityDescriptorControl(sd, &control, &revision); + ok(ret, "GetSecurityDescriptorControl failed with error %u\n", GetLastError()); + todo_wine ok(control == (SE_SELF_RELATIVE | SE_SACL_AUTO_INHERITED | SE_SACL_PRESENT) || + broken(control == SE_SELF_RELATIVE) /* WinXP, Win2003 */, + "Unexpected security descriptor control %#x\n", control); + ok(revision == 1, "Unexpected security descriptor revision %u\n", revision); + + sid = (void *)0xdeadbeef; + defaulted = TRUE; + ret = GetSecurityDescriptorOwner(sd, (void **)&sid, &defaulted); + ok(ret, "GetSecurityDescriptorOwner failed with error %u\n", GetLastError()); + ok(!sid, "Owner present\n"); + ok(!defaulted, "Owner defaulted\n"); + + sid = (void *)0xdeadbeef; + defaulted = TRUE; + ret = GetSecurityDescriptorGroup(sd, (void **)&sid, &defaulted); + ok(ret, "GetSecurityDescriptorGroup failed with error %u\n", GetLastError()); + ok(!sid, "Group present\n"); + ok(!defaulted, "Group defaulted\n"); + + ret = GetSecurityDescriptorSacl(sd, &present, &sacl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + ok(present || broken(!present) /* WinXP, Win2003 */, "No SACL in the security descriptor\n"); + ok(sacl || broken(!sacl) /* WinXP, Win2003 */, "NULL SACL in the security descriptor\n"); + + if (present) + { + ok(!defaulted, "SACL defaulted\n"); + ok(sacl->AceCount == 1, "SACL contains an unexpected ACE count %u\n", sacl->AceCount); + + ret = pGetAce(sacl, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "Unexpected ACE flags %#x\n", ace->Header.AceFlags); + ok(ace->Header.AceSize, "Unexpected ACE size %u\n", ace->Header.AceSize); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "Unexpected ACE mask %#x\n", ace->Mask); + + sid = (SID *)&ace->SidStart; + pConvertSidToStringSidA(sid, &str); + ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); + } + + ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine ok(!present, "DACL present\n"); + + HeapFree(GetProcessHeap(), 0, sd); + CloseHandle(token); +} + static void test_token_security_descriptor(void) { static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, @@ -7048,6 +7128,7 @@ START_TEST(security) test_GetSidIdentifierAuthority(); test_pseudo_tokens(); test_maximum_allowed(); + test_token_label(); /* Must be the last test, modifies process token */ test_token_security_descriptor();

1 0

Michael Müller : server: Assign a default label to all tokens.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: a78d419420a43e1f428ac155082b87143117e381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78d419420a43e1f428ac1550… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:36 2017 +0200 server: Assign a default label to all tokens. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 46 +++++++++++++++---------------------- server/process.c | 6 +++++ server/security.h | 2 ++ server/token.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 28 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3a8e7e9..8044cae 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6847,7 +6847,6 @@ static void test_token_security_descriptor(void) defaulted = TRUE; ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); - todo_wine ok(present, "DACL not present\n"); ok(acl2 != (void *)0xdeadbeef, "DACL not set\n"); ok(!defaulted, "DACL defaulted\n"); @@ -6949,20 +6948,16 @@ static void test_child_token_sd(void) defaulted = TRUE; ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); - todo_wine ok(present, "DACL not present\n"); + ok(present, "DACL not present\n"); + ok(acl && acl != (void *)0xdeadbeef, "Got invalid DACL\n"); + ok(!defaulted, "DACL defaulted\n"); - if (present && acl) + ok(acl->AceCount, "Expected at least one ACE\n"); + for (i = 0; i < acl->AceCount; i++) { - ok(acl != (void *)0xdeadbeef, "DACL not set\n"); - ok(!defaulted, "DACL defaulted\n"); - - ok(acl->AceCount, "Expected at least one ACE\n"); - for (i = 0; i < acl->AceCount; i++) - { - ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); - ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), - "ACE inherited from the parent\n"); - } + ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); + ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), + "ACE inherited from the parent\n"); } LocalFree(psid); @@ -6987,21 +6982,16 @@ static void test_child_token_sd(void) defaulted = TRUE; ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); - todo_wine ok(present, "SACL not present\n"); - - if (present && acl) - { - ok(acl != (void *)0xdeadbeef, "Got invalid SACL\n"); - ok(!defaulted, "SACL defaulted\n"); - - ok(acl->AceCount == 1, "Expected exactly one ACE\n"); - ret = pGetAce(acl, 0, (void **)&ace_label); - ok(ret, "GetAce failed with error %u\n", GetLastError()); - ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, - "Unexpected ACE type %#x\n", ace_label->Header.AceType); - ok(!EqualSid(&ace_label->SidStart, &low_level), - "Low integrity level should not have been inherited\n"); - } + ok(present, "SACL not present\n"); + ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n"); + ok(!defaulted, "SACL defaulted\n"); + ok(acl->AceCount == 1, "Expected exactly one ACE\n"); + ret = pGetAce(acl, 0, (void **)&ace_label); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace_label->Header.AceType); + ok(!EqualSid(&ace_label->SidStart, &low_level), + "Low integrity level should not have been inherited\n"); HeapFree(GetProcessHeap(), 0, sd); } diff --git a/server/process.c b/server/process.c index 3e962ca..2327a26 100644 --- a/server/process.c +++ b/server/process.c @@ -570,6 +570,12 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit } if (!process->handles || !process->token) goto error; + /* Assign a high security label to the token. The default would be medium + * but Wine provides admin access to all applications right now so high + * makes more sense for the time being. */ + if (!token_assign_label( process->token, security_high_label_sid )) + goto error; + /* create the main thread */ if (pipe( request_pipe ) == -1) { diff --git a/server/security.h b/server/security.h index 3cbfcb9..873bbc6 100644 --- a/server/security.h +++ b/server/security.h @@ -47,11 +47,13 @@ extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; +extern const PSID security_high_label_sid; /* token functions */ extern struct token *token_create_admin(void); +extern int token_assign_label( struct token *token, PSID label ); extern struct token *token_duplicate( struct token *src_token, unsigned primary, int impersonation_level, const struct security_descriptor *sd ); extern int token_check_privileges( struct token *token, int all_required, diff --git a/server/token.c b/server/token.c index f518544..532d7b7 100644 --- a/server/token.c +++ b/server/token.c @@ -70,6 +70,7 @@ static const SID interactive_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_ANONYMOUS_LOGON_RID } }; static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; +static const SID high_label_sid = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY }, { SECURITY_MANDATORY_HIGH_RID } }; static const struct /* same fields as struct SID */ { BYTE Revision; @@ -100,6 +101,7 @@ const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; +const PSID security_high_label_sid = (PSID)&high_label_sid; static luid_t prev_luid_value = { 1000, 0 }; @@ -726,6 +728,56 @@ struct sid_data unsigned int subauth[MAX_SUBAUTH_COUNT]; }; +static struct security_descriptor *create_security_label_sd( struct token *token, PSID label_sid ) +{ + size_t sid_len = security_sid_len( label_sid ), sacl_size, sd_size; + SYSTEM_MANDATORY_LABEL_ACE *smla; + struct security_descriptor *sd; + ACL *sacl; + + sacl_size = sizeof(ACL) + FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart) + sid_len; + sd_size = sizeof(struct security_descriptor) + sacl_size; + if (!(sd = mem_alloc( sd_size ))) + return NULL; + + sd->control = SE_SACL_PRESENT; + sd->owner_len = 0; + sd->group_len = 0; + sd->sacl_len = sacl_size; + sd->dacl_len = 0; + + sacl = (ACL *)(sd + 1); + sacl->AclRevision = ACL_REVISION; + sacl->Sbz1 = 0; + sacl->AclSize = sacl_size; + sacl->AceCount = 1; + sacl->Sbz2 = 0; + + smla = (SYSTEM_MANDATORY_LABEL_ACE *)(sacl + 1); + smla->Header.AceType = SYSTEM_MANDATORY_LABEL_ACE_TYPE; + smla->Header.AceFlags = 0; + smla->Header.AceSize = FIELD_OFFSET(SYSTEM_MANDATORY_LABEL_ACE, SidStart) + sid_len; + smla->Mask = SYSTEM_MANDATORY_LABEL_NO_WRITE_UP; + memcpy( &smla->SidStart, label_sid, sid_len ); + + assert( sd_is_valid( sd, sd_size ) ); + return sd; +} + +int token_assign_label( struct token *token, PSID label ) +{ + struct security_descriptor *sd; + int ret = 0; + + if ((sd = create_security_label_sd( token, label ))) + { + ret = set_sd_defaults_from_token( &token->obj, sd, LABEL_SECURITY_INFORMATION, token ); + free( sd ); + } + + return ret; +} + struct token *token_create_admin( void ) { struct token *token = NULL;

1 0

Michael Müller : advapi32/tests: Show that child processes do not inherit mandatory labels.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 08f3fef34caa324dac999bd716c006cb96de8439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f3fef34caa324dac999bd71… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:35 2017 +0200 advapi32/tests: Show that child processes do not inherit mandatory labels. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a25a601..3a8e7e9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6718,6 +6718,8 @@ static void test_maximum_allowed(void) static void test_token_security_descriptor(void) { + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; char buffer_acl[256], buffer[MAX_PATH]; @@ -6872,6 +6874,28 @@ static void test_token_security_descriptor(void) ret = SetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd); ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + /* The security label is also not inherited */ + if (pAddMandatoryAce) + { + ret = InitializeAcl(acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with error %u\n", GetLastError()); + + ret = pAddMandatoryAce(acl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, &low_level); + ok(ret, "AddMandatoryAce failed with error %u\n", GetLastError()); + + memset(sd, 0, sizeof(buffer_sd)); + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorSacl(sd, TRUE, acl, FALSE); + ok(ret, "SetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd); + ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + } + else + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + /* Start child process with our modified token */ memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -6895,6 +6919,9 @@ static void test_token_security_descriptor(void) static void test_child_token_sd(void) { + static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; + SYSTEM_MANDATORY_LABEL_ACE *ace_label; BOOL ret, present, defaulted; ACCESS_ALLOWED_ACE *acc_ace; SECURITY_DESCRIPTOR *sd; @@ -6940,6 +6967,43 @@ static void test_child_token_sd(void) LocalFree(psid); HeapFree(GetProcessHeap(), 0, sd); + + if (!pAddMandatoryAce) + { + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + return; + } + + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl = NULL; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "SACL not present\n"); + + if (present && acl) + { + ok(acl != (void *)0xdeadbeef, "Got invalid SACL\n"); + ok(!defaulted, "SACL defaulted\n"); + + ok(acl->AceCount == 1, "Expected exactly one ACE\n"); + ret = pGetAce(acl, 0, (void **)&ace_label); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace_label->Header.AceType); + ok(!EqualSid(&ace_label->SidStart, &low_level), + "Low integrity level should not have been inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd); } START_TEST(security)

1 0

Michael Müller : advapi32/tests: Show that tokens do not inherit the DACL while creating child processes.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 7e68ccff8787206f54e403b19a51a32ddf328806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e68ccff8787206f54e403b19… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:34 2017 +0200 advapi32/tests: Show that tokens do not inherit the DACL while creating child processes. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 121 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 65e9758..a25a601 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6720,13 +6720,16 @@ static void test_token_security_descriptor(void) { char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; - char buffer_acl[256]; - ACL *acl = (ACL *)&buffer_acl, *acl2; + char buffer_acl[256], buffer[MAX_PATH]; + ACL *acl = (ACL *)&buffer_acl, *acl2, *acl_child; BOOL defaulted, present, ret, found; HANDLE token, token2, token3; + EXPLICIT_ACCESSW exp_access; + PROCESS_INFORMATION info; + DWORD size, index, retd; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; - DWORD size, index; + STARTUPINFOA startup; PSID psid; if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce @@ -6827,6 +6830,62 @@ static void test_token_security_descriptor(void) HeapFree(GetProcessHeap(), 0, sd2); + /* When creating a child process, the process does inherit the token of + * the parent but not the DACL of the token */ + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd2, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl2 = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine + ok(present, "DACL not present\n"); + ok(acl2 != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + exp_access.grfAccessPermissions = GENERIC_ALL; + exp_access.grfAccessMode = GRANT_ACCESS; + exp_access.grfInheritance = NO_PROPAGATE_INHERIT_ACE; + exp_access.Trustee.pMultipleTrustee = NULL; + exp_access.Trustee.TrusteeForm = TRUSTEE_IS_SID; + exp_access.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + exp_access.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; + exp_access.Trustee.ptstrName = (void*)psid; + + retd = pSetEntriesInAclW(1, &exp_access, acl2, &acl_child); + ok(retd == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", retd); + + memset(sd, 0, sizeof(buffer_sd)); + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + ret = SetSecurityDescriptorDacl(sd, TRUE, acl_child, FALSE); + ok(ret, "SetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + + ret = SetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd); + ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + + /* Start child process with our modified token */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + sprintf(buffer, "%s tests/security.c test_token_sd", myARGV[0]); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); + ok(ret, "CreateProcess failed with error %u\n", GetLastError()); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + LocalFree(acl_child); LocalFree(psid); CloseHandle(token3); @@ -6834,6 +6893,55 @@ static void test_token_security_descriptor(void) CloseHandle(token); } +static void test_child_token_sd(void) +{ + BOOL ret, present, defaulted; + ACCESS_ALLOWED_ACE *acc_ace; + SECURITY_DESCRIPTOR *sd; + DWORD size, i; + HANDLE token; + PSID psid; + ACL *acl; + + ret = pConvertStringSidToSidA("S-1-5-6", &psid); + ok(ret, "ConvertStringSidToSidA failed with error %u\n", GetLastError()); + + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, DACL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl = NULL; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "DACL not present\n"); + + if (present && acl) + { + ok(acl != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + ok(acl->AceCount, "Expected at least one ACE\n"); + for (i = 0; i < acl->AceCount; i++) + { + ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); + ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), + "ACE inherited from the parent\n"); + } + } + + LocalFree(psid); + HeapFree(GetProcessHeap(), 0, sd); +} + START_TEST(security) { init(); @@ -6841,7 +6949,10 @@ START_TEST(security) if (myARGC >= 3) { - test_process_security_child(); + if (!strcmp(myARGV[2], "test_token_sd")) + test_child_token_sd(); + else + test_process_security_child(); return; } test_kernel_objects_security(); @@ -6883,5 +6994,7 @@ START_TEST(security) test_GetSidIdentifierAuthority(); test_pseudo_tokens(); test_maximum_allowed(); + + /* Must be the last test, modifies process token */ test_token_security_descriptor(); }

1 0

Michael Müller : advapi32/tests: Show that tokens do not inherit security descriptors during duplication.
by Alexandre Julliard 19 Jun '17

19 Jun '17

Module: wine Branch: master Commit: 4bd10fbd1a77c065f94956d1aab64eab47aa1801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd10fbd1a77c065f94956d1a… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Jun 16 20:41:33 2017 +0200 advapi32/tests: Show that tokens do not inherit security descriptors during duplication. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 45 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 09c6a72..65e9758 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6722,11 +6722,11 @@ static void test_token_security_descriptor(void) SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; char buffer_acl[256]; ACL *acl = (ACL *)&buffer_acl, *acl2; - BOOL defaulted, present, ret; + BOOL defaulted, present, ret, found; + HANDLE token, token2, token3; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; - HANDLE token, token2; - DWORD size; + DWORD size, index; PSID psid; if (!pDuplicateTokenEx || !pConvertStringSidToSidA || !pAddAccessAllowedAceEx || !pGetAce @@ -6789,8 +6789,47 @@ static void test_token_security_descriptor(void) HeapFree(GetProcessHeap(), 0, sd2); + /* Duplicate token without security attributes. + * Tokens do not inherit the security descriptor in DuplicateToken. */ + ret = pDuplicateTokenEx(token2, MAXIMUM_ALLOWED, NULL, SecurityImpersonation, TokenImpersonation, &token3); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token3, DACL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token3, DACL_SECURITY_INFORMATION, sd2, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl2 = (void *)0xdeadbeef; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorDacl(sd2, &present, &acl2, &defaulted); + ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError()); + todo_wine + ok(present, "DACL not present\n"); + + if (present) + { + ok(acl2 != (void *)0xdeadbeef, "DACL not set\n"); + ok(!defaulted, "DACL defaulted\n"); + + index = 0; + found = FALSE; + while (pGetAce(acl2, index++, (void **)&ace)) + { + if (ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE && EqualSid(&ace->SidStart, psid)) + found = TRUE; + } + ok(!found, "Access allowed ACE was inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd2); + LocalFree(psid); + CloseHandle(token3); CloseHandle(token2); CloseHandle(token); }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017