Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/05: [MSV1_0] Extract the code for SamValidateUser function (3/5)
by Andreas Maier 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=472b32d9020cdd3607c0c… commit 472b32d9020cdd3607c0c6ca17779ec7de6b1b8a Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Mon Jun 22 19:01:37 2020 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Dec 25 15:55:43 2021 +0300 [MSV1_0] Extract the code for SamValidateUser function (3/5) This is a part of the Partial Network Login Implementation PR. - Extract code for SamValidateUser (sam.c) from LsaApLogonUserEx2. - Make SamValidateNormalUser a local function for sam.c - Move dependent function GetNtAuthorityDomainSid to sam.c --- dll/win32/msv1_0/msv1_0.c | 186 ++++++++++++++-------------------------------- dll/win32/msv1_0/sam.c | 116 +++++++++++++++++++++++++++++ dll/win32/msv1_0/sam.h | 15 ++-- 3 files changed, 181 insertions(+), 136 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index e4e07f8b7bc..c60453f1745 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -20,28 +20,6 @@ LSA_DISPATCH_TABLE DispatchTable; /* FUNCTIONS ***************************************************************/ - -static -NTSTATUS -GetNtAuthorityDomainSid(PRPC_SID *Sid) -{ - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - ULONG Length = 0; - - Length = RtlLengthRequiredSid(0); - *Sid = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); - if (*Sid == NULL) - { - ERR("Failed to allocate SID\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlInitializeSid(*Sid,&NtAuthority, 0); - - return STATUS_SUCCESS; -} - - static NTSTATUS BuildInteractiveProfileBuffer(IN PLSA_CLIENT_REQUEST ClientRequest, @@ -953,15 +931,12 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, OUT PSECPKG_PRIMARY_CRED PrimaryCredentials, /* Not supported yet */ OUT PSECPKG_SUPPLEMENTAL_CRED_ARRAY *SupplementalCredentials) /* Not supported yet */ { - static const UNICODE_STRING NtAuthorityU = RTL_CONSTANT_STRING(L"NT AUTHORITY"); - static const UNICODE_STRING LocalServiceU = RTL_CONSTANT_STRING(L"LocalService"); - static const UNICODE_STRING NetworkServiceU = RTL_CONSTANT_STRING(L"NetworkService"); - NTSTATUS Status; - PMSV1_0_INTERACTIVE_LOGON LogonInfo; UNICODE_STRING ComputerName; WCHAR ComputerNameData[MAX_COMPUTERNAME_LENGTH + 1]; + PUNICODE_STRING LogonUserName = NULL; LSA_SAM_PWD_DATA LogonPwdData = { FALSE, NULL }; + PUNICODE_STRING LogonDomain = NULL; SAMPR_HANDLE UserHandle = NULL; PRPC_SID AccountDomainSid = NULL; PSAMPR_USER_INFO_BUFFER UserInfo = NULL; @@ -997,6 +972,7 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, LogonType == Batch || LogonType == Service) { + PMSV1_0_INTERACTIVE_LOGON LogonInfo; ULONG_PTR PtrOffset; if (SubmitBufferSize < sizeof(MSV1_0_INTERACTIVE_LOGON)) @@ -1092,8 +1068,11 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, if (!NT_SUCCESS(Status)) return STATUS_INVALID_PARAMETER; + LogonUserName = &LogonInfo->UserName; + LogonDomain = &LogonInfo->LogonDomainName; LogonPwdData.IsNetwork = FALSE; LogonPwdData.PlainPwd = &LogonInfo->Password; + LogonPwdData.ComputerName = &ComputerName; TRACE("Domain: %wZ\n", &LogonInfo->LogonDomainName); TRACE("User: %wZ\n", &LogonInfo->UserName); @@ -1108,80 +1087,18 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, } // TODO: Add other LogonType validity checks. - /* Check for special accounts */ - // FIXME: Windows does not do this that way!! (msv1_0 does not contain these hardcoded values) - if (RtlEqualUnicodeString(&LogonInfo->LogonDomainName, &NtAuthorityU, TRUE)) - { - SpecialAccount = TRUE; - - /* Get the authority domain SID */ - Status = GetNtAuthorityDomainSid(&AccountDomainSid); - if (!NT_SUCCESS(Status)) - { - ERR("GetNtAuthorityDomainSid() failed (Status 0x%08lx)\n", Status); - return Status; - } - - if (RtlEqualUnicodeString(&LogonInfo->UserName, &LocalServiceU, TRUE)) - { - TRACE("SpecialAccount: LocalService\n"); - - if (LogonType != Service) - return STATUS_LOGON_FAILURE; - - UserInfo = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SAMPR_USER_ALL_INFORMATION)); - if (UserInfo == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - UserInfo->All.UserId = SECURITY_LOCAL_SERVICE_RID; - UserInfo->All.PrimaryGroupId = SECURITY_LOCAL_SERVICE_RID; - } - else if (RtlEqualUnicodeString(&LogonInfo->UserName, &NetworkServiceU, TRUE)) - { - TRACE("SpecialAccount: NetworkService\n"); - - if (LogonType != Service) - return STATUS_LOGON_FAILURE; - - UserInfo = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SAMPR_USER_ALL_INFORMATION)); - if (UserInfo == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - UserInfo->All.UserId = SECURITY_NETWORK_SERVICE_RID; - UserInfo->All.PrimaryGroupId = SECURITY_NETWORK_SERVICE_RID; - } - else - { - Status = STATUS_NO_SUCH_USER; - goto done; - } - } - else - { - TRACE("NormalAccount\n"); - Status = SamValidateNormalUser(&LogonInfo->UserName, - &LogonPwdData, - &ComputerName, - &AccountDomainSid, - &UserHandle, - &UserInfo, - SubStatus); - if (!NT_SUCCESS(Status)) - { - ERR("SamValidateNormalUser() failed (Status 0x%08lx)\n", Status); - return Status; - } - } + Status = SamValidateUser(LogonType, + LogonUserName, + LogonDomain, + &LogonPwdData, + &ComputerName, + &SpecialAccount, + &AccountDomainSid, + &UserHandle, + &UserInfo, + SubStatus); + if (!NT_SUCCESS(Status)) + goto done; /* Return logon information */ @@ -1254,44 +1171,51 @@ done: &InternalInfo); } - /* Return the account name */ - *AccountName = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); - if (*AccountName != NULL) + if (NT_SUCCESS(Status)) { - (*AccountName)->Buffer = DispatchTable.AllocateLsaHeap(LogonInfo->UserName.Length + - sizeof(UNICODE_NULL)); - if ((*AccountName)->Buffer != NULL) + /* Return the account name */ + *AccountName = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); + if ((LogonUserName != NULL) && + (*AccountName != NULL)) { - (*AccountName)->MaximumLength = LogonInfo->UserName.Length + - sizeof(UNICODE_NULL); - RtlCopyUnicodeString(*AccountName, &LogonInfo->UserName); + (*AccountName)->Buffer = DispatchTable.AllocateLsaHeap(LogonUserName->Length + + sizeof(UNICODE_NULL)); + if ((*AccountName)->Buffer != NULL) + { + (*AccountName)->MaximumLength = LogonUserName->Length + + sizeof(UNICODE_NULL); + RtlCopyUnicodeString(*AccountName, LogonUserName); + } } - } - /* Return the authenticating authority */ - *AuthenticatingAuthority = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); - if (*AuthenticatingAuthority != NULL) - { - (*AuthenticatingAuthority)->Buffer = DispatchTable.AllocateLsaHeap(LogonInfo->LogonDomainName.Length + - sizeof(UNICODE_NULL)); - if ((*AuthenticatingAuthority)->Buffer != NULL) + /* Return the authenticating authority */ + *AuthenticatingAuthority = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); + if ((LogonDomain != NULL) && + (*AuthenticatingAuthority != NULL)) { - (*AuthenticatingAuthority)->MaximumLength = LogonInfo->LogonDomainName.Length + - sizeof(UNICODE_NULL); - RtlCopyUnicodeString(*AuthenticatingAuthority, &LogonInfo->LogonDomainName); + (*AuthenticatingAuthority)->Buffer = DispatchTable.AllocateLsaHeap(LogonDomain->Length + + sizeof(UNICODE_NULL)); + if ((*AuthenticatingAuthority)->Buffer != NULL) + { + (*AuthenticatingAuthority)->MaximumLength = LogonDomain->Length + + sizeof(UNICODE_NULL); + RtlCopyUnicodeString(*AuthenticatingAuthority, LogonDomain); + } } - } - /* Return the machine name */ - *MachineName = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); - if (*MachineName != NULL) - { - (*MachineName)->Buffer = DispatchTable.AllocateLsaHeap(ComputerName.MaximumLength); - if ((*MachineName)->Buffer != NULL) + /* Return the machine name */ + *MachineName = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); + if (*MachineName != NULL) { - (*MachineName)->MaximumLength = ComputerName.MaximumLength; - (*MachineName)->Length = ComputerName.Length; - RtlCopyMemory((*MachineName)->Buffer, ComputerName.Buffer, ComputerName.MaximumLength); + (*MachineName)->Buffer = DispatchTable.AllocateLsaHeap(ComputerName.MaximumLength); + if ((*MachineName)->Buffer != NULL) + { + (*MachineName)->MaximumLength = ComputerName.MaximumLength; + (*MachineName)->Length = ComputerName.Length; + RtlCopyMemory((*MachineName)->Buffer, + ComputerName.Buffer, + ComputerName.MaximumLength); + } } } diff --git a/dll/win32/msv1_0/sam.c b/dll/win32/msv1_0/sam.c index 266c976b2f0..0ffcf20d4f7 100644 --- a/dll/win32/msv1_0/sam.c +++ b/dll/win32/msv1_0/sam.c @@ -238,6 +238,7 @@ MsvpCheckWorkstations( } +static NTSTATUS SamValidateNormalUser( _In_ PUNICODE_STRING UserName, @@ -431,3 +432,118 @@ done: return Status; } + + +static +NTSTATUS +GetNtAuthorityDomainSid( + _In_ PRPC_SID *Sid) +{ + SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + ULONG Length = 0; + + Length = RtlLengthRequiredSid(0); + *Sid = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (*Sid == NULL) + { + ERR("Failed to allocate SID\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlInitializeSid(*Sid,&NtAuthority, 0); + + return STATUS_SUCCESS; +} + + +NTSTATUS +SamValidateUser( + _In_ SECURITY_LOGON_TYPE LogonType, + _In_ PUNICODE_STRING LogonUserName, + _In_ PUNICODE_STRING LogonDomain, + _In_ PLSA_SAM_PWD_DATA LogonPwdData, + _In_ PUNICODE_STRING ComputerName, + _Out_ PBOOL SpecialAccount, + _Out_ PRPC_SID* AccountDomainSidPtr, + _Out_ SAMPR_HANDLE* UserHandlePtr, + _Out_ PSAMPR_USER_INFO_BUFFER* UserInfoPtr, + _Out_ PNTSTATUS SubStatus) +{ + static const UNICODE_STRING NtAuthorityU = RTL_CONSTANT_STRING(L"NT AUTHORITY"); + static const UNICODE_STRING LocalServiceU = RTL_CONSTANT_STRING(L"LocalService"); + static const UNICODE_STRING NetworkServiceU = RTL_CONSTANT_STRING(L"NetworkService"); + + NTSTATUS Status = STATUS_SUCCESS; + + *SpecialAccount = FALSE; + + /* Check for special accounts */ + // FIXME: Windows does not do this that way!! (msv1_0 does not contain these hardcoded values) + if (RtlEqualUnicodeString(LogonDomain, &NtAuthorityU, TRUE)) + { + *SpecialAccount = TRUE; + + /* Get the authority domain SID */ + Status = GetNtAuthorityDomainSid(AccountDomainSidPtr); + if (!NT_SUCCESS(Status)) + { + ERR("GetNtAuthorityDomainSid() failed (Status 0x%08lx)\n", Status); + return Status; + } + + if (RtlEqualUnicodeString(LogonUserName, &LocalServiceU, TRUE)) + { + TRACE("SpecialAccount: LocalService\n"); + + if (LogonType != Service) + return STATUS_LOGON_FAILURE; + + *UserInfoPtr = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SAMPR_USER_ALL_INFORMATION)); + if (*UserInfoPtr == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + (*UserInfoPtr)->All.UserId = SECURITY_LOCAL_SERVICE_RID; + (*UserInfoPtr)->All.PrimaryGroupId = SECURITY_LOCAL_SERVICE_RID; + } + else if (RtlEqualUnicodeString(LogonUserName, &NetworkServiceU, TRUE)) + { + TRACE("SpecialAccount: NetworkService\n"); + + if (LogonType != Service) + return STATUS_LOGON_FAILURE; + + *UserInfoPtr = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SAMPR_USER_ALL_INFORMATION)); + if (*UserInfoPtr == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + (*UserInfoPtr)->All.UserId = SECURITY_NETWORK_SERVICE_RID; + (*UserInfoPtr)->All.PrimaryGroupId = SECURITY_NETWORK_SERVICE_RID; + } + else + { + return STATUS_NO_SUCH_USER; + } + } + else + { + TRACE("NormalAccount\n"); + Status = SamValidateNormalUser(LogonUserName, + LogonPwdData, + ComputerName, + AccountDomainSidPtr, + UserHandlePtr, + UserInfoPtr, + SubStatus); + if (!NT_SUCCESS(Status)) + { + ERR("SamValidateNormalUser() failed (Status 0x%08lx)\n", Status); + return Status; + } + } + + return Status; +} diff --git a/dll/win32/msv1_0/sam.h b/dll/win32/msv1_0/sam.h index 314989d16ba..2f82f0e1c6f 100644 --- a/dll/win32/msv1_0/sam.h +++ b/dll/win32/msv1_0/sam.h @@ -14,17 +14,22 @@ typedef struct _LSA_SAM_PWD_DATA BOOL IsNetwork; PUNICODE_STRING PlainPwd; + /* Input (IsNetwork = TRUE) */ + PUNICODE_STRING ComputerName; } LSA_SAM_PWD_DATA, *PLSA_SAM_PWD_DATA; /** - * @brief Validates a normal user by checking if it exists in the sam database. - * Further some other checks are done. + * @brief Validates a user by checking if it exists in the sam database. + * Some other checks are done further. */ NTSTATUS -SamValidateNormalUser( - _In_ PUNICODE_STRING UserName, - _In_ PLSA_SAM_PWD_DATA PwdData, +SamValidateUser( + _In_ SECURITY_LOGON_TYPE LogonType, + _In_ PUNICODE_STRING LogonUserName, + _In_ PUNICODE_STRING LogonDomain, + _In_ PLSA_SAM_PWD_DATA LogonPwdData, _In_ PUNICODE_STRING ComputerName, + _Out_ PBOOL SpecialAccount, _Out_ PRPC_SID* AccountDomainSidPtr, _Out_ SAMPR_HANDLE* UserHandlePtr, _Out_ PSAMPR_USER_INFO_BUFFER* UserInfoPtr,

1 0

[reactos] 02/05: [MSV1_0] Extract SamValidateNormalUser to a separate file (2/5)
by Andreas Maier 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=045cd5d42f61b4976d96a… commit 045cd5d42f61b4976d96a6fecca9a07ad9794617 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Sun Jun 21 23:47:30 2020 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Dec 25 15:55:43 2021 +0300 [MSV1_0] Extract SamValidateNormalUser to a separate file (2/5) This is a part of the Partial Network Login Implementation PR. - Extract code for SamValidateNormalUser (sam.c) from LsaApLogonUserEx2. - Move dependent functions to sam.c: * GetAccountDomainSid * MsvpCheckPassword * MsvpCheckLogonHours * MsvpCheckWorkstations --- dll/win32/msv1_0/CMakeLists.txt | 1 + dll/win32/msv1_0/msv1_0.c | 411 ++------------------------------------ dll/win32/msv1_0/precomp.h | 3 +- dll/win32/msv1_0/sam.c | 433 ++++++++++++++++++++++++++++++++++++++++ dll/win32/msv1_0/sam.h | 31 +++ 5 files changed, 479 insertions(+), 400 deletions(-) diff --git a/dll/win32/msv1_0/CMakeLists.txt b/dll/win32/msv1_0/CMakeLists.txt index 3b2b5e7fd65..50fa39aa44b 100644 --- a/dll/win32/msv1_0/CMakeLists.txt +++ b/dll/win32/msv1_0/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND SOURCE lsa.c msv1_0.c ntlm/global.c + sam.c user.c usercontext.c ${CMAKE_CURRENT_BINARY_DIR}/msv1_0_stubs.c diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 38bdbc40179..e4e07f8b7bc 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -20,54 +20,6 @@ LSA_DISPATCH_TABLE DispatchTable; /* FUNCTIONS ***************************************************************/ -static -NTSTATUS -GetAccountDomainSid(PRPC_SID *Sid) -{ - LSAPR_HANDLE PolicyHandle = NULL; - PLSAPR_POLICY_INFORMATION PolicyInfo = NULL; - ULONG Length = 0; - NTSTATUS Status; - - Status = LsaIOpenPolicyTrusted(&PolicyHandle); - if (!NT_SUCCESS(Status)) - { - TRACE("LsaIOpenPolicyTrusted() failed (Status 0x%08lx)\n", Status); - return Status; - } - - Status = LsarQueryInformationPolicy(PolicyHandle, - PolicyAccountDomainInformation, - &PolicyInfo); - if (!NT_SUCCESS(Status)) - { - TRACE("LsarQueryInformationPolicy() failed (Status 0x%08lx)\n", Status); - goto done; - } - - Length = RtlLengthSid(PolicyInfo->PolicyAccountDomainInfo.Sid); - - *Sid = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); - if (*Sid == NULL) - { - ERR("Failed to allocate SID\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - memcpy(*Sid, PolicyInfo->PolicyAccountDomainInfo.Sid, Length); - -done: - if (PolicyInfo != NULL) - LsaIFree_LSAPR_POLICY_INFORMATION(PolicyAccountDomainInformation, - PolicyInfo); - - if (PolicyHandle != NULL) - LsarClose(&PolicyHandle); - - return Status; -} - static NTSTATUS @@ -790,182 +742,6 @@ done: } -static -NTSTATUS -MsvpCheckPassword(PUNICODE_STRING UserPassword, - PSAMPR_USER_INFO_BUFFER UserInfo) -{ - ENCRYPTED_NT_OWF_PASSWORD UserNtPassword; - ENCRYPTED_LM_OWF_PASSWORD UserLmPassword; - BOOLEAN UserLmPasswordPresent = FALSE; - BOOLEAN UserNtPasswordPresent = FALSE; - OEM_STRING LmPwdString; - CHAR LmPwdBuffer[15]; - NTSTATUS Status; - - TRACE("(%p %p)\n", UserPassword, UserInfo); - - /* Calculate the LM password and hash for the users password */ - LmPwdString.Length = 15; - LmPwdString.MaximumLength = 15; - LmPwdString.Buffer = LmPwdBuffer; - ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength); - - Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString, - UserPassword, - FALSE); - if (NT_SUCCESS(Status)) - { - /* Calculate the LM hash value of the users password */ - Status = SystemFunction006(LmPwdString.Buffer, - (LPSTR)&UserLmPassword); - if (NT_SUCCESS(Status)) - { - UserLmPasswordPresent = TRUE; - } - } - - /* Calculate the NT hash of the users password */ - Status = SystemFunction007(UserPassword, - (LPBYTE)&UserNtPassword); - if (NT_SUCCESS(Status)) - { - UserNtPasswordPresent = TRUE; - } - - Status = STATUS_WRONG_PASSWORD; - - /* Succeed, if no password has been set */ - if (UserInfo->All.NtPasswordPresent == FALSE && - UserInfo->All.LmPasswordPresent == FALSE) - { - TRACE("No password check!\n"); - Status = STATUS_SUCCESS; - goto done; - } - - /* Succeed, if NT password matches */ - if (UserNtPasswordPresent && UserInfo->All.NtPasswordPresent) - { - TRACE("Check NT password hashes:\n"); - if (RtlEqualMemory(&UserNtPassword, - UserInfo->All.NtOwfPassword.Buffer, - sizeof(ENCRYPTED_NT_OWF_PASSWORD))) - { - TRACE(" success!\n"); - Status = STATUS_SUCCESS; - goto done; - } - - TRACE(" failed!\n"); - } - - /* Succeed, if LM password matches */ - if (UserLmPasswordPresent && UserInfo->All.LmPasswordPresent) - { - TRACE("Check LM password hashes:\n"); - if (RtlEqualMemory(&UserLmPassword, - UserInfo->All.LmOwfPassword.Buffer, - sizeof(ENCRYPTED_LM_OWF_PASSWORD))) - { - TRACE(" success!\n"); - Status = STATUS_SUCCESS; - goto done; - } - TRACE(" failed!\n"); - } - -done: - return Status; -} - - -static -BOOL -MsvpCheckLogonHours( - _In_ PSAMPR_LOGON_HOURS LogonHours, - _In_ PLARGE_INTEGER LogonTime) -{ -#if 0 - LARGE_INTEGER LocalLogonTime; - TIME_FIELDS TimeFields; - USHORT MinutesPerUnit, Offset; - BOOL bFound; - - FIXME("MsvpCheckLogonHours(%p %p)\n", LogonHours, LogonTime); - - if (LogonHours->UnitsPerWeek == 0 || LogonHours->LogonHours == NULL) - { - FIXME("No logon hours!\n"); - return TRUE; - } - - RtlSystemTimeToLocalTime(LogonTime, &LocalLogonTime); - RtlTimeToTimeFields(&LocalLogonTime, &TimeFields); - - FIXME("UnitsPerWeek: %u\n", LogonHours->UnitsPerWeek); - MinutesPerUnit = 10080 / LogonHours->UnitsPerWeek; - - Offset = ((TimeFields.Weekday * 24 + TimeFields.Hour) * 60 + TimeFields.Minute) / MinutesPerUnit; - FIXME("Offset: %us\n", Offset); - - bFound = (BOOL)(LogonHours->LogonHours[Offset / 8] & (1 << (Offset % 8))); - FIXME("Logon permitted: %s\n", bFound ? "Yes" : "No"); - - return bFound; -#endif - return TRUE; -} - - -static -BOOL -MsvpCheckWorkstations( - _In_ PRPC_UNICODE_STRING WorkStations, - _In_ PWSTR ComputerName) -{ - PWSTR pStart, pEnd; - BOOL bFound = FALSE; - - TRACE("MsvpCheckWorkstations(%p %S)\n", WorkStations, ComputerName); - - if (WorkStations->Length == 0 || WorkStations->Buffer == NULL) - { - TRACE("No workstations!\n"); - return TRUE; - } - - TRACE("Workstations: %wZ\n", WorkStations); - - pStart = WorkStations->Buffer; - for (;;) - { - pEnd = wcschr(pStart, L','); - if (pEnd != NULL) - *pEnd = UNICODE_NULL; - - TRACE("Comparing '%S' and '%S'\n", ComputerName, pStart); - if (_wcsicmp(ComputerName, pStart) == 0) - { - bFound = TRUE; - if (pEnd != NULL) - *pEnd = L','; - break; - } - - if (pEnd == NULL) - break; - - *pEnd = L','; - pStart = pEnd + 1; - } - - TRACE("Found allowed workstation: %s\n", (bFound) ? "Yes" : "No"); - - return bFound; -} - - /* * @unimplemented */ @@ -1185,19 +961,11 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, PMSV1_0_INTERACTIVE_LOGON LogonInfo; UNICODE_STRING ComputerName; WCHAR ComputerNameData[MAX_COMPUTERNAME_LENGTH + 1]; - SAMPR_HANDLE ServerHandle = NULL; - SAMPR_HANDLE DomainHandle = NULL; + LSA_SAM_PWD_DATA LogonPwdData = { FALSE, NULL }; SAMPR_HANDLE UserHandle = NULL; PRPC_SID AccountDomainSid = NULL; - RPC_UNICODE_STRING Names[1]; - SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; - SAMPR_ULONG_ARRAY Use = {0, NULL}; PSAMPR_USER_INFO_BUFFER UserInfo = NULL; BOOLEAN SessionCreated = FALSE; - LARGE_INTEGER LogonTime; - LARGE_INTEGER AccountExpires; - LARGE_INTEGER PasswordMustChange; - LARGE_INTEGER PasswordLastSet; DWORD ComputerNameSize; BOOL SpecialAccount = FALSE; UCHAR LogonPassHash; @@ -1324,6 +1092,9 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, if (!NT_SUCCESS(Status)) return STATUS_INVALID_PARAMETER; + LogonPwdData.IsNetwork = FALSE; + LogonPwdData.PlainPwd = &LogonInfo->Password; + TRACE("Domain: %wZ\n", &LogonInfo->LogonDomainName); TRACE("User: %wZ\n", &LogonInfo->UserName); TRACE("Password: %wZ\n", &LogonInfo->Password); @@ -1337,9 +1108,6 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, } // TODO: Add other LogonType validity checks. - /* Get the logon time */ - NtQuerySystemTime(&LogonTime); - /* Check for special accounts */ // FIXME: Windows does not do this that way!! (msv1_0 does not contain these hardcoded values) if (RtlEqualUnicodeString(&LogonInfo->LogonDomainName, &NtAuthorityU, TRUE)) @@ -1401,165 +1169,18 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, else { TRACE("NormalAccount\n"); - - /* Get the account domain SID */ - Status = GetAccountDomainSid(&AccountDomainSid); + Status = SamValidateNormalUser(&LogonInfo->UserName, + &LogonPwdData, + &ComputerName, + &AccountDomainSid, + &UserHandle, + &UserInfo, + SubStatus); if (!NT_SUCCESS(Status)) { - ERR("GetAccountDomainSid() failed (Status 0x%08lx)\n", Status); + ERR("SamValidateNormalUser() failed (Status 0x%08lx)\n", Status); return Status; } - - /* Connect to the SAM server */ - Status = SamIConnect(NULL, - &ServerHandle, - SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, - TRUE); - if (!NT_SUCCESS(Status)) - { - TRACE("SamIConnect() failed (Status 0x%08lx)\n", Status); - goto done; - } - - /* Open the account domain */ - Status = SamrOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - AccountDomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamrOpenDomain failed (Status %08lx)\n", Status); - goto done; - } - - Names[0].Length = LogonInfo->UserName.Length; - Names[0].MaximumLength = LogonInfo->UserName.MaximumLength; - Names[0].Buffer = LogonInfo->UserName.Buffer; - - /* Try to get the RID for the user name */ - Status = SamrLookupNamesInDomain(DomainHandle, - 1, - Names, - &RelativeIds, - &Use); - if (!NT_SUCCESS(Status)) - { - ERR("SamrLookupNamesInDomain failed (Status %08lx)\n", Status); - Status = STATUS_NO_SUCH_USER; - goto done; - } - - /* Fail, if it is not a user account */ - if (Use.Element[0] != SidTypeUser) - { - ERR("Account is not a user account!\n"); - Status = STATUS_NO_SUCH_USER; - goto done; - } - - /* Open the user object */ - Status = SamrOpenUser(DomainHandle, - USER_READ_GENERAL | USER_READ_LOGON | - USER_READ_ACCOUNT | USER_READ_PREFERENCES, /* FIXME */ - RelativeIds.Element[0], - &UserHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamrOpenUser failed (Status %08lx)\n", Status); - goto done; - } - - Status = SamrQueryInformationUser(UserHandle, - UserAllInformation, - &UserInfo); - if (!NT_SUCCESS(Status)) - { - ERR("SamrQueryInformationUser failed (Status %08lx)\n", Status); - goto done; - } - - TRACE("UserName: %wZ\n", &UserInfo->All.UserName); - - /* Check the password */ - if ((UserInfo->All.UserAccountControl & USER_PASSWORD_NOT_REQUIRED) == 0) - { - Status = MsvpCheckPassword(&LogonInfo->Password, - UserInfo); - if (!NT_SUCCESS(Status)) - { - ERR("MsvpCheckPassword failed (Status %08lx)\n", Status); - goto done; - } - } - - /* Check account restrictions for non-administrator accounts */ - if (RelativeIds.Element[0] != DOMAIN_USER_RID_ADMIN) - { - /* Check if the account has been disabled */ - if (UserInfo->All.UserAccountControl & USER_ACCOUNT_DISABLED) - { - ERR("Account disabled!\n"); - *SubStatus = STATUS_ACCOUNT_DISABLED; - Status = STATUS_ACCOUNT_RESTRICTION; - goto done; - } - - /* Check if the account has been locked */ - if (UserInfo->All.UserAccountControl & USER_ACCOUNT_AUTO_LOCKED) - { - ERR("Account locked!\n"); - *SubStatus = STATUS_ACCOUNT_LOCKED_OUT; - Status = STATUS_ACCOUNT_RESTRICTION; - goto done; - } - - /* Check if the account expired */ - AccountExpires.LowPart = UserInfo->All.AccountExpires.LowPart; - AccountExpires.HighPart = UserInfo->All.AccountExpires.HighPart; - if (LogonTime.QuadPart >= AccountExpires.QuadPart) - { - ERR("Account expired!\n"); - *SubStatus = STATUS_ACCOUNT_EXPIRED; - Status = STATUS_ACCOUNT_RESTRICTION; - goto done; - } - - /* Check if the password expired */ - PasswordMustChange.LowPart = UserInfo->All.PasswordMustChange.LowPart; - PasswordMustChange.HighPart = UserInfo->All.PasswordMustChange.HighPart; - PasswordLastSet.LowPart = UserInfo->All.PasswordLastSet.LowPart; - PasswordLastSet.HighPart = UserInfo->All.PasswordLastSet.HighPart; - - if (LogonTime.QuadPart >= PasswordMustChange.QuadPart) - { - ERR("Password expired!\n"); - if (PasswordLastSet.QuadPart == 0) - *SubStatus = STATUS_PASSWORD_MUST_CHANGE; - else - *SubStatus = STATUS_PASSWORD_EXPIRED; - - Status = STATUS_ACCOUNT_RESTRICTION; - goto done; - } - - /* Check logon hours */ - if (!MsvpCheckLogonHours(&UserInfo->All.LogonHours, &LogonTime)) - { - ERR("Invalid logon hours!\n"); - *SubStatus = STATUS_INVALID_LOGON_HOURS; - Status = STATUS_ACCOUNT_RESTRICTION; - goto done; - } - - /* Check workstations */ - if (!MsvpCheckWorkstations(&UserInfo->All.WorkStations, ComputerNameData)) - { - ERR("Invalid workstation!\n"); - *SubStatus = STATUS_INVALID_WORKSTATION; - Status = STATUS_ACCOUNT_RESTRICTION; - goto done; - } - } } /* Return logon information */ @@ -1692,14 +1313,6 @@ done: SamIFree_SAMPR_USER_INFO_BUFFER(UserInfo, UserAllInformation); - SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); - SamIFree_SAMPR_ULONG_ARRAY(&Use); - - if (DomainHandle != NULL) - SamrCloseHandle(&DomainHandle); - - if (ServerHandle != NULL) - SamrCloseHandle(&ServerHandle); if (AccountDomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); diff --git a/dll/win32/msv1_0/precomp.h b/dll/win32/msv1_0/precomp.h index 094db60e990..cf7b0842d50 100644 --- a/dll/win32/msv1_0/precomp.h +++ b/dll/win32/msv1_0/precomp.h @@ -5,6 +5,7 @@ #define _INC_WINDOWS #define COM_NO_WINDOWS_H #include <stdarg.h> +#include <stdbool.h> #include <windef.h> #include <winbase.h> #include <winreg.h> @@ -33,10 +34,10 @@ #include "ntlm/global.h" #include "lsa.h" #include "msv1_0.h" +#include "sam.h" #include "user.h" #include "usercontext.h" - #include <wine/debug.h> #endif diff --git a/dll/win32/msv1_0/sam.c b/dll/win32/msv1_0/sam.c new file mode 100644 index 00000000000..266c976b2f0 --- /dev/null +++ b/dll/win32/msv1_0/sam.c @@ -0,0 +1,433 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security Account Manager (SAM) related functions + * COPYRIGHT: Copyright 2013 Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include "precomp.h" + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msv1_0_sam); + + +static +NTSTATUS +GetAccountDomainSid( + _In_ PRPC_SID *Sid) +{ + LSAPR_HANDLE PolicyHandle = NULL; + PLSAPR_POLICY_INFORMATION PolicyInfo = NULL; + ULONG Length = 0; + NTSTATUS Status; + + Status = LsaIOpenPolicyTrusted(&PolicyHandle); + if (!NT_SUCCESS(Status)) + { + TRACE("LsaIOpenPolicyTrusted() failed (Status 0x%08lx)\n", Status); + return Status; + } + + Status = LsarQueryInformationPolicy(PolicyHandle, + PolicyAccountDomainInformation, + &PolicyInfo); + if (!NT_SUCCESS(Status)) + { + TRACE("LsarQueryInformationPolicy() failed (Status 0x%08lx)\n", Status); + goto done; + } + + Length = RtlLengthSid(PolicyInfo->PolicyAccountDomainInfo.Sid); + + *Sid = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (*Sid == NULL) + { + ERR("Failed to allocate SID\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(*Sid, PolicyInfo->PolicyAccountDomainInfo.Sid, Length); + +done: + if (PolicyInfo != NULL) + LsaIFree_LSAPR_POLICY_INFORMATION(PolicyAccountDomainInformation, + PolicyInfo); + + if (PolicyHandle != NULL) + LsarClose(&PolicyHandle); + + return Status; +} + + +static +NTSTATUS +MsvpCheckPassword( + _In_ PLSA_SAM_PWD_DATA UserPwdData, + _In_ PSAMPR_USER_INFO_BUFFER UserInfo) +{ + ENCRYPTED_NT_OWF_PASSWORD UserNtPassword; + ENCRYPTED_LM_OWF_PASSWORD UserLmPassword; + BOOLEAN UserLmPasswordPresent = FALSE; + BOOLEAN UserNtPasswordPresent = FALSE; + OEM_STRING LmPwdString; + CHAR LmPwdBuffer[15]; + NTSTATUS Status; + + TRACE("(%p %p)\n", UserPwdData, UserInfo); + + /* Calculate the LM password and hash for the users password */ + LmPwdString.Length = 15; + LmPwdString.MaximumLength = 15; + LmPwdString.Buffer = LmPwdBuffer; + ZeroMemory(LmPwdString.Buffer, LmPwdString.MaximumLength); + + Status = RtlUpcaseUnicodeStringToOemString(&LmPwdString, + UserPwdData->PlainPwd, + FALSE); + if (NT_SUCCESS(Status)) + { + /* Calculate the LM hash value of the users password */ + Status = SystemFunction006(LmPwdString.Buffer, + (LPSTR)&UserLmPassword); + if (NT_SUCCESS(Status)) + { + UserLmPasswordPresent = TRUE; + } + } + + /* Calculate the NT hash of the users password */ + Status = SystemFunction007(UserPwdData->PlainPwd, + (LPBYTE)&UserNtPassword); + if (NT_SUCCESS(Status)) + { + UserNtPasswordPresent = TRUE; + } + + Status = STATUS_WRONG_PASSWORD; + + /* Succeed, if no password has been set */ + if (UserInfo->All.NtPasswordPresent == FALSE && + UserInfo->All.LmPasswordPresent == FALSE) + { + TRACE("No password check!\n"); + Status = STATUS_SUCCESS; + goto done; + } + + /* Succeed, if NT password matches */ + if (UserNtPasswordPresent && UserInfo->All.NtPasswordPresent) + { + TRACE("Check NT password hashes:\n"); + if (RtlEqualMemory(&UserNtPassword, + UserInfo->All.NtOwfPassword.Buffer, + sizeof(ENCRYPTED_NT_OWF_PASSWORD))) + { + TRACE(" success!\n"); + Status = STATUS_SUCCESS; + goto done; + } + + TRACE(" failed!\n"); + } + + /* Succeed, if LM password matches */ + if (UserLmPasswordPresent && UserInfo->All.LmPasswordPresent) + { + TRACE("Check LM password hashes:\n"); + if (RtlEqualMemory(&UserLmPassword, + UserInfo->All.LmOwfPassword.Buffer, + sizeof(ENCRYPTED_LM_OWF_PASSWORD))) + { + TRACE(" success!\n"); + Status = STATUS_SUCCESS; + goto done; + } + TRACE(" failed!\n"); + } + +done: + return Status; +} + + +static +bool +MsvpCheckLogonHours( + _In_ PSAMPR_LOGON_HOURS LogonHours, + _In_ LARGE_INTEGER LogonTime) +{ +#if 0 + LARGE_INTEGER LocalLogonTime; + TIME_FIELDS TimeFields; + USHORT MinutesPerUnit, Offset; + bool bFound; + + FIXME("MsvpCheckLogonHours(%p %llx)\n", LogonHours, LogonTime); + + if (LogonHours->UnitsPerWeek == 0 || LogonHours->LogonHours == NULL) + { + FIXME("No logon hours!\n"); + return true; + } + + RtlSystemTimeToLocalTime(&LogonTime, &LocalLogonTime); + RtlTimeToTimeFields(&LocalLogonTime, &TimeFields); + + FIXME("UnitsPerWeek: %u\n", LogonHours->UnitsPerWeek); + MinutesPerUnit = 10080 / LogonHours->UnitsPerWeek; + + Offset = ((TimeFields.Weekday * 24 + TimeFields.Hour) * 60 + TimeFields.Minute) / MinutesPerUnit; + FIXME("Offset: %us\n", Offset); + + bFound = (bool)(LogonHours->LogonHours[Offset / 8] & (1 << (Offset % 8))); + FIXME("Logon permitted: %s\n", bFound ? "Yes" : "No"); + + return bFound; +#endif + return true; +} + + +static +bool +MsvpCheckWorkstations( + _In_ PRPC_UNICODE_STRING WorkStations, + _In_ PWSTR ComputerName) +{ + PWSTR pStart, pEnd; + bool bFound = false; + + TRACE("MsvpCheckWorkstations(%p %S)\n", WorkStations, ComputerName); + + if (WorkStations->Length == 0 || WorkStations->Buffer == NULL) + { + TRACE("No workstations!\n"); + return true; + } + + TRACE("Workstations: %wZ\n", WorkStations); + + pStart = WorkStations->Buffer; + for (;;) + { + pEnd = wcschr(pStart, L','); + if (pEnd != NULL) + *pEnd = UNICODE_NULL; + + TRACE("Comparing '%S' and '%S'\n", ComputerName, pStart); + if (_wcsicmp(ComputerName, pStart) == 0) + { + bFound = true; + if (pEnd != NULL) + *pEnd = L','; + break; + } + + if (pEnd == NULL) + break; + + *pEnd = L','; + pStart = pEnd + 1; + } + + TRACE("Found allowed workstation: %s\n", (bFound) ? "Yes" : "No"); + + return bFound; +} + + +NTSTATUS +SamValidateNormalUser( + _In_ PUNICODE_STRING UserName, + _In_ PLSA_SAM_PWD_DATA PwdData, + _In_ PUNICODE_STRING ComputerName, + _Out_ PRPC_SID* AccountDomainSidPtr, + _Out_ SAMPR_HANDLE* UserHandlePtr, + _Out_ PSAMPR_USER_INFO_BUFFER* UserInfoPtr, + _Out_ PNTSTATUS SubStatus) +{ + NTSTATUS Status; + SAMPR_HANDLE ServerHandle = NULL; + SAMPR_HANDLE DomainHandle = NULL; + PRPC_SID AccountDomainSid; + RPC_UNICODE_STRING Names[1]; + SAMPR_HANDLE UserHandle = NULL; + SAMPR_ULONG_ARRAY RelativeIds = {0, NULL}; + SAMPR_ULONG_ARRAY Use = {0, NULL}; + PSAMPR_USER_INFO_BUFFER UserInfo = NULL; + LARGE_INTEGER LogonTime; + + /* Get the logon time */ + NtQuerySystemTime(&LogonTime); + + /* Get the account domain SID */ + Status = GetAccountDomainSid(&AccountDomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Connect to the SAM server */ + Status = SamIConnect(NULL, &ServerHandle, SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, TRUE); + if (!NT_SUCCESS(Status)) + { + TRACE("SamIConnect() failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Open the account domain */ + Status = SamrOpenDomain(ServerHandle, DOMAIN_LOOKUP, AccountDomainSid, &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamrOpenDomain failed (Status %08lx)\n", Status); + goto done; + } + + Names[0].Length = UserName->Length; + Names[0].MaximumLength = UserName->MaximumLength; + Names[0].Buffer = UserName->Buffer; + + /* Try to get the RID for the user name */ + Status = SamrLookupNamesInDomain(DomainHandle, 1, Names, &RelativeIds, &Use); + if (!NT_SUCCESS(Status)) + { + ERR("SamrLookupNamesInDomain failed (Status %08lx)\n", Status); + Status = STATUS_NO_SUCH_USER; + // FIXME: Try without domain? + goto done; + } + + /* Fail, if it is not a user account */ + if (Use.Element[0] != SidTypeUser) + { + ERR("Account is not a user account!\n"); + Status = STATUS_NO_SUCH_USER; + goto done; + } + + /* Open the user object */ + Status = SamrOpenUser(DomainHandle, + USER_READ_GENERAL | USER_READ_LOGON | + USER_READ_ACCOUNT | USER_READ_PREFERENCES, /* FIXME */ + RelativeIds.Element[0], + &UserHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamrOpenUser failed (Status %08lx)\n", Status); + goto done; + } + + Status = SamrQueryInformationUser(UserHandle, UserAllInformation, &UserInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamrQueryInformationUser failed (Status %08lx)\n", Status); + goto done; + } + + TRACE("UserName: %wZ\n", &UserInfo->All.UserName); + + /* Check the password */ + if ((UserInfo->All.UserAccountControl & USER_PASSWORD_NOT_REQUIRED) == 0) + { + Status = MsvpCheckPassword(PwdData, UserInfo); + if (!NT_SUCCESS(Status)) + { + ERR("MsvpCheckPassword failed (Status %08lx)\n", Status); + goto done; + } + } + + /* Check account restrictions for non-administrator accounts */ + if (RelativeIds.Element[0] != DOMAIN_USER_RID_ADMIN) + { + /* Check if the account has been disabled */ + if (UserInfo->All.UserAccountControl & USER_ACCOUNT_DISABLED) + { + ERR("Account disabled!\n"); + *SubStatus = STATUS_ACCOUNT_DISABLED; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + + /* Check if the account has been locked */ + if (UserInfo->All.UserAccountControl & USER_ACCOUNT_AUTO_LOCKED) + { + ERR("Account locked!\n"); + *SubStatus = STATUS_ACCOUNT_LOCKED_OUT; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + + /* Check if the account expired */ + if (LogonTime.QuadPart >= *(UINT64*)&UserInfo->All.AccountExpires) + { + ERR("Account expired!\n"); + *SubStatus = STATUS_ACCOUNT_EXPIRED; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + + /* Check if the password expired */ + if (LogonTime.QuadPart >= *(UINT64*)&UserInfo->All.PasswordMustChange) + { + ERR("Password expired!\n"); + if (*(UINT64*)&UserInfo->All.PasswordLastSet == 0) + *SubStatus = STATUS_PASSWORD_MUST_CHANGE; + else + *SubStatus = STATUS_PASSWORD_EXPIRED; + + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + + /* Check logon hours */ + if (!MsvpCheckLogonHours(&UserInfo->All.LogonHours, LogonTime)) + { + ERR("Invalid logon hours!\n"); + *SubStatus = STATUS_INVALID_LOGON_HOURS; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + + /* Check workstations */ + if (!MsvpCheckWorkstations(&UserInfo->All.WorkStations, ComputerName->Buffer)) + { + ERR("Invalid workstation!\n"); + *SubStatus = STATUS_INVALID_WORKSTATION; + Status = STATUS_ACCOUNT_RESTRICTION; + goto done; + } + } +done: + if (NT_SUCCESS(Status)) + { + *UserHandlePtr = UserHandle; + *AccountDomainSidPtr = AccountDomainSid; + *UserInfoPtr = UserInfo; + } + else + { + if (AccountDomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); + + if (UserHandle != NULL) + SamrCloseHandle(&UserHandle); + + SamIFree_SAMPR_USER_INFO_BUFFER(UserInfo, + UserAllInformation); + } + + SamIFree_SAMPR_ULONG_ARRAY(&RelativeIds); + SamIFree_SAMPR_ULONG_ARRAY(&Use); + + if (DomainHandle != NULL) + SamrCloseHandle(&DomainHandle); + + if (ServerHandle != NULL) + SamrCloseHandle(&ServerHandle); + + return Status; +} diff --git a/dll/win32/msv1_0/sam.h b/dll/win32/msv1_0/sam.h new file mode 100644 index 00000000000..314989d16ba --- /dev/null +++ b/dll/win32/msv1_0/sam.h @@ -0,0 +1,31 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Security Account Manager (SAM) related functions - header + * COPYRIGHT: Copyright 2013 Eric Kohl <eric.kohl(a)reactos.org> + */ + +#pragma once + +typedef struct _LSA_SAM_PWD_DATA +{ + /* TRUE: PlainPwd is filled, + FALSE: LmPwd and NtPwd is filled */ + BOOL IsNetwork; + PUNICODE_STRING PlainPwd; + +} LSA_SAM_PWD_DATA, *PLSA_SAM_PWD_DATA; + +/** + * @brief Validates a normal user by checking if it exists in the sam database. + * Further some other checks are done. + */ +NTSTATUS +SamValidateNormalUser( + _In_ PUNICODE_STRING UserName, + _In_ PLSA_SAM_PWD_DATA PwdData, + _In_ PUNICODE_STRING ComputerName, + _Out_ PRPC_SID* AccountDomainSidPtr, + _Out_ SAMPR_HANDLE* UserHandlePtr, + _Out_ PSAMPR_USER_INFO_BUFFER* UserInfoPtr, + _Out_ PNTSTATUS SubStatus);

1 0

[reactos] 01/05: [MSV1_0] Improve GetComputerNameW call (1/5)
by Andreas Maier 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a67ed775f685d4e5e2d2… commit 5a67ed775f685d4e5e2d289394c851af752ccfeb Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Sun Jun 21 22:50:29 2020 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Dec 25 15:55:43 2021 +0300 [MSV1_0] Improve GetComputerNameW call (1/5) This is a part of the Partial Network Login Implementation PR. --- dll/win32/msv1_0/msv1_0.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index c5d87f88c2d..38bdbc40179 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -1183,7 +1183,8 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, NTSTATUS Status; PMSV1_0_INTERACTIVE_LOGON LogonInfo; - WCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + UNICODE_STRING ComputerName; + WCHAR ComputerNameData[MAX_COMPUTERNAME_LENGTH + 1]; SAMPR_HANDLE ServerHandle = NULL; SAMPR_HANDLE DomainHandle = NULL; SAMPR_HANDLE UserHandle = NULL; @@ -1214,6 +1215,15 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, *AccountName = NULL; *AuthenticatingAuthority = NULL; + /* Get the computer name */ + ComputerNameSize = ARRAYSIZE(ComputerNameData); + if (!GetComputerNameW(ComputerNameData, &ComputerNameSize)) + { + ERR("Failed to get Computername.\n"); + return STATUS_INTERNAL_ERROR; + } + RtlInitUnicodeString(&ComputerName, ComputerNameData); + /* Parameters validation */ if (LogonType == Interactive || LogonType == Batch || @@ -1330,10 +1340,6 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, /* Get the logon time */ NtQuerySystemTime(&LogonTime); - /* Get the computer name */ - ComputerNameSize = ARRAYSIZE(ComputerName); - GetComputerNameW(ComputerName, &ComputerNameSize); - /* Check for special accounts */ // FIXME: Windows does not do this that way!! (msv1_0 does not contain these hardcoded values) if (RtlEqualUnicodeString(&LogonInfo->LogonDomainName, &NtAuthorityU, TRUE)) @@ -1546,7 +1552,7 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, } /* Check workstations */ - if (!MsvpCheckWorkstations(&UserInfo->All.WorkStations, ComputerName)) + if (!MsvpCheckWorkstations(&UserInfo->All.WorkStations, ComputerNameData)) { ERR("Invalid workstation!\n"); *SubStatus = STATUS_INVALID_WORKSTATION; @@ -1579,7 +1585,7 @@ LsaApLogonUserEx2(IN PLSA_CLIENT_REQUEST ClientRequest, /* Build and fill the interactive profile buffer */ Status = BuildInteractiveProfileBuffer(ClientRequest, UserInfo, - ComputerName, + ComputerNameData, (PMSV1_0_INTERACTIVE_PROFILE*)ProfileBuffer, ProfileBufferSize); if (!NT_SUCCESS(Status)) @@ -1659,12 +1665,12 @@ done: *MachineName = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); if (*MachineName != NULL) { - (*MachineName)->Buffer = DispatchTable.AllocateLsaHeap((ComputerNameSize + 1) * sizeof(WCHAR)); + (*MachineName)->Buffer = DispatchTable.AllocateLsaHeap(ComputerName.MaximumLength); if ((*MachineName)->Buffer != NULL) { - (*MachineName)->MaximumLength = (ComputerNameSize + 1) * sizeof(WCHAR); - (*MachineName)->Length = ComputerNameSize * sizeof(WCHAR); - RtlCopyMemory((*MachineName)->Buffer, ComputerName, (*MachineName)->MaximumLength); + (*MachineName)->MaximumLength = ComputerName.MaximumLength; + (*MachineName)->Length = ComputerName.Length; + RtlCopyMemory((*MachineName)->Buffer, ComputerName.Buffer, ComputerName.MaximumLength); } }

1 0

[reactos] 01/01: [BOOTDATA] Support EMF/WMF metafile file types (#4183)
by Katayama Hirofumi MZ 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2be9ea9c3beb343674a09… commit 2be9ea9c3beb343674a090e8e84621c0f8ffafd2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 25 21:40:59 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 25 21:40:59 2021 +0900 [BOOTDATA] Support EMF/WMF metafile file types (#4183) Improve "Open with" registry info. CORE-17814 --- boot/bootdata/hivesft.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index ad07c1fdf53..8ba9faac33f 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -88,8 +88,8 @@ HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".jpeg",0x000000 HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".jpe",0x00000000,"" HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".jfif",0x00000000,"" HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".gif",0x00000000,"" -; HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".emf",0x00000000,"" ; NOT SUPPORTED YET -; HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".wmf",0x00000000,"" ; NOT SUPPORTED YET +HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".emf",0x00000000,"" +HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".wmf",0x00000000,"" HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".tif",0x00000000,"" HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".tiff",0x00000000,"" HKLM,"SOFTWARE\Classes\Applications\mspaint.exe\SupportedTypes",".png",0x00000000,""

1 0

[reactos] 01/01: [GDIPLUS] GdipCreateBitmapFromStream should accept metafiles (#4181)
by Katayama Hirofumi MZ 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c8ae0d76697c28b850e8… commit 5c8ae0d76697c28b850e8914680a95e5327d616f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 25 21:40:08 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 25 21:40:08 2021 +0900 [GDIPLUS] GdipCreateBitmapFromStream should accept metafiles (#4181) - Add hbitmap_from_emf helper function. - GdipCreateBitmapFromStream accepts the metafiles. CORE-17814 --- dll/win32/gdiplus/image.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dll/win32/gdiplus/image.c b/dll/win32/gdiplus/image.c index 8425bcb54b3..e9fd781a1be 100644 --- a/dll/win32/gdiplus/image.c +++ b/dll/win32/gdiplus/image.c @@ -1897,6 +1897,41 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, return Ok; } +#ifdef __REACTOS__ +static HBITMAP hbitmap_from_emf(HENHMETAFILE hemf) +{ + BITMAPINFO bmi; + HBITMAP hbm; + SIZE size; + ENHMETAHEADER header; + HGDIOBJ hbmOld; + RECT rc; + HDC hdc; + + GetEnhMetaFileHeader(hemf, sizeof(header), &header); + size.cx = header.rclBounds.right - header.rclBounds.left + 1; + size.cy = header.rclBounds.bottom - header.rclBounds.top + 1; + + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = size.cx; + bmi.bmiHeader.biHeight = size.cy; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 24; + + hdc = CreateCompatibleDC(NULL); + hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); + + hbmOld = SelectObject(hdc, hbm); + SetRect(&rc, 0, 0, size.cx, size.cy); + PlayEnhMetaFile(hdc, hemf, &rc); + SelectObject(hdc, hbmOld); + + DeleteDC(hdc); + return hbm; +} + +#endif GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream, GpBitmap **bitmap) { @@ -1909,6 +1944,19 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream, if(stat != Ok) return stat; +#ifdef __REACTOS__ + if ((*bitmap)->image.type == ImageTypeMetafile) + { + HBITMAP hbm = hbitmap_from_emf(((GpMetafile*)*bitmap)->hemf); + GdipDisposeImage(&(*bitmap)->image); + if (!hbm) + return GenericError; /* FIXME: what error to return? */ + + GdipCreateBitmapFromHBITMAP(hbm, NULL, bitmap); + DeleteObject(hbm); + } + else +#endif if((*bitmap)->image.type != ImageTypeBitmap){ GdipDisposeImage(&(*bitmap)->image); *bitmap = NULL;

1 0

[reactos] 01/01: [I8042PRT] Add Latitude D820 to the hack list (#4185)
by Scott Maday 25 Dec '21

25 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99a6d037864b4c8631e01… commit 99a6d037864b4c8631e014e2cf4b3a2d5d91894c Author: Scott Maday <coldasdryice1(a)gmail.com> AuthorDate: Fri Dec 24 20:07:33 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 25 03:07:33 2021 +0100 [I8042PRT] Add Latitude D820 to the hack list (#4185) Fixes the Dell Latitude D820 TouchPad not working. --- drivers/input/i8042prt/hwhacks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/input/i8042prt/hwhacks.c b/drivers/input/i8042prt/hwhacks.c index ddb8a6fbaaf..4478c78cb19 100644 --- a/drivers/input/i8042prt/hwhacks.c +++ b/drivers/input/i8042prt/hwhacks.c @@ -49,6 +49,7 @@ const HARDWARE_TABLE i8042HardwareTable[] = { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D620 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D630 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D810 "}}, FL_INITHACK }, + { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D820 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4300 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E4310 "}}, FL_INITHACK }, { {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude E6400 "}}, FL_INITHACK },

1 0

[reactos] 01/01: [MSV1_0] Create stubs for SECPKG_USER_FUNCTION_TABLE
by Andreas Maier 24 Dec '21

24 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0901077f8c29feaec9990… commit 0901077f8c29feaec9990e1501ca481b67f13cad Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Sat Dec 25 00:10:33 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 25 02:10:33 2021 +0300 [MSV1_0] Create stubs for SECPKG_USER_FUNCTION_TABLE This commit fixes a bug as well: old code of SpUserModeInitialze returns a pointer to a local variable (SECPKG_USER_FUNCTION_TABLE). --- dll/win32/msv1_0/CMakeLists.txt | 4 +- dll/win32/msv1_0/lsa.c | 6 +- dll/win32/msv1_0/lsa.h | 10 +-- dll/win32/msv1_0/msv1_0.c | 22 +---- dll/win32/msv1_0/msv1_0.spec | 2 +- dll/win32/msv1_0/ntlm/global.c | 34 ++++++++ dll/win32/msv1_0/ntlm/global.h | 17 ++++ dll/win32/msv1_0/precomp.h | 4 + dll/win32/msv1_0/user.c | 176 ++++++++++++++++++++++++++++++++++++++++ dll/win32/msv1_0/user.h | 100 +++++++++++++++++++++++ dll/win32/msv1_0/usercontext.c | 22 +++++ dll/win32/msv1_0/usercontext.h | 14 ++++ 12 files changed, 377 insertions(+), 34 deletions(-) diff --git a/dll/win32/msv1_0/CMakeLists.txt b/dll/win32/msv1_0/CMakeLists.txt index 380fc5d16dd..3b2b5e7fd65 100644 --- a/dll/win32/msv1_0/CMakeLists.txt +++ b/dll/win32/msv1_0/CMakeLists.txt @@ -4,7 +4,9 @@ spec2def(msv1_0.dll msv1_0.spec) list(APPEND SOURCE lsa.c msv1_0.c - precomp.h + ntlm/global.c + user.c + usercontext.c ${CMAKE_CURRENT_BINARY_DIR}/msv1_0_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msv1_0.def) diff --git a/dll/win32/msv1_0/lsa.c b/dll/win32/msv1_0/lsa.c index 63a4bb1f0a7..0bbf4699c66 100644 --- a/dll/win32/msv1_0/lsa.c +++ b/dll/win32/msv1_0/lsa.c @@ -1,9 +1,7 @@ /* * PROJECT: Authentication Package DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/msv1_0/lsa.c - * PURPOSE: NTLM-functions returned from SpLsaModeInitialize - (PSECPKG_FUNCTION_TABLE) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: NTLM functions returned from SpLsaModeInitialize (PSECPKG_FUNCTION_TABLE) * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> */ diff --git a/dll/win32/msv1_0/lsa.h b/dll/win32/msv1_0/lsa.h index e5fe1a934d1..2df98a710c6 100644 --- a/dll/win32/msv1_0/lsa.h +++ b/dll/win32/msv1_0/lsa.h @@ -1,13 +1,11 @@ /* * PROJECT: Authentication Package DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/msv1_0/lsa.h - * PURPOSE: header for lsa.c + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Header for lsa.c * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> */ -#ifndef _MSV1_0_LSA_H_ -#define _MSV1_0_LSA_H_ +#pragma once // functions we provide to LSA in SpLsaModeInitialize extern SECPKG_FUNCTION_TABLE NtlmLsaFn[1]; @@ -138,5 +136,3 @@ NTAPI LsaSpSetExtendedInformation( _In_ SECPKG_EXTENDED_INFORMATION_CLASS Class, _In_ PSECPKG_EXTENDED_INFORMATION Info); - -#endif /* _MSV1_0_LSA_H_ */ diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 2ab923213a3..c5d87f88c2d 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -1769,7 +1769,6 @@ SpLsaModeInitialize( return STATUS_SUCCESS; } - /* * @unimplemented */ @@ -1781,8 +1780,6 @@ SpUserModeInitialize( _Out_ PSECPKG_USER_FUNCTION_TABLE *ppTables, _Out_ PULONG pcTables) { - SECPKG_USER_FUNCTION_TABLE Tables[1]; - TRACE("SpUserModeInitialize(0x%lx %p %p %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); @@ -1791,24 +1788,7 @@ SpUserModeInitialize( *PackageVersion = SECPKG_INTERFACE_VERSION; - RtlZeroMemory(&Tables, sizeof(Tables)); - -// Tables[0].InstanceInit = SpInstanceInit; -// Tables[0].InitUserModeContext = NULL; -// Tables[0].MakeSignature = NULL; -// Tables[0].VerifySignature = NULL; -// Tables[0].SealMessage = NULL; -// Tables[0].UnsealMessage = NULL; -// Tables[0].GetContextToken = NULL; -// Tables[0].SpQueryContextAttributes = NULL; -// Tables[0].CompleteAuthToken = NULL; -// Tables[0].DeleteUserModeContext = NULL; -// Tables[0].FormatCredentials = NULL; -// Tables[0].MarshallSupplementalCreds = NULL; -// Tables[0].ExportContext = NULL; -// Tables[0].ImportContext = NULL; - - *ppTables = Tables; + *ppTables = NtlmUsrFn; *pcTables = 1; return STATUS_SUCCESS; diff --git a/dll/win32/msv1_0/msv1_0.spec b/dll/win32/msv1_0/msv1_0.spec index 36d62cf1223..ab746f861ac 100644 --- a/dll/win32/msv1_0/msv1_0.spec +++ b/dll/win32/msv1_0/msv1_0.spec @@ -11,6 +11,6 @@ @ stub MsvSamValidate @ stub MsvValidateTarget @ stdcall SpInitialize(long ptr ptr) -@ stub SpInstanceInit +@ stdcall SpInstanceInit(long ptr ptr) @ stdcall SpLsaModeInitialize(long ptr ptr ptr) @ stdcall SpUserModeInitialize(long ptr ptr ptr) diff --git a/dll/win32/msv1_0/ntlm/global.c b/dll/win32/msv1_0/ntlm/global.c new file mode 100644 index 00000000000..ba1082f9ff9 --- /dev/null +++ b/dll/win32/msv1_0/ntlm/global.c @@ -0,0 +1,34 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: NTLM globals definitions (header) + * COPYRIGHT: Copyright 2011 Samuel Serapión + * Copyright 2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#include "../precomp.h" + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + +/* globals */ +PSECPKG_DLL_FUNCTIONS UsrFunctions = NULL; +SECPKG_USER_FUNCTION_TABLE NtlmUsrFn[1] = +{ + { + .InstanceInit = SpInstanceInit, + .InitUserModeContext = UsrSpInitUserModeContext, + .MakeSignature = UsrSpMakeSignature, + .VerifySignature = UsrSpVerifySignature, + .SealMessage = UsrSpSealMessage, + .UnsealMessage = UsrSpUnsealMessage, + .GetContextToken = UsrSpGetContextToken, + .SpQueryContextAttributes = UsrSpQueryContextAttributes, + .CompleteAuthToken = UsrSpCompleteAuthToken, + .DeleteUserModeContext = UsrSpDeleteUserModeContext, + .FormatCredentials = UsrSpFormatCredentials, + .MarshallSupplementalCreds = UsrSpMarshallSupplementalCreds, + .ExportContext = UsrSpExportSecurityContext, + .ImportContext = UsrSpImportSecurityContext + } +}; diff --git a/dll/win32/msv1_0/ntlm/global.h b/dll/win32/msv1_0/ntlm/global.h new file mode 100644 index 00000000000..2ee2f1092dd --- /dev/null +++ b/dll/win32/msv1_0/ntlm/global.h @@ -0,0 +1,17 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: ntlm globals definitions (header) + * COPYRIGHT: Copyright 2011 Samuel Serapión + * Copyright 2020 Andreas Maier (staubim(a)quantentunnel.de) + */ + +#ifndef _MSV1_0_NTLM_GLOBALS_H_ +#define _MSV1_0_NTLM_GLOBALS_H_ + +/* functions provided by LSA in SpInstanceInit */ +extern PSECPKG_DLL_FUNCTIONS UsrFunctions; +/* functions we provide to LSA in SpUserModeInitialize */ +extern SECPKG_USER_FUNCTION_TABLE NtlmUsrFn[1]; + +#endif diff --git a/dll/win32/msv1_0/precomp.h b/dll/win32/msv1_0/precomp.h index 462fb56a401..094db60e990 100644 --- a/dll/win32/msv1_0/precomp.h +++ b/dll/win32/msv1_0/precomp.h @@ -30,8 +30,12 @@ #include <samsrv/samsrv.h> //#include <lsass/lsasrv.h> +#include "ntlm/global.h" #include "lsa.h" #include "msv1_0.h" +#include "user.h" +#include "usercontext.h" + #include <wine/debug.h> diff --git a/dll/win32/msv1_0/user.c b/dll/win32/msv1_0/user.c new file mode 100644 index 00000000000..97f41b350a5 --- /dev/null +++ b/dll/win32/msv1_0/user.c @@ -0,0 +1,176 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: NTLM Functions returned from SpUserModeInitialize (PSECPKG_USER_FUNCTION_TABLE) + * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#include "precomp.h" + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); + +NTSTATUS +NTAPI +SpInstanceInit( + _In_ ULONG Version, + _In_ PSECPKG_DLL_FUNCTIONS FunctionTable, + _Inout_ PVOID *UserFunctions) +{ + TRACE("SpInstanceInit(Version 0x%lx, 0x%p, 0x%p)\n", + Version, FunctionTable, UserFunctions); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpMakeSignature( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG QualityOfProtection, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber) +{ + TRACE("UsrSpMakeSignature(0x%p 0x%x 0x%p 0x%x)\n", + ContextHandle, QualityOfProtection, + MessageBuffers, MessageSequenceNumber); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpVerifySignature( + _In_ LSA_SEC_HANDLE phContext, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo, + _In_ PULONG pfQOP) +{ + TRACE("UsrSpVerifySignature(0x%p 0x%x 0x%x 0x%p)\n", + phContext, pMessage, MessageSeqNo, pfQOP); + + return ERROR_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +UsrSpSealMessage( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG QualityOfProtection, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber) +{ + TRACE("UsrSpSealMessage(0x%p 0x%x 0x%p 0x%x)\n", + ContextHandle, QualityOfProtection, + MessageBuffers, MessageSequenceNumber); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpUnsealMessage( + _In_ LSA_SEC_HANDLE ContextHandle, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber, + _In_ PULONG QualityOfProtection) +{ + TRACE("UsrSpUnsealMessage(0x%p 0x%x 0x%p 0x%x)\n", + ContextHandle, MessageBuffers, + MessageSequenceNumber, QualityOfProtection); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpGetContextToken( + _In_ LSA_SEC_HANDLE ContextHandle, + _Inout_ PHANDLE ImpersonationToken) +{ + TRACE("UsrSpGetContextToken(0x%p 0x%p)\n", + ContextHandle, ImpersonationToken); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpQueryContextAttributes( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG ContextAttribute, + _Inout_ PVOID Buffer) +{ + TRACE("UsrSpQueryContextAttributes(0x%p 0x%x 0x%p)\n", + ContextHandle, ContextAttribute, Buffer); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpCompleteAuthToken( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ PSecBufferDesc InputBuffer) +{ + TRACE("UsrSpCompleteAuthToken(0x%p 0x%p)\n", + ContextHandle, InputBuffer); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpDeleteUserModeContext( + _In_ LSA_SEC_HANDLE ContextHandle) +{ + TRACE("UsrSpDeleteUserModeContext(0x%p)\n", + ContextHandle); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +UsrSpFormatCredentials( + _In_ PSecBuffer Credentials, + _Inout_ PSecBuffer FormattedCredentials) +{ + TRACE("UsrSpFormatCredentials(0x%p 0x%p)\n", + Credentials, FormattedCredentials); + + return ERROR_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +UsrSpMarshallSupplementalCreds( + _In_ ULONG CredentialSize, + _In_ PUCHAR Credentials, + _Inout_ PULONG MarshalledCredSize, + _Inout_ PVOID *MarshalledCreds) +{ + TRACE("UsrSpMarshallSupplementalCreds(0x%x 0x%p 0x%p 0x%p)\n", + CredentialSize, Credentials, MarshalledCredSize, MarshalledCreds); + + return ERROR_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +UsrSpExportSecurityContext( + _In_ LSA_SEC_HANDLE phContext, + _In_ ULONG fFlags, + _Inout_ PSecBuffer pPackedContext, + _Inout_ PHANDLE pToken) +{ + TRACE("UsrSpExportSecurityContext(0x%p 0x%x 0x%p 0x%p)\n", + phContext, fFlags, pPackedContext, pToken); + + return ERROR_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +UsrSpImportSecurityContext( + _In_ PSecBuffer pPackedContext, + _In_ HANDLE Token, + _Inout_ PLSA_SEC_HANDLE phContext) +{ + TRACE("UsrSpImportSecurityContext(0x%p 0x%x 0x%p)\n", + pPackedContext, Token, phContext); + + return ERROR_NOT_SUPPORTED; +} diff --git a/dll/win32/msv1_0/user.h b/dll/win32/msv1_0/user.h new file mode 100644 index 00000000000..9388e5fdec1 --- /dev/null +++ b/dll/win32/msv1_0/user.h @@ -0,0 +1,100 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Header for user.c + * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#pragma once + +NTSTATUS +NTAPI +SpInstanceInit( + _In_ ULONG Version, + _In_ PSECPKG_DLL_FUNCTIONS FunctionTable, + _Inout_ PVOID *UserFunctions); + +NTSTATUS +NTAPI +UsrSpMakeSignature( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG QualityOfProtection, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber); + +NTSTATUS +NTAPI +UsrSpVerifySignature( + _In_ LSA_SEC_HANDLE phContext, + _In_ PSecBufferDesc pMessage, + _In_ ULONG MessageSeqNo, + _In_ PULONG pfQOP); + +NTSTATUS +NTAPI +UsrSpSealMessage( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG QualityOfProtection, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber); + +NTSTATUS +NTAPI +UsrSpUnsealMessage( + _In_ LSA_SEC_HANDLE ContextHandle, + _Inout_ PSecBufferDesc MessageBuffers, + _In_ ULONG MessageSequenceNumber, + _In_ PULONG QualityOfProtection); + +NTSTATUS +NTAPI +UsrSpGetContextToken( + _In_ LSA_SEC_HANDLE ContextHandle, + _Inout_ PHANDLE ImpersonationToken); + +NTSTATUS +NTAPI +UsrSpQueryContextAttributes( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ ULONG ContextAttribute, + _Inout_ PVOID Buffer); + +NTSTATUS +NTAPI +UsrSpCompleteAuthToken( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ PSecBufferDesc InputBuffer); + +NTSTATUS +NTAPI +UsrSpDeleteUserModeContext( + _In_ LSA_SEC_HANDLE ContextHandle); + +NTSTATUS +NTAPI +UsrSpFormatCredentials( + _In_ PSecBuffer Credentials, + _Inout_ PSecBuffer FormattedCredentials); + +NTSTATUS +NTAPI +UsrSpMarshallSupplementalCreds( + _In_ ULONG CredentialSize, + _In_ PUCHAR Credentials, + _Inout_ PULONG MarshalledCredSize, + _Inout_ PVOID *MarshalledCreds); + +NTSTATUS +NTAPI +UsrSpExportSecurityContext( + _In_ LSA_SEC_HANDLE phContext, + _In_ ULONG fFlags, + _Inout_ PSecBuffer pPackedContext, + _Inout_ PHANDLE pToken); + +NTSTATUS +NTAPI +UsrSpImportSecurityContext( + _In_ PSecBuffer pPackedContext, + _In_ HANDLE Token, + _Inout_ PLSA_SEC_HANDLE phContext); diff --git a/dll/win32/msv1_0/usercontext.c b/dll/win32/msv1_0/usercontext.c new file mode 100644 index 00000000000..a9fd023c47f --- /dev/null +++ b/dll/win32/msv1_0/usercontext.c @@ -0,0 +1,22 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Manage user mode contexts (create, destroy, reference) + * COPYRIGHT: Copyright 2019-2020 Andreas Maier (staubim(a)quantentunnel.de) + */ + +#include "precomp.h" + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msv1_0); + +NTSTATUS +NTAPI +UsrSpInitUserModeContext( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ PSecBuffer PackedContext) +{ + TRACE("UsrSpInitUserModeContext(%p %p)\n", + ContextHandle, PackedContext); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dll/win32/msv1_0/usercontext.h b/dll/win32/msv1_0/usercontext.h new file mode 100644 index 00000000000..b1a5ca31a49 --- /dev/null +++ b/dll/win32/msv1_0/usercontext.h @@ -0,0 +1,14 @@ +/* + * PROJECT: Authentication Package DLL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Manage user mode contexts (create, destroy, reference) + * COPYRIGHT: Copyright 2019-2020 Andreas Maier <staubim(a)quantentunnel.de> + */ + +#pragma once + +NTSTATUS +NTAPI +UsrSpInitUserModeContext( + _In_ LSA_SEC_HANDLE ContextHandle, + _In_ PSecBuffer PackedContext);

1 0

[reactos] 01/01: [TASKMGR] Avoid freezing in getting icons (#4180)
by Katayama Hirofumi MZ 24 Dec '21

24 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c82bf032498d3d107aae… commit 1c82bf032498d3d107aae7174c5fb179680f0eb5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 24 16:08:07 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 24 16:08:07 2021 +0900 [TASKMGR] Avoid freezing in getting icons (#4180) - Modify the timeout value of SendMessageTimeout. - Use SMTO_ABORTIFHUNG flag. - Check if the window alive. CORE-17894 --- base/applications/taskmgr/applpage.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/base/applications/taskmgr/applpage.c b/base/applications/taskmgr/applpage.c index f3ad41c891a..b249006e94b 100644 --- a/base/applications/taskmgr/applpage.c +++ b/base/applications/taskmgr/applpage.c @@ -353,6 +353,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) WCHAR szText[260]; BOOL bLargeIcon; BOOL bHung = FALSE; + LRESULT bAlive; typedef int (FAR __stdcall *IsHungAppWindowProc)(HWND); IsHungAppWindowProc IsHungAppWindow; @@ -377,20 +378,26 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) noApps = FALSE; +#define GET_ICON(type) \ + SendMessageTimeoutW(hWnd, WM_GETICON, (type), 0, SMTO_ABORTIFHUNG, 100, (PDWORD_PTR)&hIcon) + /* Get the icon for this window */ hIcon = NULL; - SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_BIG : ICON_SMALL, 0, 0, 1000, (PDWORD_PTR)&hIcon); + bAlive = GET_ICON(bLargeIcon ? ICON_BIG : ICON_SMALL); if (!hIcon) { /* We failed, try to retrieve other icons... */ - hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICON : GCL_HICONSM); - if (!hIcon) hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICONSM : GCL_HICON); - if (!hIcon) SendMessageTimeoutW(hWnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon); - if (!hIcon) SendMessageTimeoutW(hWnd, WM_GETICON, bLargeIcon ? ICON_SMALL : ICON_BIG, 0, 0, 1000, (PDWORD_PTR)&hIcon); + if (!hIcon && bAlive) + GET_ICON(bLargeIcon ? ICON_SMALL : ICON_BIG); + if (!hIcon) + hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICON : GCL_HICONSM); + if (!hIcon) + hIcon = (HICON)(LONG_PTR)GetClassLongPtrW(hWnd, bLargeIcon ? GCL_HICONSM : GCL_HICON); /* If we still do not have any icon, load the default one */ if (!hIcon) hIcon = LoadIconW(hInst, bLargeIcon ? MAKEINTRESOURCEW(IDI_WINDOW) : MAKEINTRESOURCEW(IDI_WINDOWSM)); } +#undef GET_ICON bHung = FALSE;

1 0

[reactos] 01/01: [EXPLORER] Adjust Taskbar AUTOHIDE size Part 2
by Katayama Hirofumi MZ 23 Dec '21

23 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ed752e2c56830bae761c… commit 4ed752e2c56830bae761c4cdb6db24bf8394a412 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 24 07:52:02 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 24 07:52:02 2021 +0900 [EXPLORER] Adjust Taskbar AUTOHIDE size Part 2 The previous commit 2cc893f was too thick. CORE-17927 --- base/shell/explorer/traywnd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 0bcb6d81327..57acf0d28a0 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -1869,8 +1869,8 @@ ChangePos: void ProcessAutoHide() { - INT w = m_TraySize.cx - (GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXEDGE)); - INT h = m_TraySize.cy - (GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYEDGE)); + INT w = m_TraySize.cx - GetSystemMetrics(SM_CXSIZEFRAME); + INT h = m_TraySize.cy - GetSystemMetrics(SM_CYSIZEFRAME); switch (m_AutoHideState) {

1 0

[reactos] 01/01: [EXPLORER] Adjust AUTOHIDE size
by Katayama Hirofumi MZ 23 Dec '21

23 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cc893f514240d1cadd4c… commit 2cc893f514240d1cadd4c51225a27c724fe17595 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 24 07:24:33 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 24 07:26:11 2021 +0900 [EXPLORER] Adjust AUTOHIDE size GetSystemMetrics(SM_CXBORDER) is too thin. CORE-17927 --- base/shell/explorer/traywnd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 0f3005ca950..0bcb6d81327 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -1869,8 +1869,8 @@ ChangePos: void ProcessAutoHide() { - INT w = m_TraySize.cx - GetSystemMetrics(SM_CXBORDER) * 2 - 1; - INT h = m_TraySize.cy - GetSystemMetrics(SM_CYBORDER) * 2 - 1; + INT w = m_TraySize.cx - (GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXEDGE)); + INT h = m_TraySize.cy - (GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYEDGE)); switch (m_AutoHideState) {

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