Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-15 07:17:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LSASRV]

Browse source 
LsapGetLogonSessionData: Marshall the session data before sending them to the client.

[SECUR32]
LsaConnectUntrusted: Wait for the authentication thread.
LsaGetLogonSessionData: Unmarshall the session data after receiving them from the server.

svn path=/trunk/; revision=72767
This commit is contained in:
Eric Kohl 2016-09-22 11:27:05 +00:00
parent 770c7d7cb0
commit e5d301366c
3 changed files with 158 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
reactos/dll/win32/lsasrv/session.c
View file

@ -320,8 +320,8 @@ LsapGetLogonSessionData(IN OUT PLSA_API_MSG RequestMsg)
PLSAP_LOGON_SESSION Session; PLSAP_LOGON_SESSION Session;
PSECURITY_LOGON_SESSION_DATA LocalSessionData; PSECURITY_LOGON_SESSION_DATA LocalSessionData;
PVOID ClientBaseAddress = NULL; PVOID ClientBaseAddress = NULL;
ULONG Length, MemSize; ULONG TotalLength, MemSize, SidLength = 0;
LPWSTR Ptr; PUCHAR Ptr;
NTSTATUS Status; NTSTATUS Status;
TRACE("LsapGetLogonSessionData(%p)\n", RequestMsg); TRACE("LsapGetLogonSessionData(%p)\n", RequestMsg);
@ -332,47 +332,117 @@ LsapGetLogonSessionData(IN OUT PLSA_API_MSG RequestMsg)
return STATUS_NO_SUCH_LOGON_SESSION; return STATUS_NO_SUCH_LOGON_SESSION;
/* Calculate the required buffer size */ /* Calculate the required buffer size */
Length = sizeof(SECURITY_LOGON_SESSION_DATA) + TotalLength = sizeof(SECURITY_LOGON_SESSION_DATA) +
Session->UserName.MaximumLength; Session->UserName.MaximumLength +
/* Session->LogonDomain.MaximumLength +
Session->LogonDomain.MaximumLength + Session->AuthenticationPackage.MaximumLength +
Session->AuthenticationPackage.MaximumLength + Session->LogonServer.MaximumLength +
Session->LogonServer.MaximumLength + Session->DnsDomainName.MaximumLength +
Session->DnsDomainName.MaximumLength + Session->Upn.MaximumLength;
Session->Upn.MaximumLength;
if (Session->Sid != NULL) if (Session->Sid != NULL)
RtlLengthSid(Session->Sid); {
*/ SidLength = RtlLengthSid(Session->Sid);
TotalLength += SidLength;
TRACE("Length: %lu\n", Length); }
TRACE("TotalLength: %lu\n", TotalLength);
/* Allocate the buffer */ /* Allocate the buffer */
LocalSessionData = RtlAllocateHeap(RtlGetProcessHeap(), LocalSessionData = RtlAllocateHeap(RtlGetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
Length); TotalLength);
if (LocalSessionData == NULL) if (LocalSessionData == NULL)
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
Ptr = (LPWSTR)((ULONG_PTR)LocalSessionData + sizeof(SECURITY_LOGON_SESSION_DATA)); Ptr = (PUCHAR)((ULONG_PTR)LocalSessionData + sizeof(SECURITY_LOGON_SESSION_DATA));
TRACE("LocalSessionData: %p Ptr: %p\n", LocalSessionData, Ptr); TRACE("LocalSessionData: %p Ptr: %p\n", LocalSessionData, Ptr);
LocalSessionData->Size = sizeof(SECURITY_LOGON_SESSION_DATA); LocalSessionData->Size = sizeof(SECURITY_LOGON_SESSION_DATA);
/* Copy the LogonId */
RtlCopyLuid(&LocalSessionData->LogonId, RtlCopyLuid(&LocalSessionData->LogonId,
&RequestMsg->GetLogonSessionData.Request.LogonId); &RequestMsg->GetLogonSessionData.Request.LogonId);
/* Copy the UserName string*/
LocalSessionData->UserName.Length = Session->UserName.Length; LocalSessionData->UserName.Length = Session->UserName.Length;
LocalSessionData->UserName.MaximumLength = Session->UserName.MaximumLength; LocalSessionData->UserName.MaximumLength = Session->UserName.MaximumLength;
LocalSessionData->UserName.Buffer = Ptr;
// RtlCopyMemory(Ptr) if (Session->UserName.MaximumLength != 0)
{
RtlCopyMemory(Ptr, Session->UserName.Buffer, Session->UserName.MaximumLength);
Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->UserName.MaximumLength);
LocalSessionData->UserName.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData);
}
/* Copy the LogonDomain string */
LocalSessionData->LogonDomain.Length = Session->LogonDomain.Length;
LocalSessionData->LogonDomain.MaximumLength = Session->LogonDomain.MaximumLength;
if (Session->LogonDomain.MaximumLength != 0)
{
RtlCopyMemory(Ptr, Session->LogonDomain.Buffer, Session->LogonDomain.MaximumLength);
Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->LogonDomain.MaximumLength);
LocalSessionData->LogonDomain.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData);
}
/* Copy the AuthenticationPackage string */
LocalSessionData->AuthenticationPackage.Length = Session->AuthenticationPackage.Length;
LocalSessionData->AuthenticationPackage.MaximumLength = Session->AuthenticationPackage.MaximumLength;
if (Session->AuthenticationPackage.MaximumLength != 0)
{
RtlCopyMemory(Ptr, Session->AuthenticationPackage.Buffer, Session->AuthenticationPackage.MaximumLength);
Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->AuthenticationPackage.MaximumLength);
LocalSessionData->AuthenticationPackage.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData);
}
LocalSessionData->LogonType = Session->LogonType; LocalSessionData->LogonType = Session->LogonType;
LocalSessionData->Session = 0; LocalSessionData->Session = 0;
/* Sid */
if (Session->Sid != NULL)
{
RtlCopyMemory(Ptr, Session->Sid, SidLength);
Ptr = (PUCHAR)((ULONG_PTR)Ptr + SidLength);
LocalSessionData->Sid = (PSID)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData);
}
/* LogonTime */
LocalSessionData->LogonTime.QuadPart = Session->LogonTime.QuadPart;
/* Copy the LogonServer string */
LocalSessionData->LogonServer.Length = Session->LogonServer.Length;
LocalSessionData->LogonServer.MaximumLength = Session->LogonServer.MaximumLength;
if (Session->LogonServer.MaximumLength != 0)
{
RtlCopyMemory(Ptr, Session->LogonServer.Buffer, Session->LogonServer.MaximumLength);
Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->LogonServer.MaximumLength);
LocalSessionData->LogonServer.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData);
}
/* Copy the DnsDomainName string */
LocalSessionData->DnsDomainName.Length = Session->DnsDomainName.Length;
LocalSessionData->DnsDomainName.MaximumLength = Session->DnsDomainName.MaximumLength;
if (Session->DnsDomainName.MaximumLength != 0)
{
RtlCopyMemory(Ptr, Session->DnsDomainName.Buffer, Session->DnsDomainName.MaximumLength);
Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->DnsDomainName.MaximumLength);
LocalSessionData->DnsDomainName.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData);
}
/* Copy the Upn string */
LocalSessionData->Upn.Length = Session->Upn.Length;
LocalSessionData->Upn.MaximumLength = Session->Upn.MaximumLength;
if (Session->Upn.MaximumLength != 0)
{
RtlCopyMemory(Ptr, Session->Upn.Buffer, Session->Upn.MaximumLength);
Ptr = (PUCHAR)((ULONG_PTR)Ptr + Session->Upn.MaximumLength);
LocalSessionData->Upn.Buffer = (PWSTR)((ULONG_PTR)Ptr - (ULONG_PTR)LocalSessionData);
}
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
@ -391,7 +461,7 @@ LsapGetLogonSessionData(IN OUT PLSA_API_MSG RequestMsg)
goto done; goto done;
} }
MemSize = Length; MemSize = TotalLength;
Status = NtAllocateVirtualMemory(ProcessHandle, Status = NtAllocateVirtualMemory(ProcessHandle,
&ClientBaseAddress, &ClientBaseAddress,
0, 0,
@ -410,7 +480,7 @@ LsapGetLogonSessionData(IN OUT PLSA_API_MSG RequestMsg)
Status = NtWriteVirtualMemory(ProcessHandle, Status = NtWriteVirtualMemory(ProcessHandle,
ClientBaseAddress, ClientBaseAddress,
LocalSessionData, LocalSessionData,
Length, TotalLength,
NULL); NULL);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {

71
reactos/dll/win32/secur32/lsalpc.c
View file

@ -115,14 +115,53 @@ LsaConnectUntrusted(
SECURITY_QUALITY_OF_SERVICE SecurityQos; SECURITY_QUALITY_OF_SERVICE SecurityQos;
LSA_CONNECTION_INFO ConnectInfo; LSA_CONNECTION_INFO ConnectInfo;
ULONG ConnectInfoLength = sizeof(ConnectInfo); ULONG ConnectInfoLength = sizeof(ConnectInfo);
OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING EventName;
HANDLE EventHandle;
NTSTATUS Status; NTSTATUS Status;
TRACE("LsaConnectUntrusted(%p)\n", LsaHandle); TRACE("LsaConnectUntrusted(%p)\n", LsaHandle);
// TODO: Wait on L"\\SECURITY\\LSA_AUTHENTICATION_INITIALIZED" event // TODO: we may need to impersonate ourselves before, because we are untrusted!
// for the LSA server to be ready, and because we are untrusted,
// we may need to impersonate ourselves before!
/* Wait for the LSA authentication thread */
RtlInitUnicodeString(&EventName,
L"\\SECURITY\\LSA_AUTHENTICATION_INITIALIZED");
InitializeObjectAttributes(&ObjectAttributes,
&EventName,
OBJ_CASE_INSENSITIVE | OBJ_PERMANENT,
NULL,
NULL);
Status = NtOpenEvent(&EventHandle,
SYNCHRONIZE,
&ObjectAttributes);
if (!NT_SUCCESS(Status))
{
WARN("NtOpenEvent failed (Status 0x%08lx)\n", Status);
Status = NtCreateEvent(&EventHandle,
SYNCHRONIZE,
&ObjectAttributes,
NotificationEvent,
FALSE);
if (!NT_SUCCESS(Status))
{
WARN("NtCreateEvent failed (Status 0x%08lx)\n", Status);
return Status;
}
}
Status = NtWaitForSingleObject(EventHandle,
TRUE,
NULL);
NtClose(EventHandle);
if (!NT_SUCCESS(Status))
{
ERR("NtWaitForSingleObject failed (Status 0x%08lx)\n", Status);
return Status;
}
/* Connect to the authentication port */
RtlInitUnicodeString(&PortName, RtlInitUnicodeString(&PortName,
L"\\LsaAuthenticationPort"); L"\\LsaAuthenticationPort");
@ -248,11 +287,33 @@ LsaGetLogonSessionData(
SessionData = ApiMessage.GetLogonSessionData.Reply.SessionDataBuffer; SessionData = ApiMessage.GetLogonSessionData.Reply.SessionDataBuffer;
TRACE("UserName: %p\n", SessionData->UserName.Buffer);
if (SessionData->UserName.Buffer != NULL) if (SessionData->UserName.Buffer != NULL)
SessionData->UserName.Buffer = (LPWSTR)((ULONG_PTR)&SessionData->UserName.Buffer + (ULONG_PTR)SessionData->UserName.Buffer); SessionData->UserName.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->UserName.Buffer);
TRACE("LogonDomain: %p\n", SessionData->LogonDomain.Buffer);
if (SessionData->LogonDomain.Buffer != NULL)
SessionData->LogonDomain.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->LogonDomain.Buffer);
TRACE("AuthenticationPackage: %p\n", SessionData->AuthenticationPackage.Buffer);
if (SessionData->AuthenticationPackage.Buffer != NULL)
SessionData->AuthenticationPackage.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->AuthenticationPackage.Buffer);
TRACE("Sid: %p\n", SessionData->Sid);
if (SessionData->Sid != NULL) if (SessionData->Sid != NULL)
SessionData->Sid = (LPWSTR)((ULONG_PTR)&SessionData->Sid + (ULONG_PTR)SessionData->Sid); SessionData->Sid = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->Sid);
TRACE("LogonServer: %p\n", SessionData->LogonServer.Buffer);
if (SessionData->LogonServer.Buffer != NULL)
SessionData->LogonServer.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->LogonServer.Buffer);
TRACE("DnsDomainName: %p\n", SessionData->DnsDomainName.Buffer);
if (SessionData->DnsDomainName.Buffer != NULL)
SessionData->DnsDomainName.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->DnsDomainName.Buffer);
TRACE("Upn: %p\n", SessionData->Upn.Buffer);
if (SessionData->Upn.Buffer != NULL)
SessionData->Upn.Buffer = (LPWSTR)((ULONG_PTR)SessionData + (ULONG_PTR)SessionData->Upn.Buffer);
*ppLogonSessionData = SessionData; *ppLogonSessionData = SessionData;

1
reactos/dll/win32/secur32/precomp.h
View file

@ -20,6 +20,7 @@
#include <winnls.h> #include <winnls.h>
#include <winreg.h> #include <winreg.h>
#define NTOS_MODE_USER #define NTOS_MODE_USER
#include <ndk/exfuncs.h>
#include <ndk/rtlfuncs.h> #include <ndk/rtlfuncs.h>
#include <secext.h> #include <secext.h>