Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [ADVAPI32] Implement SystemFunction028 to always return the default session key.
by Eric Kohl 18 Sep '18

18 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4114dcad46efcf12ee4d0… commit 4114dcad46efcf12ee4d09f06b715bbc57e80b14 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 18 23:57:54 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Sep 19 00:20:11 2018 +0200 [ADVAPI32] Implement SystemFunction028 to always return the default session key. --- dll/win32/advapi32/misc/sysfunc.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dll/win32/advapi32/misc/sysfunc.c b/dll/win32/advapi32/misc/sysfunc.c index b6bee62248..bbb8a69db4 100644 --- a/dll/win32/advapi32/misc/sysfunc.c +++ b/dll/win32/advapi32/misc/sysfunc.c @@ -19,6 +19,8 @@ static const unsigned char CRYPT_LMhash_Magic[8] = { 'K', 'G', 'S', '!', '@', '#', '$', '%' }; +static const unsigned char DefaultSessionKey[16] = + {'D', 'e', 'f', 'S', 'e', 's', 's', 'i', 'o', 'n', 'K', 'e', 'y', '!', '@', '#'}; /****************************************************************************** * SystemFunction001 [ADVAPI32.@] @@ -446,17 +448,35 @@ WINAPI SystemFunction025(const BYTE *in, const BYTE *key, LPBYTE out) } /********************************************************************** + * SystemFunction028 [ADVAPI32.@] + * + * Retrieves an encryption session key... + * + * PARAMS + * ContextHandle [I] RPC context handle + * SessionKey [O] buffer to receive the session key (16 bytes) + * + * RETURNS + * Success: STATUS_LOCAL_USER_SESSION_KEY * * @unimplemented */ -INT +NTSTATUS WINAPI -SystemFunction028(INT a, INT b) +SystemFunction028( + _In_ PVOID ContextHandle, + _Out_ LPBYTE SessionKey) { - //NDRCContextBinding() + /* HACK: Always return the default key */ + memcpy(SessionKey, DefaultSessionKey, sizeof(DefaultSessionKey)); + return STATUS_LOCAL_USER_SESSION_KEY; + +#if 0 + //NDRCContextBinding(); //SystemFunction034() SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 28; +#endif }

1 0

01/01: [DWNL] Localize the File Download utility (#853)
by Lee Schroeder 18 Sep '18

18 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08be1648f95464d41b8f8… commit 08be1648f95464d41b8f86d42c476db04c3a0f0c Author: Lee Schroeder <spaceseel(a)gmail.com> AuthorDate: Tue Sep 18 15:55:44 2018 -0600 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Sep 18 23:55:44 2018 +0200 [DWNL] Localize the File Download utility (#853) Also, changed header string to include a start time stamp similar to the one in wget. CORE-14498 --- base/applications/network/dwnl/CMakeLists.txt | 7 +- base/applications/network/dwnl/dwnl.c | 121 +++++++++++++++----------- base/applications/network/dwnl/dwnl.rc | 16 ++++ base/applications/network/dwnl/lang/en-US.rc | 25 ++++++ base/applications/network/dwnl/resource.h | 22 +++++ 5 files changed, 138 insertions(+), 53 deletions(-) diff --git a/base/applications/network/dwnl/CMakeLists.txt b/base/applications/network/dwnl/CMakeLists.txt index ac0517d478..1bd84579ae 100644 --- a/base/applications/network/dwnl/CMakeLists.txt +++ b/base/applications/network/dwnl/CMakeLists.txt @@ -1,8 +1,11 @@ -add_executable(dwnl dwnl.c) +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +add_executable(dwnl dwnl.c dwnl.rc) set_module_type(dwnl win32cui UNICODE) +target_link_libraries(dwnl conutils ${PSEH_LIB}) target_link_libraries(dwnl uuid) -add_importlibs(dwnl urlmon wininet msvcrt kernel32) +add_importlibs(dwnl urlmon wininet msvcrt user32 kernel32) if(MSVC) add_importlibs(dwnl ntdll) diff --git a/base/applications/network/dwnl/dwnl.c b/base/applications/network/dwnl/dwnl.c index 827565367e..4de7eda54e 100644 --- a/base/applications/network/dwnl/dwnl.c +++ b/base/applications/network/dwnl/dwnl.c @@ -1,8 +1,11 @@ #define COBJMACROS #include <urlmon.h> #include <wininet.h> -#include <tchar.h> +#include <wchar.h> #include <strsafe.h> +#include <conutils.h> + +#include "resource.h" /* FIXME: add correct definitions to urlmon.idl */ #ifdef UNICODE @@ -19,8 +22,8 @@ typedef struct { const IBindStatusCallbackVtbl* lpIBindStatusCallbackVtbl; LONG ref; - TCHAR szHostName[INTERNET_MAX_HOST_NAME_LENGTH + 1]; - TCHAR szMimeType[128]; + WCHAR szHostName[INTERNET_MAX_HOST_NAME_LENGTH + 1]; + WCHAR szMimeType[128]; UINT64 Size; UINT64 Progress; UINT bResolving : 1; @@ -39,10 +42,10 @@ CBindStatusCallback_Destroy(CBindStatusCallback *This) } static void -write_status(LPCTSTR lpFmt, ...) +write_status(LPCWSTR lpFmt, ...) { va_list args; - TCHAR szTxt[128]; + WCHAR szTxt[128]; CONSOLE_SCREEN_BUFFER_INFO csbi; va_start(args, lpFmt); @@ -51,17 +54,19 @@ write_status(LPCTSTR lpFmt, ...) if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) { - _tprintf(_T("\r%*.*s"), -(csbi.dwSize.X - 1), csbi.dwSize.X - 1, szTxt); + ConPrintf(StdOut, L"\r%*.*s", -(csbi.dwSize.X - 1), csbi.dwSize.X - 1, szTxt); } else { - _putts(szTxt); + ConPuts(StdOut, szTxt); } } static void CBindStatusCallback_UpdateProgress(CBindStatusCallback *This) { + WCHAR szMessage[MAX_PATH]; + /* FIXME: better output */ if (This->Size != 0) { @@ -71,12 +76,16 @@ CBindStatusCallback_UpdateProgress(CBindStatusCallback *This) if (Percentage > 99) Percentage = 99; - write_status(_T("%2d%% (%I64u bytes downloaded)"), Percentage, This->Progress); + LoadStringW(NULL, IDS_BYTES_DOWNLOADED_FULL, szMessage, ARRAYSIZE(szMessage)); + + write_status(szMessage, Percentage, This->Progress); } else { + LoadStringW(NULL, IDS_BYTES_DOWNLOADED, szMessage, ARRAYSIZE(szMessage)); + /* Unknown size */ - write_status(_T("%I64u bytes downloaded"), This->Progress); + write_status(szMessage, This->Progress); } } @@ -168,10 +177,10 @@ CBindStatusCallback_OnProgress(IBindStatusCallback *iface, case BINDSTATUS_FINDINGRESOURCE: if (!This->bResolving) { - _tcscpy(This->szHostName, szStatusText); + wcscpy(This->szHostName, szStatusText); This->bResolving = TRUE; - _tprintf(_T("Resolving %s... "), This->szHostName); + ConResPrintf(StdOut, IDS_RESOLVING, This->szHostName); } break; @@ -179,14 +188,16 @@ CBindStatusCallback_OnProgress(IBindStatusCallback *iface, This->bConnecting = TRUE; This->bSendingReq = FALSE; This->bBeginTransfer = FALSE; - This->szMimeType[0] = _T('\0'); + This->szMimeType[0] = L'\0'; if (This->bResolving) { - _tprintf(_T("done.\n")); - _tprintf(_T("Connecting to %s[%s]... "), This->szHostName, szStatusText); + ConResPrintf(StdOut, IDS_DONE); + ConResPrintf(StdOut, IDS_CONNECTING_TO_FULL, This->szHostName, szStatusText); } else - _tprintf(_T("Connecting to %s... "), szStatusText); + { + ConResPrintf(StdOut, IDS_CONNECTING_TO, szStatusText); + } break; case BINDSTATUS_REDIRECTING: @@ -194,24 +205,24 @@ CBindStatusCallback_OnProgress(IBindStatusCallback *iface, This->bConnecting = FALSE; This->bSendingReq = FALSE; This->bBeginTransfer = FALSE; - This->szMimeType[0] = _T('\0'); - _tprintf(_T("Redirecting to %s... "), szStatusText); + This->szMimeType[0] = L'\0'; + ConResPrintf(StdOut, IDS_REDIRECTING_TO, szStatusText); break; case BINDSTATUS_SENDINGREQUEST: This->bBeginTransfer = FALSE; - This->szMimeType[0] = _T('\0'); + This->szMimeType[0] = L'\0'; if (This->bResolving || This->bConnecting) - _tprintf(_T("done.\n")); + ConResPrintf(StdOut, IDS_DONE); if (!This->bSendingReq) - _tprintf(_T("Sending request... ")); + ConResPrintf(StdOut, IDS_SEND_REQUEST); This->bSendingReq = TRUE; break; case BINDSTATUS_MIMETYPEAVAILABLE: - _tcscpy(This->szMimeType, szStatusText); + wcscpy(This->szMimeType, szStatusText); break; case BINDSTATUS_BEGINDOWNLOADDATA: @@ -219,24 +230,23 @@ CBindStatusCallback_OnProgress(IBindStatusCallback *iface, This->Size = (UINT64)ulProgressMax; if (This->bSendingReq) - _tprintf(_T("done.\n")); + ConResPrintf(StdOut, IDS_DONE); if (!This->bBeginTransfer && This->Size != 0) { - if (This->szMimeType[0] != _T('\0')) - _tprintf(_T("Length: %I64u [%s]\n"), This->Size, This->szMimeType); + if (This->szMimeType[0] != L'\0') + ConResPrintf(StdOut, IDS_LENGTH_FULL, This->Size, This->szMimeType); else - _tprintf(_T("Length: %I64u\n"), This->Size); + ConResPrintf(StdOut, IDS_LENGTH, This->Size); } - _tprintf(_T("\n")); + ConPuts(StdOut, L"\n"); This->bBeginTransfer = TRUE; break; case BINDSTATUS_ENDDOWNLOADDATA: - write_status(_T("File saved.")); - _tprintf(_T("\n")); + ConResPrintf(StdOut, IDS_FILE_SAVED); break; case BINDSTATUS_DOWNLOADINGDATA: @@ -319,7 +329,7 @@ CreateBindStatusCallback(void) static int get_display_url(IN LPURL_COMPONENTS purl, - OUT TCHAR *szBuffer, + OUT LPWSTR szBuffer, IN PDWORD pdwBufferSize) { URL_COMPONENTS urlc; @@ -336,23 +346,24 @@ get_display_url(IN LPURL_COMPONENTS purl, } static int -download_file(IN LPCTSTR pszUrl, - IN LPCTSTR pszFile OPTIONAL) +download_file(IN LPCWSTR pszUrl, + IN LPCWSTR pszFile OPTIONAL) { - TCHAR szScheme[INTERNET_MAX_SCHEME_LENGTH + 1]; - TCHAR szHostName[INTERNET_MAX_HOST_NAME_LENGTH + 1]; - TCHAR szUserName[INTERNET_MAX_USER_NAME_LENGTH + 1]; - TCHAR szPassWord[INTERNET_MAX_PASSWORD_LENGTH + 1]; - TCHAR szUrlPath[INTERNET_MAX_PATH_LENGTH + 1]; - TCHAR szExtraInfo[INTERNET_MAX_PATH_LENGTH + 1]; - TCHAR szUrl[INTERNET_MAX_URL_LENGTH + 1]; + WCHAR szScheme[INTERNET_MAX_SCHEME_LENGTH + 1]; + WCHAR szHostName[INTERNET_MAX_HOST_NAME_LENGTH + 1]; + WCHAR szUserName[INTERNET_MAX_USER_NAME_LENGTH + 1]; + WCHAR szPassWord[INTERNET_MAX_PASSWORD_LENGTH + 1]; + WCHAR szUrlPath[INTERNET_MAX_PATH_LENGTH + 1]; + WCHAR szExtraInfo[INTERNET_MAX_PATH_LENGTH + 1]; + WCHAR szUrl[INTERNET_MAX_URL_LENGTH + 1]; DWORD dwUrlLen; LPTSTR pszFilePart; URL_COMPONENTS urlc; IBindStatusCallback *pbsc; int iRet; + SYSTEMTIME sysTime; - if (pszFile != NULL && pszFile[0] == _T('\0')) + if (pszFile != NULL && pszFile[0] == L'\0') pszFile = NULL; urlc.dwStructSize = sizeof(urlc); @@ -368,7 +379,7 @@ download_file(IN LPCTSTR pszUrl, urlc.dwUrlPathLength = sizeof(szUrlPath) / sizeof(szUrlPath[0]); urlc.lpszExtraInfo = szExtraInfo; urlc.dwExtraInfoLength = sizeof(szExtraInfo) / sizeof(szExtraInfo[0]); - if (!InternetCrackUrl(pszUrl, _tcslen(pszUrl), ICU_ESCAPE, &urlc)) + if (!InternetCrackUrl(pszUrl, wcslen(pszUrl), ICU_ESCAPE, &urlc)) return DWNL_E_LASTERROR; if (urlc.nScheme != INTERNET_SCHEME_FTP && @@ -381,15 +392,15 @@ download_file(IN LPCTSTR pszUrl, if (urlc.nScheme == INTERNET_SCHEME_FTP && urlc.dwUserNameLength == 0 && urlc.dwPasswordLength == 0) { - _tcscpy(szUserName, _T("anonymous")); - urlc.dwUserNameLength = _tcslen(szUserName); + wcscpy(szUserName, L"anonymous"); + urlc.dwUserNameLength = wcslen(szUserName); } /* FIXME: Get file name from server */ if (urlc.dwUrlPathLength == 0 && pszFile == NULL) return DWNL_E_NEEDTARGETFILENAME; - pszFilePart = _tcsrchr(szUrlPath, _T('/')); + pszFilePart = wcsrchr(szUrlPath, L'/'); if (pszFilePart != NULL) pszFilePart++; @@ -411,7 +422,12 @@ download_file(IN LPCTSTR pszUrl, if (iRet <= 0) return iRet; - _tprintf(_T("Download `%s\'\n\t=> `%s\'\n"), szUrl, pszFile); + GetLocalTime(&sysTime); + + ConPrintf(StdOut, L"--%d-%d-%d %d:%d:%d-- %s\n\t=> %s\n", + sysTime.wYear, sysTime.wMonth, sysTime.wDay, + sysTime.wHour, sysTime.wMinute, sysTime.wSecond, + szUrl, pszFile); /* Generate the URL to download */ dwUrlLen = sizeof(szUrl) / sizeof(szUrl[0]); @@ -435,19 +451,19 @@ download_file(IN LPCTSTR pszUrl, static int print_err(int iErr) { - write_status(_T("")); + write_status(L""); if (iErr == DWNL_E_LASTERROR) { if (GetLastError() == ERROR_SUCCESS) { /* File not found */ - _ftprintf(stderr, _T("\nERROR: Download failed.\n")); + ConResPrintf(StdErr, IDS_ERROR_DOWNLOAD); } else { /* Display last error code */ - _ftprintf(stderr, _T("\nERROR: %u\n"), GetLastError()); + ConResPrintf(StdErr, IDS_ERROR_CODE, GetLastError()); } } else @@ -455,11 +471,11 @@ print_err(int iErr) switch (iErr) { case DWNL_E_NEEDTARGETFILENAME: - _ftprintf(stderr, _T("\nERROR: Cannot determine filename, please specify a destination file name.\n")); + ConResPrintf(StdErr, IDS_ERROR_FILENAME); break; case DWNL_E_UNSUPPORTEDSCHEME: - _ftprintf(stderr, _T("\nERROR: Unsupported protocol.\n")); + ConResPrintf(StdErr, IDS_ERROR_PROTOCOL); break; } } @@ -467,13 +483,16 @@ print_err(int iErr) return 1; } -int _tmain(int argc, TCHAR **argv) +int wmain(int argc, WCHAR **argv) { int iErr, iRet = 0; + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + if(argc != 2 && argc != 3) { - _tprintf(_T("Usage: dwnl URL [DESTINATION]")); + ConResPrintf(StdOut, IDS_USAGE); return 2; } diff --git a/base/applications/network/dwnl/dwnl.rc b/base/applications/network/dwnl/dwnl.rc new file mode 100644 index 0000000000..79739f4f12 --- /dev/null +++ b/base/applications/network/dwnl/dwnl.rc @@ -0,0 +1,16 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS File Download Utility" +#define REACTOS_STR_INTERNAL_NAME "dwnl" +#define REACTOS_STR_ORIGINAL_FILENAME "dwnl.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/base/applications/network/dwnl/lang/en-US.rc b/base/applications/network/dwnl/lang/en-US.rc new file mode 100644 index 0000000000..a62ce99a14 --- /dev/null +++ b/base/applications/network/dwnl/lang/en-US.rc @@ -0,0 +1,25 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "Usage: dwnl URL [DESTINATION]\n" + IDS_RESOLVING "Resolving %s... " + IDS_DONE "done.\n" + IDS_LENGTH_FULL "Length: %I64u [%s]\n" + IDS_LENGTH "Length: %I64u\n" + IDS_FILE_SAVED "\nFile saved.\n" + IDS_CONNECTING_TO_FULL "Connecting to %s [%s]... " + IDS_CONNECTING_TO "Connecting to %s... " + IDS_REDIRECTING_TO "Redirecting to %s... " + IDS_SEND_REQUEST "Sending request... " + IDS_BYTES_DOWNLOADED "%I64u bytes downloaded" + IDS_BYTES_DOWNLOADED_FULL "%2d%% (%I64u byte(s) downloaded)" +END + +STRINGTABLE +BEGIN + IDS_ERROR_DOWNLOAD "\nERROR: Download failed.\n" + IDS_ERROR_CODE "\nERROR: %u\n" + IDS_ERROR_FILENAME "\nERROR: Cannot determine filename, please specify a destination file name.\n" + IDS_ERROR_PROTOCOL "\nERROR: Unsupported protocol.\n" +END diff --git a/base/applications/network/dwnl/resource.h b/base/applications/network/dwnl/resource.h new file mode 100644 index 0000000000..a729bc0cda --- /dev/null +++ b/base/applications/network/dwnl/resource.h @@ -0,0 +1,22 @@ +#ifndef RESOURCE_H +#define RESOURCE_H + +#define IDS_USAGE 0 +#define IDS_RESOLVING 1 +#define IDS_DONE 2 +#define IDS_LENGTH_FULL 3 +#define IDS_LENGTH 4 +#define IDS_FILE_SAVED 5 +#define IDS_CONNECTING_TO_FULL 6 +#define IDS_CONNECTING_TO 7 +#define IDS_REDIRECTING_TO 8 +#define IDS_SEND_REQUEST 9 +#define IDS_BYTES_DOWNLOADED 10 +#define IDS_BYTES_DOWNLOADED_FULL 11 + +#define IDS_ERROR_DOWNLOAD 12 +#define IDS_ERROR_CODE 13 +#define IDS_ERROR_FILENAME 14 +#define IDS_ERROR_PROTOCOL 15 + +#endif /* RESOURCE_H */

1 0

01/01: [NTOSKRNL] Stub IoInitializeCrashDump()
by Pierre Schweitzer 18 Sep '18

18 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=108991a6fbae487218812… commit 108991a6fbae487218812350b1a984887dab084f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Sep 18 21:42:01 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Sep 18 21:59:59 2018 +0200 [NTOSKRNL] Stub IoInitializeCrashDump() Also call it from NtCreatePagingFile() when we have successfully created a paging file on the system boot partition. --- ntoskrnl/include/internal/io.h | 6 ++++++ ntoskrnl/io/iomgr/iomgr.c | 8 ++++++++ ntoskrnl/mm/pagefile.c | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index f47768d4a1..83fe7ce3c7 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -797,6 +797,12 @@ IopVerifyDiskSignature( OUT PULONG Signature ); +BOOLEAN +NTAPI +IoInitializeCrashDump( + IN HANDLE PageFileHandle +); + // // Device/Volume Routines // diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 47defcab70..292c947036 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -651,4 +651,12 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return TRUE; } +BOOLEAN +NTAPI +IoInitializeCrashDump(IN HANDLE PageFileHandle) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 0649f0f2c2..d05580bfbd 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -89,6 +89,8 @@ C_ASSERT(FILE_FROM_ENTRY(0xffffffff) < MAX_PAGING_FILES); static BOOLEAN MmSwapSpaceMessage = FALSE; +static BOOLEAN MmSystemPageFileLocated = FALSE; + /* FUNCTIONS *****************************************************************/ VOID @@ -804,6 +806,11 @@ NtCreatePagingFile(IN PUNICODE_STRING FileName, MmSwapSpaceMessage = FALSE; + if (!MmSystemPageFileLocated && BooleanFlagOn(FileObject->DeviceObject->Flags, DO_SYSTEM_BOOT_PARTITION)) + { + MmSystemPageFileLocated = IoInitializeCrashDump(FileHandle); + } + return STATUS_SUCCESS; }

1 0

01/01: [ADVAPI32][SERVICES] Pass encrypted passwords to the service manager.
by Eric Kohl 18 Sep '18

18 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5fcda922b0ad049f2281… commit e5fcda922b0ad049f22815a6ea1258205fa17927 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 18 21:33:29 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 18 21:33:29 2018 +0200 [ADVAPI32][SERVICES] Pass encrypted passwords to the service manager. - Encrypt passwords before passing them to the service manager. Right now, we are using a fixed encryption key. This will be fixed later. - Replace the calls to ZeroMemory which are used to wipe the password buffers by calls to SecureZeroMemory. --- base/system/services/config.c | 58 +++++++++++++++++++++++++++++++--- dll/win32/advapi32/service/scm.c | 67 +++++++++++++++++++++++++++++++--------- 2 files changed, 106 insertions(+), 19 deletions(-) diff --git a/base/system/services/config.c b/base/system/services/config.c index 14af8e5b0f..4d1f2471c6 100644 --- a/base/system/services/config.c +++ b/base/system/services/config.c @@ -15,6 +15,20 @@ #define NDEBUG #include <debug.h> +struct ustring +{ + DWORD Length; + DWORD MaximumLength; + unsigned char *Buffer; +}; + +NTSTATUS +WINAPI +SystemFunction005( + const struct ustring *in, + const struct ustring *key, + struct ustring *out); + /* FUNCTIONS *****************************************************************/ @@ -684,17 +698,51 @@ ScmDecryptPassword( _In_ DWORD dwPasswordSize, _Out_ PWSTR *pClearTextPassword) { + struct ustring inData, keyData, outData; + PCHAR pszKey = "TestEncryptionKey"; PWSTR pBuffer; + NTSTATUS Status; + + inData.Length = dwPasswordSize; + inData.MaximumLength = inData.Length; + inData.Buffer = pPassword; + + keyData.Length = strlen(pszKey); + keyData.MaximumLength = keyData.Length; + keyData.Buffer = (unsigned char *)pszKey; + + outData.Length = 0; + outData.MaximumLength = 0; + outData.Buffer = NULL; + + /* Get the required buffer size */ + Status = SystemFunction005(&inData, + &keyData, + &outData); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT1("SystemFunction005 failed (Status 0x%08lx)\n", Status); + return RtlNtStatusToDosError(Status); + } - /* Allocate a buffer for the decrypted password */ - pBuffer = HeapAlloc(GetProcessHeap(), 0, dwPasswordSize); + /* Allocate a buffer for the clear text password */ + pBuffer = HeapAlloc(GetProcessHeap(), 0, outData.Length); if (pBuffer == NULL) return ERROR_OUTOFMEMORY; + outData.MaximumLength = outData.Length; + outData.Buffer = (unsigned char *)pBuffer; + /* Decrypt the password */ - CopyMemory(pBuffer, - pPassword, - dwPasswordSize); + Status = SystemFunction005(&inData, + &keyData, + &outData); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SystemFunction005 failed (Status 0x%08lx)\n", Status); + HeapFree(GetProcessHeap(), 0, pBuffer); + return RtlNtStatusToDosError(Status); + } *pClearTextPassword = pBuffer; diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index 022864bba9..efa19f2b35 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -12,6 +12,12 @@ #include <advapi32.h> WINE_DEFAULT_DEBUG_CHANNEL(advapi); +NTSTATUS +WINAPI +SystemFunction004( + const struct ustring *in, + const struct ustring *key, + struct ustring *out); /* FUNCTIONS *****************************************************************/ @@ -162,21 +168,54 @@ ScmEncryptPassword( _Out_ PBYTE *pEncryptedPassword, _Out_ PDWORD pEncryptedPasswordSize) { - DWORD dwSize; + struct ustring inData, keyData, outData; + PCHAR pszKey = "TestEncryptionKey"; PBYTE pBuffer; + NTSTATUS Status; + + inData.Length = (wcslen(pClearTextPassword) + 1) * sizeof(WCHAR); + inData.MaximumLength = inData.Length; + inData.Buffer = (unsigned char *)pClearTextPassword; + + keyData.Length = strlen(pszKey); + keyData.MaximumLength = keyData.Length; + keyData.Buffer = (unsigned char *)pszKey; - dwSize = (wcslen(pClearTextPassword) + 1) * sizeof(WCHAR); + outData.Length = 0; + outData.MaximumLength = 0; + outData.Buffer = NULL; - pBuffer = HeapAlloc(GetProcessHeap(), 0, dwSize); + /* Get the required buffer size */ + Status = SystemFunction004(&inData, + &keyData, + &outData); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + ERR("SystemFunction004 failed (Status 0x%08lx)\n", Status); + return RtlNtStatusToDosError(Status); + } + + /* Allocate a buffer for the encrypted password */ + pBuffer = HeapAlloc(GetProcessHeap(), 0, outData.Length); if (pBuffer == NULL) return ERROR_OUTOFMEMORY; - CopyMemory(pBuffer, - pClearTextPassword, - dwSize); + outData.MaximumLength = outData.Length; + outData.Buffer = pBuffer; + + /* Encrypt the password */ + Status = SystemFunction004(&inData, + &keyData, + &outData); + if (!NT_SUCCESS(Status)) + { + ERR("SystemFunction004 failed (Status 0x%08lx)\n", Status); + HeapFree(GetProcessHeap(), 0, pBuffer); + return RtlNtStatusToDosError(Status); + } - *pEncryptedPassword = pBuffer; - *pEncryptedPasswordSize = dwSize; + *pEncryptedPassword = outData.Buffer; + *pEncryptedPasswordSize = outData.Length; return ERROR_SUCCESS; } @@ -395,12 +434,12 @@ done: if (lpPasswordW != NULL) { /* Wipe and release the password buffers */ - ZeroMemory(lpPasswordW, (wcslen(lpPasswordW) + 1) * sizeof(WCHAR)); + SecureZeroMemory(lpPasswordW, (wcslen(lpPasswordW) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, lpPasswordW); if (lpEncryptedPassword != NULL) { - ZeroMemory(lpEncryptedPassword, dwPasswordSize); + SecureZeroMemory(lpEncryptedPassword, dwPasswordSize); HeapFree(GetProcessHeap(), 0, lpEncryptedPassword); } } @@ -498,7 +537,7 @@ done: if (lpEncryptedPassword != NULL) { /* Wipe and release the password buffer */ - ZeroMemory(lpEncryptedPassword, dwPasswordSize); + SecureZeroMemory(lpEncryptedPassword, dwPasswordSize); HeapFree(GetProcessHeap(), 0, lpEncryptedPassword); } @@ -723,12 +762,12 @@ done: if (lpPasswordW != NULL) { /* Wipe and release the password buffers */ - ZeroMemory(lpPasswordW, (wcslen(lpPasswordW) + 1) * sizeof(WCHAR)); + SecureZeroMemory(lpPasswordW, (wcslen(lpPasswordW) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, lpPasswordW); if (lpEncryptedPassword != NULL) { - ZeroMemory(lpEncryptedPassword, dwPasswordSize); + SecureZeroMemory(lpEncryptedPassword, dwPasswordSize); HeapFree(GetProcessHeap(), 0, lpEncryptedPassword); } } @@ -837,7 +876,7 @@ done: if (lpEncryptedPassword != NULL) { /* Wipe and release the password buffers */ - ZeroMemory(lpEncryptedPassword, dwPasswordSize); + SecureZeroMemory(lpEncryptedPassword, dwPasswordSize); HeapFree(GetProcessHeap(), 0, lpEncryptedPassword); }

1 0

01/01: [IDL][LSASRV] Improve the credentials interface a little and update the lsa server code accordingly.
by Eric Kohl 18 Sep '18

18 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da73c812598b56d137632… commit da73c812598b56d137632f033afa51a68f022ca4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 18 15:55:18 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 18 15:55:18 2018 +0200 [IDL][LSASRV] Improve the credentials interface a little and update the lsa server code accordingly. --- dll/win32/lsasrv/lsarpc.c | 42 +++++++++++++++++++++++-------- sdk/include/reactos/idl/lsa.idl | 56 ++++++++++++++++++++++++++++++++++------- 2 files changed, 79 insertions(+), 19 deletions(-) diff --git a/dll/win32/lsasrv/lsarpc.c b/dll/win32/lsasrv/lsarpc.c index 987d9701c6..517b89a23c 100644 --- a/dll/win32/lsasrv/lsarpc.c +++ b/dll/win32/lsasrv/lsarpc.c @@ -1409,7 +1409,7 @@ LsarpOpenAccount( AccountObject); if (!NT_SUCCESS(Status)) { - ERR("LsapOpenDbObject failed (Status 0x%08lx)\n", Status); + ERR("LsapOpenDbObject(Accounts/%S) failed (Status 0x%08lx)\n", SidString, Status); } if (SidString != NULL) @@ -3918,8 +3918,13 @@ NTSTATUS WINAPI CredrReadDomainCredentials( /* Function 65 */ -NTSTATUS WINAPI CredrDelete( - handle_t hBinding) +NTSTATUS +WINAPI +CredrDelete( + handle_t hBinding, + LPWSTR TargetName, + DWORD Type, + DWORD Flags) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3927,8 +3932,13 @@ NTSTATUS WINAPI CredrDelete( /* Function 66 */ -NTSTATUS WINAPI CredrGetTargetInfo( - handle_t hBinding) +NTSTATUS +WINAPI +CredrGetTargetInfo( + handle_t hBinding, + LPWSTR TargetName, + DWORD Flags, + CREDPR_TARGET_INFORMATION *TargetInformation) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -3936,7 +3946,9 @@ NTSTATUS WINAPI CredrGetTargetInfo( /* Function 67 */ -NTSTATUS WINAPI CredrProfileLoaded( +NTSTATUS +WINAPI +CredrProfileLoaded( handle_t hBinding) { UNIMPLEMENTED; @@ -3983,8 +3995,12 @@ NTSTATUS WINAPI LsarLookupNames3( /* Function 69 */ -NTSTATUS WINAPI CredrGetSessionTypes( - handle_t hBinding) +NTSTATUS +WINAPI +CredrGetSessionTypes( + handle_t hBinding, + DWORD MaximumPersistCount, + DWORD *MaximumPersist) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -4045,8 +4061,14 @@ NTSTATUS WINAPI LsarSetForestTrustInformation( /* Function 75 */ -NTSTATUS WINAPI CredrRename( - handle_t hBinding) +NTSTATUS +WINAPI +CredrRename( + handle_t hBinding, + LPWSTR OldTargetName, + LPWSTR NewTargetName, + DWORD Type, + DWORD Flags) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; diff --git a/sdk/include/reactos/idl/lsa.idl b/sdk/include/reactos/idl/lsa.idl index 93c2bc3d6b..a7be25b1ea 100644 --- a/sdk/include/reactos/idl/lsa.idl +++ b/sdk/include/reactos/idl/lsa.idl @@ -581,6 +581,22 @@ typedef struct _LSA_FOREST_TRUST_COLLISION_INFORMATION { } LSA_FOREST_TRUST_COLLISION_INFORMATION, *PLSA_FOREST_TRUST_COLLISION_INFORMATION; cpp_quote("#endif") + +/* Credentials */ + +typedef struct _CREDPR_TARGET_INFORMATION +{ + LPWSTR TargetName; + LPWSTR NetbiosServerName; + LPWSTR DnsServerName; + LPWSTR NetbiosDomainName; + LPWSTR DnsDomainName; + LPWSTR DnsTreeName; + LPWSTR PackageName; + ULONG Flags; +} CREDPR_TARGET_INFORMATION, *PCREDPR_TARGET_INFORMATION; + + [ uuid(12345778-1234-abcd-ef00-0123456789ab), version(0.0), @@ -1007,15 +1023,27 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [in] handle_t hBinding); /* FIXME */ /* Function 65 */ - NTSTATUS __stdcall CredrDelete( - [in] handle_t hBinding); /* FIXME */ + NTSTATUS + __stdcall + CredrDelete( + [in] handle_t hBinding, + [in, unique, string] LPWSTR TargetName, + [in] DWORD Type, + [in] DWORD Flags); /* FIXME */ /* Function 66 */ - NTSTATUS __stdcall CredrGetTargetInfo( - [in] handle_t hBinding); /* FIXME */ + NTSTATUS + __stdcall + CredrGetTargetInfo( + [in] handle_t hBinding, + [in, unique, string] LPWSTR TargetName, + [in] DWORD Flags, + [out] CREDPR_TARGET_INFORMATION *TargetInformation); /* FIXME */ /* Function 67 */ - NTSTATUS __stdcall CredrProfileLoaded( + NTSTATUS + __stdcall + CredrProfileLoaded( [in] handle_t hBinding); /* FIXME */ /* Function 68 */ @@ -1031,8 +1059,12 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [in] DWORD ClientRevision); /* Function 69 */ - NTSTATUS __stdcall CredrGetSessionTypes( - [in] handle_t hBinding); /* FIXME */ + NTSTATUS + __stdcall + CredrGetSessionTypes( + [in] handle_t hBinding, + [in] DWORD MaximumPersistCount, + [out, size_is(MaximumPersistCount)] DWORD *MaximumPersist); /* FIXME */ /* Function 70 */ NTSTATUS __stdcall LsarRegisterAuditEvent( @@ -1063,8 +1095,14 @@ cpp_quote("#if _WIN32_WINNT >= 0x0501") [out] PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo); /* Function 75 */ - NTSTATUS __stdcall CredrRename( - [in] handle_t hBinding); /* FIXME */ + NTSTATUS + __stdcall + CredrRename( + [in] handle_t hBinding, + [in, unique, string] LPWSTR OldTargetName, + [in, unique, string] LPWSTR NewTargetName, + [in] DWORD Type, + [in] DWORD Flags); /* FIXME */ /* Function 76 */ NTSTATUS __stdcall LsarLookupSids3(

1 0

01/01: [ADVAPI32_WINETEST] Fix the STATUS issues
by Eric Kohl 17 Sep '18

17 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47854962ac4d753f34088… commit 47854962ac4d753f340884c7b56088079cd24e96 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Sep 18 00:24:36 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Sep 18 00:24:36 2018 +0200 [ADVAPI32_WINETEST] Fix the STATUS issues --- modules/rostests/winetests/advapi32/crypt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rostests/winetests/advapi32/crypt.c b/modules/rostests/winetests/advapi32/crypt.c index a09e8db57d..48d08643a1 100644 --- a/modules/rostests/winetests/advapi32/crypt.c +++ b/modules/rostests/winetests/advapi32/crypt.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wincrypt.h"

1 0

01/01: [ADVAPI32] SystemFunction004 and SystemFunction005 must return the required output buffer size via out->Length when the buffer is too small.
by Eric Kohl 17 Sep '18

17 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c0d9c01e20574c427a23… commit 6c0d9c01e20574c427a23f005a8b878fc5a6c115 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Sep 17 23:19:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Sep 17 23:19:02 2018 +0200 [ADVAPI32] SystemFunction004 and SystemFunction005 must return the required output buffer size via out->Length when the buffer is too small. --- dll/win32/advapi32/misc/sysfunc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/win32/advapi32/misc/sysfunc.c b/dll/win32/advapi32/misc/sysfunc.c index b0ed231faf..b6bee62248 100644 --- a/dll/win32/advapi32/misc/sysfunc.c +++ b/dll/win32/advapi32/misc/sysfunc.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: dll/win32/advapi32/misc/sysfun.c + * FILE: dll/win32/advapi32/misc/sysfunc.c * PURPOSE: advapi32.dll system functions (undocumented) * PROGRAMMER: Emanuele Aliberti * UPDATE HISTORY: @@ -130,7 +130,10 @@ WINAPI SystemFunction004(const struct ustring *in, crypt_len = ((in->Length+7)&~7); if (out->MaximumLength < (crypt_len+8)) + { + out->Length = crypt_len + 8; return STATUS_BUFFER_TOO_SMALL; + } data.ui[0] = in->Length; data.ui[1] = 1; @@ -203,7 +206,10 @@ WINAPI SystemFunction005(const struct ustring *in, crypt_len = data.ui[0]; if (crypt_len > out->MaximumLength) + { + out->Length = crypt_len; return STATUS_BUFFER_TOO_SMALL; + } for (ofs=0; (ofs+8)<crypt_len; ofs+=8) CRYPT_DESunhash(out->Buffer+ofs, deskey, in->Buffer+ofs+8);

1 0

01/01: [ADVAPI32_WINETEST] Add tests for SystemFunction004 and SystemFunction005.
by Eric Kohl 17 Sep '18

17 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffd1293f99a8796629f28… commit ffd1293f99a8796629f283673edd16c81bf6a104 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Sep 17 23:12:16 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Sep 17 23:12:16 2018 +0200 [ADVAPI32_WINETEST] Add tests for SystemFunction004 and SystemFunction005. These tests show that the required output buffer size it returned in out.Length field when STATUS_BUFFER_TOO_SMALL is returned. This patch will be sent upstream. --- modules/rostests/winetests/advapi32/crypt.c | 120 ++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/modules/rostests/winetests/advapi32/crypt.c b/modules/rostests/winetests/advapi32/crypt.c index 13671eb0c2..a09e8db57d 100644 --- a/modules/rostests/winetests/advapi32/crypt.c +++ b/modules/rostests/winetests/advapi32/crypt.c @@ -28,6 +28,12 @@ #include "wine/test.h" +struct ustring { + DWORD Length; + DWORD MaximumLength; + unsigned char *Buffer; +}; + static const char szRsaBaseProv[] = MS_DEF_PROV_A; static const char szNonExistentProv[] = "Wine Nonexistent Cryptographic Provider v11.2"; static const char szKeySet[] = "wine_test_keyset"; @@ -64,6 +70,8 @@ static BOOL (WINAPI *pCryptSetHashParam)(HCRYPTKEY, DWORD, BYTE*, DWORD); static BOOL (WINAPI *pCryptSetKeyParam)(HCRYPTKEY, DWORD, BYTE*, DWORD); static BOOL (WINAPI *pCryptSetProvParam)(HCRYPTPROV, DWORD, BYTE*, DWORD); static BOOL (WINAPI *pCryptVerifySignatureW)(HCRYPTHASH, BYTE*, DWORD, HCRYPTKEY, LPCWSTR, DWORD); +static NTSTATUS (WINAPI *pSystemFunction004)(struct ustring*,struct ustring*, struct ustring*); +static NTSTATUS (WINAPI *pSystemFunction005)(struct ustring*,struct ustring*, struct ustring*); static BOOLEAN (WINAPI *pSystemFunction036)(PVOID, ULONG); static void init_function_pointers(void) @@ -100,6 +108,8 @@ static void init_function_pointers(void) pCryptSetKeyParam = (void*)GetProcAddress(hadvapi32, "CryptSetKeyParam"); pCryptSetProvParam = (void*)GetProcAddress(hadvapi32, "CryptSetProvParam"); pCryptVerifySignatureW = (void*)GetProcAddress(hadvapi32, "CryptVerifySignatureW"); + pSystemFunction004 = (void*)GetProcAddress(hadvapi32, "SystemFunction004"); + pSystemFunction005 = (void*)GetProcAddress(hadvapi32, "SystemFunction005"); pSystemFunction036 = (void*)GetProcAddress(hadvapi32, "SystemFunction036"); } @@ -1120,6 +1130,114 @@ static void test_rc2_keylen(void) } } +static void test_SystemFunction004(void) +{ + struct ustring inData; + struct ustring keyData; + struct ustring outData; + char inString[] = "Testdata for encryption"; + char keyString[] = "EncryptionKey"; + unsigned char outBuffer[32]; + NTSTATUS Status; +#if 0 + int i; +#endif + + if (!pSystemFunction004) + { + win_skip("SystemFunction004 is not available\n"); + return; + } + + inData.Length = strlen(inString) + 1; + inData.MaximumLength = inData.Length; + inData.Buffer = (unsigned char *)inString; + + keyData.Length = strlen(keyString) + 1; + keyData.MaximumLength = keyData.Length; + keyData.Buffer = (unsigned char *)keyString; + + outData.Length = 0; + outData.MaximumLength = 0; + outData.Buffer = NULL; + + Status = pSystemFunction004(&inData, &keyData, &outData); + ok(Status == STATUS_BUFFER_TOO_SMALL, "Expected SystemFunction004 to return STATUS_BUFFER_TOO_SMALL, got 0x%08lx\n", Status); + ok(outData.Length == 32, "Expected outData.Length to be 32, got %lu\n", outData.Length); + ok(outData.MaximumLength == 0, "Expected outData.MaximumLength to be 0, got %lu\n", outData.MaximumLength); + ok(outData.Buffer == NULL, "Expected outData.Length to be NULL, got %p\n", outData.Buffer); + + outData.Length = sizeof(outBuffer); + outData.MaximumLength = outData.Length; + outData.Buffer = outBuffer; + + Status = pSystemFunction004(&inData, &keyData, &outData); + ok(Status == STATUS_SUCCESS, "Expected SystemFunction004 to return STATUS_SUCCESS, got 0x%08lx\n", Status); + ok(outData.Length == 32, "Expected outData.Length to be 32, got %lu\n", outData.Length); + ok(outData.MaximumLength == 32, "Expected outData.MaximumLength to be 32, got %lu\n", outData.MaximumLength); + ok(outData.Buffer != NULL, "Expected outData.Buffer not to be NULL, got %p\n", outData.Buffer); +#if 0 + if (Status == STATUS_SUCCESS) + { + printf("outData.Buffer:\n"); + for (i = 0; i < sizeof(outBuffer); i++) + printf("0x%02x ", outBuffer[i]); + printf("\n"); + } +#endif +} + +static void test_SystemFunction005(void) +{ + struct ustring inData; + struct ustring keyData; + struct ustring outData; + unsigned char inBuffer[32] = {0xdc, 0xff, 0x05, 0x8d, 0xaf, 0xb6, 0xe2, 0x8c, 0x4f, 0xee, 0x00, 0x06, 0xac, 0x1d, 0x56, 0xf1, + 0x24, 0xbd, 0x17, 0xe0, 0xf6, 0xb8, 0x6d, 0x3a, 0x69, 0x5d, 0x14, 0xf9, 0x5a, 0x54, 0x93, 0xd1}; + char keyString[] = "EncryptionKey"; + char outBuffer[24]; + NTSTATUS Status; + + if (!pSystemFunction005) + { + win_skip("SystemFunction005 is not available\n"); + return; + } + + inData.Length = sizeof(inBuffer); + inData.MaximumLength = inData.Length; + inData.Buffer = inBuffer; + + keyData.Length = strlen(keyString) + 1; + keyData.MaximumLength = keyData.Length; + keyData.Buffer = (unsigned char *)keyString; + + outData.Length = 0; + outData.MaximumLength = 0; + outData.Buffer = NULL; + + Status = pSystemFunction005(&inData, &keyData, &outData); + ok(Status == STATUS_BUFFER_TOO_SMALL, "Expected SystemFunction005 to return STATUS_BUFFER_TOO_SMALL, got 0x%08lx\n", Status); + ok(outData.Length == 24, "Expected outData.Length to be 24, got %lu\n", outData.Length); + ok(outData.MaximumLength == 0, "Expected outData.MaximumLength to be 0, got %lu\n", outData.MaximumLength); + ok(outData.Buffer == NULL, "Expected outData.Buffer to be NULL, got %p\n", outData.Buffer); + + outData.Length = sizeof(outBuffer); + outData.MaximumLength = outData.Length; + outData.Buffer = (unsigned char *)outBuffer; + + Status = pSystemFunction005(&inData, &keyData, &outData); + ok(Status == STATUS_SUCCESS, "Expected SystemFunction005 to return STATUS_SUCCESS, got 0x%08lx\n", Status); + ok(outData.Length == 24, "Expected outData.Length to be 24, got %lu\n", outData.Length); + ok(outData.MaximumLength == 24, "Expected outData.MaximumLength to be 24, got %lu\n", outData.MaximumLength); + ok(outData.Buffer != NULL, "Expected outData.Buffer not to be NULL, got %p\n", outData.Buffer); +#if 0 + if (Status == STATUS_SUCCESS) + printf("outData.Buffer: '%s'\n", outData.Buffer); +#endif +} + + static void test_SystemFunction036(void) { BOOL ret; @@ -1200,5 +1318,7 @@ START_TEST(crypt) test_enum_provider_types(); test_get_default_provider(); test_set_provider_ex(); + test_SystemFunction004(); + test_SystemFunction005(); test_SystemFunction036(); }

1 0

01/01: [ADVAPI32][SERVICES] Add (dummy) password encryption/decryption functions to CreateServiceA/W and ChangeServiceConfigA/W in order to prepare to pass encrypted passwords to the service manager
by Eric Kohl 17 Sep '18

17 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e2c4657ca10dea1154cb… commit 5e2c4657ca10dea1154cb43f16ee6962999ac7a4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Sep 17 16:34:48 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Sep 17 16:34:48 2018 +0200 [ADVAPI32][SERVICES] Add (dummy) password encryption/decryption functions to CreateServiceA/W and ChangeServiceConfigA/W in order to prepare to pass encrypted passwords to the service manager --- base/system/services/config.c | 24 ++++++++ base/system/services/rpcserver.c | 49 ++++++++++++++-- base/system/services/services.h | 7 +++ dll/win32/advapi32/service/scm.c | 123 ++++++++++++++++++++++++++++++++------- 4 files changed, 177 insertions(+), 26 deletions(-) diff --git a/base/system/services/config.c b/base/system/services/config.c index 2099d64214..14af8e5b0f 100644 --- a/base/system/services/config.c +++ b/base/system/services/config.c @@ -677,4 +677,28 @@ done: return dwError; } + +DWORD +ScmDecryptPassword( + _In_ PBYTE pPassword, + _In_ DWORD dwPasswordSize, + _Out_ PWSTR *pClearTextPassword) +{ + PWSTR pBuffer; + + /* Allocate a buffer for the decrypted password */ + pBuffer = HeapAlloc(GetProcessHeap(), 0, dwPasswordSize); + if (pBuffer == NULL) + return ERROR_OUTOFMEMORY; + + /* Decrypt the password */ + CopyMemory(pBuffer, + pPassword, + dwPasswordSize); + + *pClearTextPassword = pBuffer; + + return ERROR_SUCCESS; +} + /* EOF */ diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index aa64233350..454181bb66 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -1934,6 +1934,7 @@ RChangeServiceConfigW( HKEY hServiceKey = NULL; LPWSTR lpDisplayNameW = NULL; LPWSTR lpImagePathW = NULL; + LPWSTR lpClearTextPassword = NULL; DPRINT("RChangeServiceConfigW() called\n"); DPRINT("dwServiceType = 0x%lx\n", dwServiceType); @@ -1941,6 +1942,9 @@ RChangeServiceConfigW( DPRINT("dwErrorControl = %lu\n", dwErrorControl); DPRINT("lpBinaryPathName = %S\n", lpBinaryPathName); DPRINT("lpLoadOrderGroup = %S\n", lpLoadOrderGroup); + DPRINT("lpServiceStartName = %S\n", lpServiceStartName); + DPRINT("lpPassword = %p\n", lpPassword); + DPRINT("dwPwSite = %lu\n", dwPwSize); DPRINT("lpDisplayName = %S\n", lpDisplayName); if (ScmShutdown) @@ -2199,13 +2203,25 @@ RChangeServiceConfigW( { if (*(LPWSTR)lpPassword != 0) { - /* FIXME: Decrypt the password */ + /* Decrypt the password */ + dwError = ScmDecryptPassword(lpPassword, + dwPwSize, + &lpClearTextPassword); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmDecryptPassword failed (Error %lu)\n", dwError); + goto done; + } + DPRINT1("Clear text password: %S\n", lpClearTextPassword); /* Write the password */ dwError = ScmSetServicePassword(lpService->szServiceName, - (LPCWSTR)lpPassword); + lpClearTextPassword); if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmSetServicePassword failed (Error %lu)\n", dwError); goto done; + } } else { @@ -2216,12 +2232,23 @@ RChangeServiceConfigW( dwError = ERROR_SUCCESS; if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmSetServicePassword failed (Error %lu)\n", dwError); goto done; + } } } } done: + if (lpClearTextPassword != NULL) + { + /* Wipe and release the password buffer */ + ZeroMemory(lpClearTextPassword, + (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); + HeapFree(GetProcessHeap(), 0, lpClearTextPassword); + } + if (hServiceKey != NULL) RegCloseKey(hServiceKey); @@ -2260,6 +2287,7 @@ RCreateServiceW( PSERVICE lpService = NULL; SC_HANDLE hServiceHandle = NULL; LPWSTR lpImagePath = NULL; + LPWSTR lpClearTextPassword = NULL; HKEY hServiceKey = NULL; LPWSTR lpObjectName; @@ -2576,11 +2604,16 @@ RCreateServiceW( if (lpPassword != NULL && *(LPWSTR)lpPassword != 0) { - /* FIXME: Decrypt the password */ + /* Decrypt the password */ + dwError = ScmDecryptPassword(lpPassword, + dwPwSize, + &lpClearTextPassword); + if (dwError != ERROR_SUCCESS) + goto done; /* Write the password */ dwError = ScmSetServicePassword(lpServiceName, - (LPCWSTR)lpPassword); + lpClearTextPassword); if (dwError != ERROR_SUCCESS) goto done; } @@ -2612,6 +2645,14 @@ done: if (hServiceKey != NULL) RegCloseKey(hServiceKey); + if (lpClearTextPassword != NULL) + { + /* Wipe and release the password buffer */ + ZeroMemory(lpClearTextPassword, + (wcslen(lpClearTextPassword) + 1) * sizeof(WCHAR)); + HeapFree(GetProcessHeap(), 0, lpClearTextPassword); + } + if (dwError == ERROR_SUCCESS) { DPRINT("hService %p\n", hServiceHandle); diff --git a/base/system/services/services.h b/base/system/services/services.h index b455bead0f..ce1b46eafa 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -150,6 +150,13 @@ ScmDeleteRegKey( _In_ HKEY hKey, _In_ PCWSTR pszSubKey); +DWORD +ScmDecryptPassword( + _In_ PBYTE pPassword, + _In_ DWORD dwPasswordSize, + _Out_ PWSTR *pDecryptedPassword); + + /* controlset.c */ BOOL ScmGetControlSetValues(VOID); diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index 92661c9581..022864bba9 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -155,6 +155,33 @@ ScmRpcStatusToWinError(RPC_STATUS Status) } +static +DWORD +ScmEncryptPassword( + _In_ PCWSTR pClearTextPassword, + _Out_ PBYTE *pEncryptedPassword, + _Out_ PDWORD pEncryptedPasswordSize) +{ + DWORD dwSize; + PBYTE pBuffer; + + dwSize = (wcslen(pClearTextPassword) + 1) * sizeof(WCHAR); + + pBuffer = HeapAlloc(GetProcessHeap(), 0, dwSize); + if (pBuffer == NULL) + return ERROR_OUTOFMEMORY; + + CopyMemory(pBuffer, + pClearTextPassword, + dwSize); + + *pEncryptedPassword = pBuffer; + *pEncryptedPasswordSize = dwSize; + + return ERROR_SUCCESS; +} + + /********************************************************************** * ChangeServiceConfig2A * @@ -293,12 +320,12 @@ ChangeServiceConfigA(SC_HANDLE hService, DWORD dwDependenciesLength = 0; SIZE_T cchLength; LPCSTR lpStr; - DWORD dwPasswordLength = 0; + DWORD dwPasswordSize = 0; LPWSTR lpPasswordW = NULL; LPBYTE lpEncryptedPassword = NULL; TRACE("ChangeServiceConfigA(%p %lu %lu %lu %s %s %p %s %s %s %s)\n", - dwServiceType, dwStartType, dwErrorControl, debugstr_a(lpBinaryPathName), + hService, dwServiceType, dwStartType, dwErrorControl, debugstr_a(lpBinaryPathName), debugstr_a(lpLoadOrderGroup), lpdwTagId, debugstr_a(lpDependencies), debugstr_a(lpServiceStartName), debugstr_a(lpPassword), debugstr_a(lpDisplayName)); @@ -334,9 +361,12 @@ ChangeServiceConfigA(SC_HANDLE hService, lpPasswordW, (int)(strlen(lpPassword) + 1)); - /* FIXME: Encrypt the password */ - lpEncryptedPassword = (LPBYTE)lpPasswordW; - dwPasswordLength = (wcslen(lpPasswordW) + 1) * sizeof(WCHAR); + /* Encrypt the unicode password */ + dwError = ScmEncryptPassword(lpPasswordW, + &lpEncryptedPassword, + &dwPasswordSize); + if (dwError != ERROR_SUCCESS) + goto done; } RpcTryExcept @@ -352,7 +382,7 @@ ChangeServiceConfigA(SC_HANDLE hService, dwDependenciesLength, (LPSTR)lpServiceStartName, lpEncryptedPassword, - dwPasswordLength, + dwPasswordSize, (LPSTR)lpDisplayName); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -361,9 +391,20 @@ ChangeServiceConfigA(SC_HANDLE hService, } RpcEndExcept; +done: if (lpPasswordW != NULL) + { + /* Wipe and release the password buffers */ + ZeroMemory(lpPasswordW, (wcslen(lpPasswordW) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, lpPasswordW); + if (lpEncryptedPassword != NULL) + { + ZeroMemory(lpEncryptedPassword, dwPasswordSize); + HeapFree(GetProcessHeap(), 0, lpEncryptedPassword); + } + } + if (dwError != ERROR_SUCCESS) { TRACE("RChangeServiceConfigA() failed (Error %lu)\n", dwError); @@ -397,11 +438,11 @@ ChangeServiceConfigW(SC_HANDLE hService, DWORD dwDependenciesLength = 0; SIZE_T cchLength; LPCWSTR lpStr; - DWORD dwPasswordLength = 0; + DWORD dwPasswordSize = 0; LPBYTE lpEncryptedPassword = NULL; TRACE("ChangeServiceConfigW(%p %lu %lu %lu %s %s %p %s %s %s %s)\n", - dwServiceType, dwStartType, dwErrorControl, debugstr_w(lpBinaryPathName), + hService, dwServiceType, dwStartType, dwErrorControl, debugstr_w(lpBinaryPathName), debugstr_w(lpLoadOrderGroup), lpdwTagId, debugstr_w(lpDependencies), debugstr_w(lpServiceStartName), debugstr_w(lpPassword), debugstr_w(lpDisplayName)); @@ -421,9 +462,14 @@ ChangeServiceConfigW(SC_HANDLE hService, if (lpPassword != NULL) { - /* FIXME: Encrypt the password */ - lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR); + dwError = ScmEncryptPassword(lpPassword, + &lpEncryptedPassword, + &dwPasswordSize); + if (dwError != ERROR_SUCCESS) + { + ERR("ScmEncryptPassword failed (Error %lu)\n", dwError); + goto done; + } } RpcTryExcept @@ -439,7 +485,7 @@ ChangeServiceConfigW(SC_HANDLE hService, dwDependenciesLength, (LPWSTR)lpServiceStartName, lpEncryptedPassword, - dwPasswordLength, + dwPasswordSize, (LPWSTR)lpDisplayName); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -448,6 +494,14 @@ ChangeServiceConfigW(SC_HANDLE hService, } RpcEndExcept; +done: + if (lpEncryptedPassword != NULL) + { + /* Wipe and release the password buffer */ + ZeroMemory(lpEncryptedPassword, dwPasswordSize); + HeapFree(GetProcessHeap(), 0, lpEncryptedPassword); + } + if (dwError != ERROR_SUCCESS) { TRACE("RChangeServiceConfigW() failed (Error %lu)\n", dwError); @@ -584,7 +638,7 @@ CreateServiceA(SC_HANDLE hSCManager, DWORD dwError; SIZE_T cchLength; LPCSTR lpStr; - DWORD dwPasswordLength = 0; + DWORD dwPasswordSize = 0; LPWSTR lpPasswordW = NULL; LPBYTE lpEncryptedPassword = NULL; @@ -632,9 +686,12 @@ CreateServiceA(SC_HANDLE hSCManager, lpPasswordW, (int)(strlen(lpPassword) + 1)); - /* FIXME: Encrypt the password */ - lpEncryptedPassword = (LPBYTE)lpPasswordW; - dwPasswordLength = (wcslen(lpPasswordW) + 1) * sizeof(WCHAR); + /* Encrypt the password */ + dwError = ScmEncryptPassword(lpPasswordW, + &lpEncryptedPassword, + &dwPasswordSize); + if (dwError != ERROR_SUCCESS) + goto done; } RpcTryExcept @@ -653,7 +710,7 @@ CreateServiceA(SC_HANDLE hSCManager, dwDependenciesLength, (LPSTR)lpServiceStartName, lpEncryptedPassword, - dwPasswordLength, + dwPasswordSize, (SC_RPC_HANDLE *)&hService); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -662,9 +719,20 @@ CreateServiceA(SC_HANDLE hSCManager, } RpcEndExcept; +done: if (lpPasswordW != NULL) + { + /* Wipe and release the password buffers */ + ZeroMemory(lpPasswordW, (wcslen(lpPasswordW) + 1) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, lpPasswordW); + if (lpEncryptedPassword != NULL) + { + ZeroMemory(lpEncryptedPassword, dwPasswordSize); + HeapFree(GetProcessHeap(), 0, lpEncryptedPassword); + } + } + SetLastError(dwError); if (dwError != ERROR_SUCCESS) { @@ -701,7 +769,7 @@ CreateServiceW(SC_HANDLE hSCManager, DWORD dwError; SIZE_T cchLength; LPCWSTR lpStr; - DWORD dwPasswordLength = 0; + DWORD dwPasswordSize = 0; LPBYTE lpEncryptedPassword = NULL; TRACE("CreateServiceW(%p %s %s %lx %lu %lu %lu %s %s %p %s %s %s)\n", @@ -732,9 +800,12 @@ CreateServiceW(SC_HANDLE hSCManager, if (lpPassword != NULL) { - /* FIXME: Encrypt the password */ - lpEncryptedPassword = (LPBYTE)lpPassword; - dwPasswordLength = (wcslen(lpPassword) + 1) * sizeof(WCHAR); + /* Encrypt the password */ + dwError = ScmEncryptPassword(lpPassword, + &lpEncryptedPassword, + &dwPasswordSize); + if (dwError != ERROR_SUCCESS) + goto done; } RpcTryExcept @@ -753,7 +824,7 @@ CreateServiceW(SC_HANDLE hSCManager, dwDependenciesLength, lpServiceStartName, lpEncryptedPassword, - dwPasswordLength, + dwPasswordSize, (SC_RPC_HANDLE *)&hService); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -762,6 +833,14 @@ CreateServiceW(SC_HANDLE hSCManager, } RpcEndExcept; +done: + if (lpEncryptedPassword != NULL) + { + /* Wipe and release the password buffers */ + ZeroMemory(lpEncryptedPassword, dwPasswordSize); + HeapFree(GetProcessHeap(), 0, lpEncryptedPassword); + } + SetLastError(dwError); if (dwError != ERROR_SUCCESS) {

1 0

03/03: [RPCSS] During the setup phase, the RPCSS service, initially running under the LocalSystem account, should re-configure itself to run under the NetworkService account.
by Hermès Bélusca-Maïto 16 Sep '18

16 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a631e31c86065aef57426… commit a631e31c86065aef57426bc6af11d8c6ed0a1215 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 16 23:56:59 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 17 01:23:03 2018 +0200 [RPCSS] During the setup phase, the RPCSS service, initially running under the LocalSystem account, should re-configure itself to run under the NetworkService account. This will also fix MS Office 2010 installation, where the installation expects the NetworkService account profile to be already loaded (this condition is always verified on Windows since RPCSS and other services also run under this account). CORE-14988, CORE-14989 --- base/services/rpcss/CMakeLists.txt | 1 + base/services/rpcss/rpcss_main.c | 8 ++ base/services/rpcss/setup.c | 179 +++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+) diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index a7a31c5dfe..2ed8b49df3 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND SOURCE epmp.c irotp.c rpcss_main.c + setup.c precomp.h ${CMAKE_CURRENT_BINARY_DIR}/epm_s.c ${CMAKE_CURRENT_BINARY_DIR}/irot_s.c) diff --git a/base/services/rpcss/rpcss_main.c b/base/services/rpcss/rpcss_main.c index 885726dba1..c515fa1a11 100644 --- a/base/services/rpcss/rpcss_main.c +++ b/base/services/rpcss/rpcss_main.c @@ -118,6 +118,10 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ } } +#ifdef __REACTOS__ +extern VOID DoRpcSsSetupConfiguration(VOID); +#endif + static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { SERVICE_STATUS status; @@ -140,6 +144,10 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) status.dwWaitHint = 10000; SetServiceStatus( service_handle, &status ); +#ifdef __REACTOS__ + DoRpcSsSetupConfiguration(); +#endif + WaitForSingleObject( exit_event, INFINITE ); status.dwCurrentState = SERVICE_STOPPED; diff --git a/base/services/rpcss/setup.c b/base/services/rpcss/setup.c new file mode 100644 index 0000000000..e51831efc4 --- /dev/null +++ b/base/services/rpcss/setup.c @@ -0,0 +1,179 @@ +/* + * PROJECT: ReactOS RPC Subsystem Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: One-time service setup configuration. + * COPYRIGHT: Copyright 2018 Hermes Belusca-Maito + */ + +/* INCLUDES *****************************************************************/ + +/* PSDK/NDK Headers */ +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> + +#include <ndk/rtlfuncs.h> +#include <ntsecapi.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rpcss); + +/* FUNCTIONS ****************************************************************/ + +static BOOL +SetupIsActive(VOID) +{ + LONG lResult; + HKEY hKey; + DWORD dwData = 0; + DWORD cbData = sizeof(dwData); + DWORD dwType = REG_NONE; + + lResult = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", 0, KEY_QUERY_VALUE, &hKey); + if (lResult != ERROR_SUCCESS) + return FALSE; + + lResult = RegQueryValueExW(hKey, L"SystemSetupInProgress", NULL, + &dwType, (LPBYTE)&dwData, &cbData); + RegCloseKey(hKey); + + if ((lResult == ERROR_SUCCESS) && (dwType == REG_DWORD) && + (cbData == sizeof(dwData)) && (dwData == 1)) + { + return TRUE; + } + + return FALSE; +} + +static BOOL +RunningAsSYSTEM(VOID) +{ + /* S-1-5-18 -- Local System */ + static SID SystemSid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; + + BOOL bRet = FALSE; + PTOKEN_USER pTokenUser; + HANDLE hToken; + DWORD cbTokenBuffer = 0; + + /* Get the process token */ + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) + return FALSE; + + /* Retrieve token's information */ + if (!GetTokenInformation(hToken, TokenUser, NULL, 0, &cbTokenBuffer) && + GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + goto Quit; + } + + pTokenUser = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbTokenBuffer); + if (!pTokenUser) + goto Quit; + + if (GetTokenInformation(hToken, TokenUser, pTokenUser, cbTokenBuffer, &cbTokenBuffer)) + { + /* Compare with SYSTEM SID */ + bRet = EqualSid(pTokenUser->User.Sid, &SystemSid); + } + + HeapFree(GetProcessHeap(), 0, pTokenUser); + +Quit: + CloseHandle(hToken); + return bRet; +} + +static VOID +RpcSsConfigureAsNetworkService(VOID) +{ + SC_HANDLE hSCManager, hService; + + /* Open the service controller */ + hSCManager = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CONNECT); + if (!hSCManager) + { + ERR("OpenSCManager() failed with error 0x%lx\n", GetLastError()); + return; + } + + /* Open the RPCSS service */ + hService = OpenServiceW(hSCManager, L"RPCSS", SERVICE_CHANGE_CONFIG); + if (!hService) + ERR("OpenService(\"RPCSS\") failed with error 0x%lx\n", GetLastError()); + if (hService) + { + /* Use the NetworkService account */ + if (!ChangeServiceConfigW(hService, + SERVICE_NO_CHANGE, + SERVICE_NO_CHANGE, + SERVICE_NO_CHANGE, + NULL, + NULL, + NULL, + NULL, + L"NT AUTHORITY\\NetworkService", + L"", + NULL)) + { + ERR("ChangeServiceConfig(\"RPCSS\") failed with error 0x%lx\n", GetLastError()); + } + + CloseServiceHandle(hService); + } + + CloseServiceHandle(hSCManager); +} + +static VOID +AddImpersonatePrivilege(VOID) +{ + /* S-1-5-6 -- "Service" group */ + static SID ServiceSid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_SERVICE_RID } }; + + NTSTATUS Status; + LSA_HANDLE PolicyHandle; + LSA_OBJECT_ATTRIBUTES ObjectAttributes; + LSA_UNICODE_STRING RightString; + + ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); + Status = LsaOpenPolicy(NULL, &ObjectAttributes, + POLICY_CREATE_ACCOUNT | POLICY_LOOKUP_NAMES, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaOpenPolicy() failed with Status 0x%08lx\n", Status); + return; + } + + RtlInitUnicodeString(&RightString, L"SeImpersonatePrivilege"); + Status = LsaAddAccountRights(PolicyHandle, &ServiceSid, &RightString, 1); + if (!NT_SUCCESS(Status)) + { + ERR("LsaAddAccountRights(\"S-1-5-6\", \"%wZ\") failed with Status 0x%08lx\n", Status, &RightString); + } + + LsaClose(PolicyHandle); +} + +VOID DoRpcSsSetupConfiguration(VOID) +{ + /* + * On first run during the setup phase, the RPCSS service runs under + * the LocalSystem account. RPCSS then re-configures itself to run + * under the NetworkService account and adds the Impersonate privilege + * to the "Service" group. + * This is done in this way, because the NetworkService account does not + * initially exist when the setup phase is running and the RPCSS service + * is started, but this account is created later during the setup phase. + */ + if (SetupIsActive() && RunningAsSYSTEM()) + { + RpcSsConfigureAsNetworkService(); + AddImpersonatePrivilege(); + } +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs