Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-22 12:44:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RPCRT4]

Browse source 
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62984
This commit is contained in:
Amine Khaldi 2014-04-26 16:58:18 +00:00
parent 4d0266dc20
commit 03a79f2692
6 changed files with 543 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/rpcrt4/epm.idl
View file

@ -16,4 +16,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma makedep client
#include "wine/epm.idl" #include "wine/epm.idl"

70
reactos/dll/win32/rpcrt4/ndr_marshall.c
View file

@ -789,7 +789,7 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING desc; PFORMAT_STRING desc;
NDR_MARSHALL m; NDR_MARSHALL m;
ULONG pointer_id; ULONG pointer_id;
int pointer_needs_marshaling; BOOL pointer_needs_marshaling;
TRACE("(%p,%p,%p,%p)\n", pStubMsg, Buffer, Pointer, pFormat); TRACE("(%p,%p,%p,%p)\n", pStubMsg, Buffer, Pointer, pFormat);
TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr);
@ -804,14 +804,14 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
ERR("NULL ref pointer is not allowed\n"); ERR("NULL ref pointer is not allowed\n");
RpcRaiseException(RPC_X_NULL_REF_POINTER); RpcRaiseException(RPC_X_NULL_REF_POINTER);
} }
pointer_needs_marshaling = 1; pointer_needs_marshaling = TRUE;
break; break;
case RPC_FC_UP: /* unique pointer */ case RPC_FC_UP: /* unique pointer */
case RPC_FC_OP: /* object pointer - same as unique here */ case RPC_FC_OP: /* object pointer - same as unique here */
if (Pointer) if (Pointer)
pointer_needs_marshaling = 1; pointer_needs_marshaling = TRUE;
else else
pointer_needs_marshaling = 0; pointer_needs_marshaling = FALSE;
pointer_id = Pointer ? NDR_POINTER_ID(pStubMsg) : 0; pointer_id = Pointer ? NDR_POINTER_ID(pStubMsg) : 0;
TRACE("writing 0x%08x to buffer\n", pointer_id); TRACE("writing 0x%08x to buffer\n", pointer_id);
NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id); NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id);
@ -857,7 +857,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING desc; PFORMAT_STRING desc;
NDR_UNMARSHALL m; NDR_UNMARSHALL m;
DWORD pointer_id = 0; DWORD pointer_id = 0;
int pointer_needs_unmarshaling; BOOL pointer_needs_unmarshaling;
TRACE("(%p,%p,%p,%p,%p,%d)\n", pStubMsg, Buffer, pPointer, pSrcPointer, pFormat, fMustAlloc); TRACE("(%p,%p,%p,%p,%p,%d)\n", pStubMsg, Buffer, pPointer, pSrcPointer, pFormat, fMustAlloc);
TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr);
@ -867,16 +867,16 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
switch (type) { switch (type) {
case RPC_FC_RP: /* ref pointer (always non-null) */ case RPC_FC_RP: /* ref pointer (always non-null) */
pointer_needs_unmarshaling = 1; pointer_needs_unmarshaling = TRUE;
break; break;
case RPC_FC_UP: /* unique pointer */ case RPC_FC_UP: /* unique pointer */
pointer_id = NDR_LOCAL_UINT32_READ(Buffer); pointer_id = NDR_LOCAL_UINT32_READ(Buffer);
TRACE("pointer_id is 0x%08x\n", pointer_id); TRACE("pointer_id is 0x%08x\n", pointer_id);
if (pointer_id) if (pointer_id)
pointer_needs_unmarshaling = 1; pointer_needs_unmarshaling = TRUE;
else { else {
*pPointer = NULL; *pPointer = NULL;
pointer_needs_unmarshaling = 0; pointer_needs_unmarshaling = FALSE;
} }
break; break;
case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ case RPC_FC_OP: /* object pointer - we must free data before overwriting it */
@ -888,11 +888,11 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
fMustAlloc = TRUE; fMustAlloc = TRUE;
} }
if (pointer_id) if (pointer_id)
pointer_needs_unmarshaling = 1; pointer_needs_unmarshaling = TRUE;
else else
{ {
*pPointer = NULL; *pPointer = NULL;
pointer_needs_unmarshaling = 0; pointer_needs_unmarshaling = FALSE;
} }
break; break;
case RPC_FC_FP: case RPC_FC_FP:
@ -972,7 +972,7 @@ static void PointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
unsigned type = pFormat[0], attr = pFormat[1]; unsigned type = pFormat[0], attr = pFormat[1];
PFORMAT_STRING desc; PFORMAT_STRING desc;
NDR_BUFFERSIZE m; NDR_BUFFERSIZE m;
int pointer_needs_sizing; BOOL pointer_needs_sizing;
ULONG pointer_id; ULONG pointer_id;
TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat);
@ -1027,7 +1027,7 @@ static ULONG PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING desc; PFORMAT_STRING desc;
NDR_MEMORYSIZE m; NDR_MEMORYSIZE m;
DWORD pointer_id = 0; DWORD pointer_id = 0;
int pointer_needs_sizing; BOOL pointer_needs_sizing;
TRACE("(%p,%p,%p)\n", pStubMsg, Buffer, pFormat); TRACE("(%p,%p,%p)\n", pStubMsg, Buffer, pFormat);
TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr);
@ -1037,16 +1037,16 @@ static ULONG PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
switch (type) { switch (type) {
case RPC_FC_RP: /* ref pointer (always non-null) */ case RPC_FC_RP: /* ref pointer (always non-null) */
pointer_needs_sizing = 1; pointer_needs_sizing = TRUE;
break; break;
case RPC_FC_UP: /* unique pointer */ case RPC_FC_UP: /* unique pointer */
case RPC_FC_OP: /* object pointer - we must free data before overwriting it */ case RPC_FC_OP: /* object pointer - we must free data before overwriting it */
pointer_id = NDR_LOCAL_UINT32_READ(Buffer); pointer_id = NDR_LOCAL_UINT32_READ(Buffer);
TRACE("pointer_id is 0x%08x\n", pointer_id); TRACE("pointer_id is 0x%08x\n", pointer_id);
if (pointer_id) if (pointer_id)
pointer_needs_sizing = 1; pointer_needs_sizing = TRUE;
else else
pointer_needs_sizing = 0; pointer_needs_sizing = FALSE;
break; break;
case RPC_FC_FP: case RPC_FC_FP:
{ {
@ -1193,7 +1193,7 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; unsigned char *bufptr = bufbase + *(const SHORT*)&info[2];
unsigned char *saved_memory = pStubMsg->Memory; unsigned char *saved_memory = pStubMsg->Memory;
pStubMsg->Memory = membase; pStubMsg->Memory = pMemory;
PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4); PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4);
pStubMsg->Memory = saved_memory; pStubMsg->Memory = saved_memory;
} }
@ -1347,7 +1347,7 @@ static void EmbeddedPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg,
unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *memptr = membase + *(const SHORT*)&info[0];
unsigned char *saved_memory = pStubMsg->Memory; unsigned char *saved_memory = pStubMsg->Memory;
pStubMsg->Memory = membase; pStubMsg->Memory = pMemory;
PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4); PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4);
pStubMsg->Memory = saved_memory; pStubMsg->Memory = saved_memory;
} }
@ -2874,7 +2874,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg,
case RPC_FC_POINTER: case RPC_FC_POINTER:
{ {
unsigned char *saved_buffer; unsigned char *saved_buffer;
int pointer_buffer_mark_set = 0; BOOL pointer_buffer_mark_set = FALSE;
TRACE("pointer=%p <= %p\n", *(unsigned char**)pMemory, pMemory); TRACE("pointer=%p <= %p\n", *(unsigned char**)pMemory, pMemory);
TRACE("pStubMsg->Buffer before %p\n", pStubMsg->Buffer); TRACE("pStubMsg->Buffer before %p\n", pStubMsg->Buffer);
if (*pFormat != RPC_FC_POINTER) if (*pFormat != RPC_FC_POINTER)
@ -2886,7 +2886,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg,
{ {
pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->Buffer = pStubMsg->PointerBufferMark;
pStubMsg->PointerBufferMark = NULL; pStubMsg->PointerBufferMark = NULL;
pointer_buffer_mark_set = 1; pointer_buffer_mark_set = TRUE;
} }
else if (*pPointer != RPC_FC_RP) else if (*pPointer != RPC_FC_RP)
safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ safe_buffer_increment(pStubMsg, 4); /* for pointer ID */
@ -3043,7 +3043,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
case RPC_FC_POINTER: case RPC_FC_POINTER:
{ {
unsigned char *saved_buffer; unsigned char *saved_buffer;
int pointer_buffer_mark_set = 0; BOOL pointer_buffer_mark_set = FALSE;
TRACE("pointer => %p\n", pMemory); TRACE("pointer => %p\n", pMemory);
if (*pFormat != RPC_FC_POINTER) if (*pFormat != RPC_FC_POINTER)
pPointer = pFormat; pPointer = pFormat;
@ -3054,7 +3054,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
{ {
pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->Buffer = pStubMsg->PointerBufferMark;
pStubMsg->PointerBufferMark = NULL; pStubMsg->PointerBufferMark = NULL;
pointer_buffer_mark_set = 1; pointer_buffer_mark_set = TRUE;
} }
else if (*pPointer != RPC_FC_RP) else if (*pPointer != RPC_FC_RP)
safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ safe_buffer_increment(pStubMsg, 4); /* for pointer ID */
@ -3408,7 +3408,7 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
case RPC_FC_POINTER: case RPC_FC_POINTER:
{ {
unsigned char *saved_buffer; unsigned char *saved_buffer;
int pointer_buffer_mark_set = 0; BOOL pointer_buffer_mark_set = FALSE;
if (*pFormat != RPC_FC_POINTER) if (*pFormat != RPC_FC_POINTER)
pPointer = pFormat; pPointer = pFormat;
if (*pPointer != RPC_FC_RP) if (*pPointer != RPC_FC_RP)
@ -3418,7 +3418,7 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg,
{ {
pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->Buffer = pStubMsg->PointerBufferMark;
pStubMsg->PointerBufferMark = NULL; pStubMsg->PointerBufferMark = NULL;
pointer_buffer_mark_set = 1; pointer_buffer_mark_set = TRUE;
} }
else if (*pPointer != RPC_FC_RP) else if (*pPointer != RPC_FC_RP)
safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ safe_buffer_increment(pStubMsg, 4); /* for pointer ID */
@ -3564,7 +3564,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING conf_array = NULL; PFORMAT_STRING conf_array = NULL;
PFORMAT_STRING pointer_desc = NULL; PFORMAT_STRING pointer_desc = NULL;
unsigned char *OldMemory = pStubMsg->Memory; unsigned char *OldMemory = pStubMsg->Memory;
int pointer_buffer_mark_set = 0; BOOL pointer_buffer_mark_set = FALSE;
ULONG count = 0; ULONG count = 0;
ULONG max_count = 0; ULONG max_count = 0;
ULONG offset = 0; ULONG offset = 0;
@ -3587,7 +3587,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,
/* save it for use by embedded pointer code later */ /* save it for use by embedded pointer code later */
pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength;
TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - pStubMsg->Buffer)); TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - pStubMsg->Buffer));
pointer_buffer_mark_set = 1; pointer_buffer_mark_set = TRUE;
/* restore the original buffer length */ /* restore the original buffer length */
pStubMsg->BufferLength = saved_buffer_length; pStubMsg->BufferLength = saved_buffer_length;
@ -3650,7 +3650,7 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
PFORMAT_STRING conf_array = NULL; PFORMAT_STRING conf_array = NULL;
PFORMAT_STRING pointer_desc = NULL; PFORMAT_STRING pointer_desc = NULL;
unsigned char *pMemory; unsigned char *pMemory;
int pointer_buffer_mark_set = 0; BOOL pointer_buffer_mark_set = FALSE;
ULONG count = 0; ULONG count = 0;
ULONG max_count = 0; ULONG max_count = 0;
ULONG offset = 0; ULONG offset = 0;
@ -3673,7 +3673,7 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
/* save it for use by embedded pointer code later */ /* save it for use by embedded pointer code later */
pStubMsg->PointerBufferMark = pStubMsg->Buffer; pStubMsg->PointerBufferMark = pStubMsg->Buffer;
TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - saved_buffer)); TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - saved_buffer));
pointer_buffer_mark_set = 1; pointer_buffer_mark_set = TRUE;
/* restore the original buffer */ /* restore the original buffer */
pStubMsg->Buffer = saved_buffer; pStubMsg->Buffer = saved_buffer;
@ -4113,7 +4113,7 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
unsigned char *pMemory, unsigned char *pMemory,
PFORMAT_STRING pFormat) PFORMAT_STRING pFormat)
{ {
int pointer_buffer_mark_set = 0; BOOL pointer_buffer_mark_set = FALSE;
TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat);
@ -4144,7 +4144,7 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg,
/* save it for use by embedded pointer code later */ /* save it for use by embedded pointer code later */
pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength;
TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer)); TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer));
pointer_buffer_mark_set = 1; pointer_buffer_mark_set = TRUE;
/* restore fields */ /* restore fields */
pStubMsg->ActualCount = saved_actual_count; pStubMsg->ActualCount = saved_actual_count;
@ -4177,7 +4177,7 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
unsigned char fMustAlloc) unsigned char fMustAlloc)
{ {
unsigned char *saved_buffer; unsigned char *saved_buffer;
int pointer_buffer_mark_set = 0; BOOL pointer_buffer_mark_set = FALSE;
int saved_ignore_embedded; int saved_ignore_embedded;
TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc);
@ -4204,7 +4204,7 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
{ {
/* save it for use by embedded pointer code later */ /* save it for use by embedded pointer code later */
pStubMsg->PointerBufferMark = pStubMsg->Buffer; pStubMsg->PointerBufferMark = pStubMsg->Buffer;
pointer_buffer_mark_set = 1; pointer_buffer_mark_set = TRUE;
} }
/* restore the original buffer */ /* restore the original buffer */
pStubMsg->Buffer = saved_buffer; pStubMsg->Buffer = saved_buffer;
@ -5702,7 +5702,7 @@ static unsigned char *union_arm_marshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned c
if (m) if (m)
{ {
unsigned char *saved_buffer = NULL; unsigned char *saved_buffer = NULL;
int pointer_buffer_mark_set = 0; BOOL pointer_buffer_mark_set = FALSE;
switch(*desc) switch(*desc)
{ {
case RPC_FC_RP: case RPC_FC_RP:
@ -5715,7 +5715,7 @@ static unsigned char *union_arm_marshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned c
{ {
pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->Buffer = pStubMsg->PointerBufferMark;
pStubMsg->PointerBufferMark = NULL; pStubMsg->PointerBufferMark = NULL;
pointer_buffer_mark_set = 1; pointer_buffer_mark_set = TRUE;
} }
else else
safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ safe_buffer_increment(pStubMsg, 4); /* for pointer ID */
@ -5770,7 +5770,7 @@ static unsigned char *union_arm_unmarshall(PMIDL_STUB_MESSAGE pStubMsg,
if (m) if (m)
{ {
unsigned char *saved_buffer = NULL; unsigned char *saved_buffer = NULL;
int pointer_buffer_mark_set = 0; BOOL pointer_buffer_mark_set = FALSE;
switch(*desc) switch(*desc)
{ {
case RPC_FC_RP: case RPC_FC_RP:
@ -5783,7 +5783,7 @@ static unsigned char *union_arm_unmarshall(PMIDL_STUB_MESSAGE pStubMsg,
{ {
pStubMsg->Buffer = pStubMsg->PointerBufferMark; pStubMsg->Buffer = pStubMsg->PointerBufferMark;
pStubMsg->PointerBufferMark = NULL; pStubMsg->PointerBufferMark = NULL;
pointer_buffer_mark_set = 1; pointer_buffer_mark_set = TRUE;
} }
else else
pStubMsg->Buffer += 4; /* for pointer ID */ pStubMsg->Buffer += 4; /* for pointer ID */

6
reactos/dll/win32/rpcrt4/rpc_message.c
View file

@ -60,20 +60,20 @@ DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header)
return ret; return ret;
} }
static int packet_has_body(const RpcPktHdr *Header) static BOOL packet_has_body(const RpcPktHdr *Header)
{ {
return (Header->common.ptype == PKT_FAULT) || return (Header->common.ptype == PKT_FAULT) ||
(Header->common.ptype == PKT_REQUEST) || (Header->common.ptype == PKT_REQUEST) ||
(Header->common.ptype == PKT_RESPONSE); (Header->common.ptype == PKT_RESPONSE);
} }
static int packet_has_auth_verifier(const RpcPktHdr *Header) static BOOL packet_has_auth_verifier(const RpcPktHdr *Header)
{ {
return !(Header->common.ptype == PKT_BIND_NACK) && return !(Header->common.ptype == PKT_BIND_NACK) &&
!(Header->common.ptype == PKT_SHUTDOWN); !(Header->common.ptype == PKT_SHUTDOWN);
} }
static int packet_does_auth_negotiation(const RpcPktHdr *Header) static BOOL packet_does_auth_negotiation(const RpcPktHdr *Header)
{ {
switch (Header->common.ptype) switch (Header->common.ptype)
{ {

570
reactos/dll/win32/rpcrt4/rpc_transport.c
View file

@ -79,6 +79,8 @@
#define DEFAULT_NCACN_HTTP_TIMEOUT (60 * 1000) #define DEFAULT_NCACN_HTTP_TIMEOUT (60 * 1000)
#define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0]))
WINE_DEFAULT_DEBUG_CHANNEL(rpc); WINE_DEFAULT_DEBUG_CHANNEL(rpc);
static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection); static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnection* OldConnection);
@ -136,6 +138,24 @@ static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc)
} }
} }
#ifndef __REACTOS__
static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc)
{
if (npc->listening)
return RPC_S_OK;
npc->listening = TRUE;
npc->listen_thread = CreateThread(NULL, 0, listen_thread, npc, 0, NULL);
if (!npc->listen_thread)
{
npc->listening = FALSE;
ERR("Couldn't create listen thread (error was %d)\n", GetLastError());
return RPC_S_OUT_OF_RESOURCES;
}
return RPC_S_OK;
}
#endif
static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname)
{ {
RpcConnection_np *npc = (RpcConnection_np *) Connection; RpcConnection_np *npc = (RpcConnection_np *) Connection;
@ -1909,6 +1929,19 @@ static RPC_STATUS wait_async_request(RpcHttpAsyncData *async_data, BOOL call_ret
return RPC_S_OK; return RPC_S_OK;
} }
struct authinfo
{
DWORD scheme;
CredHandle cred;
CtxtHandle ctx;
TimeStamp exp;
ULONG attr;
ULONG max_token;
char *data;
unsigned int data_len;
BOOL finished; /* finished authenticating */
};
typedef struct _RpcConnection_http typedef struct _RpcConnection_http
{ {
RpcConnection common; RpcConnection common;
@ -1916,6 +1949,7 @@ typedef struct _RpcConnection_http
HINTERNET session; HINTERNET session;
HINTERNET in_request; HINTERNET in_request;
HINTERNET out_request; HINTERNET out_request;
WCHAR *servername;
HANDLE timer_cancelled; HANDLE timer_cancelled;
HANDLE cancel_event; HANDLE cancel_event;
DWORD last_sent_time; DWORD last_sent_time;
@ -2176,14 +2210,14 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc)
HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, password);
HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, user);
HeapFree(GetProcessHeap(), 0, proxy); HeapFree(GetProcessHeap(), 0, proxy);
HeapFree(GetProcessHeap(), 0, servername);
if (!httpc->session) if (!httpc->session)
{ {
ERR("InternetConnectW failed with error %d\n", GetLastError()); ERR("InternetConnectW failed with error %d\n", GetLastError());
HeapFree(GetProcessHeap(), 0, servername);
return RPC_S_SERVER_UNAVAILABLE; return RPC_S_SERVER_UNAVAILABLE;
} }
httpc->servername = servername;
return RPC_S_OK; return RPC_S_OK;
} }
@ -2194,6 +2228,8 @@ static RPC_STATUS send_echo_request(HINTERNET req, RpcHttpAsyncData *async_data,
BOOL ret; BOOL ret;
RPC_STATUS status; RPC_STATUS status;
TRACE("sending echo request to server\n");
prepare_async_request(async_data); prepare_async_request(async_data);
ret = HttpSendRequestW(req, NULL, 0, NULL, 0); ret = HttpSendRequestW(req, NULL, 0, NULL, 0);
status = wait_async_request(async_data, ret, cancel_event); status = wait_async_request(async_data, ret, cancel_event);
@ -2210,9 +2246,8 @@ static RPC_STATUS send_echo_request(HINTERNET req, RpcHttpAsyncData *async_data,
/* prepare the in pipe for use by RPC packets */ /* prepare the in pipe for use by RPC packets */
static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsyncData *async_data, HANDLE cancel_event, static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsyncData *async_data, HANDLE cancel_event,
const UUID *connection_uuid, const UUID *connection_uuid, const UUID *in_pipe_uuid,
const UUID *in_pipe_uuid, const UUID *association_uuid, BOOL authorized)
const UUID *association_uuid)
{ {
BOOL ret; BOOL ret;
RPC_STATUS status; RPC_STATUS status;
@ -2220,10 +2255,12 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync
INTERNET_BUFFERSW buffers_in; INTERNET_BUFFERSW buffers_in;
DWORD bytes_written; DWORD bytes_written;
/* prepare in pipe */ if (!authorized)
{
/* ask wininet to authorize, if necessary */
status = send_echo_request(in_request, async_data, cancel_event); status = send_echo_request(in_request, async_data, cancel_event);
if (status != RPC_S_OK) return status; if (status != RPC_S_OK) return status;
}
memset(&buffers_in, 0, sizeof(buffers_in)); memset(&buffers_in, 0, sizeof(buffers_in));
buffers_in.dwStructSize = sizeof(buffers_in); buffers_in.dwStructSize = sizeof(buffers_in);
/* FIXME: get this from the registry */ /* FIXME: get this from the registry */
@ -2293,12 +2330,10 @@ static RPC_STATUS rpcrt4_http_read_http_packet(HINTERNET request, RpcPktHdr *hdr
} }
/* prepare the out pipe for use by RPC packets */ /* prepare the out pipe for use by RPC packets */
static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsyncData *async_data,
RpcHttpAsyncData *async_data, HANDLE cancel_event, const UUID *connection_uuid,
HANDLE cancel_event, const UUID *out_pipe_uuid, ULONG *flow_control_increment,
const UUID *connection_uuid, BOOL authorized)
const UUID *out_pipe_uuid,
ULONG *flow_control_increment)
{ {
BOOL ret; BOOL ret;
RPC_STATUS status; RPC_STATUS status;
@ -2306,13 +2341,22 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request,
BYTE *data_from_server; BYTE *data_from_server;
RpcPktHdr pkt_from_server; RpcPktHdr pkt_from_server;
ULONG field1, field3; ULONG field1, field3;
DWORD bytes_read;
BYTE buf[20];
if (!authorized)
{
/* ask wininet to authorize, if necessary */
status = send_echo_request(out_request, async_data, cancel_event); status = send_echo_request(out_request, async_data, cancel_event);
if (status != RPC_S_OK) return status; if (status != RPC_S_OK) return status;
}
else
InternetReadFile(out_request, buf, sizeof(buf), &bytes_read);
hdr = RPCRT4_BuildHttpConnectHeader(TRUE, connection_uuid, out_pipe_uuid, NULL); hdr = RPCRT4_BuildHttpConnectHeader(TRUE, connection_uuid, out_pipe_uuid, NULL);
if (!hdr) return RPC_S_OUT_OF_RESOURCES; if (!hdr) return RPC_S_OUT_OF_RESOURCES;
TRACE("sending HTTP connect header to server\n");
prepare_async_request(async_data); prepare_async_request(async_data);
ret = HttpSendRequestW(out_request, NULL, 0, hdr, hdr->common.frag_len); ret = HttpSendRequestW(out_request, NULL, 0, hdr, hdr->common.frag_len);
status = wait_async_request(async_data, ret, cancel_event); status = wait_async_request(async_data, ret, cancel_event);
@ -2359,7 +2403,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request,
static UINT encode_base64(const char *bin, unsigned int len, WCHAR *base64) static UINT encode_base64(const char *bin, unsigned int len, WCHAR *base64)
{ {
static char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; static const char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
UINT i = 0, x; UINT i = 0, x;
while (len > 0) while (len > 0)
@ -2397,55 +2441,392 @@ static UINT encode_base64(const char *bin, unsigned int len, WCHAR *base64)
return i; return i;
} }
static RPC_STATUS insert_authorization_header(HINTERNET request, RpcQualityOfService *qos) static inline char decode_char( WCHAR c )
{ {
static const WCHAR basicW[] = if (c >= 'A' && c <= 'Z') return c - 'A';
{'A','u','t','h','o','r','i','z','a','t','i','o','n',':',' ','B','a','s','i','c',' '}; if (c >= 'a' && c <= 'z') return c - 'a' + 26;
RPC_HTTP_TRANSPORT_CREDENTIALS_W *creds; if (c >= '0' && c <= '9') return c - '0' + 52;
SEC_WINNT_AUTH_IDENTITY_W *id; if (c == '+') return 62;
int len, datalen, userlen, passlen; if (c == '/') return 63;
WCHAR *header, *ptr; return 64;
char *data; }
static unsigned int decode_base64( const WCHAR *base64, unsigned int len, char *buf )
{
unsigned int i = 0;
char c0, c1, c2, c3;
const WCHAR *p = base64;
while (len > 4)
{
if ((c0 = decode_char( p[0] )) > 63) return 0;
if ((c1 = decode_char( p[1] )) > 63) return 0;
if ((c2 = decode_char( p[2] )) > 63) return 0;
if ((c3 = decode_char( p[3] )) > 63) return 0;
if (buf)
{
buf[i + 0] = (c0 << 2) | (c1 >> 4);
buf[i + 1] = (c1 << 4) | (c2 >> 2);
buf[i + 2] = (c2 << 6) | c3;
}
len -= 4;
i += 3;
p += 4;
}
if (p[2] == '=')
{
if ((c0 = decode_char( p[0] )) > 63) return 0;
if ((c1 = decode_char( p[1] )) > 63) return 0;
if (buf) buf[i] = (c0 << 2) | (c1 >> 4);
i++;
}
else if (p[3] == '=')
{
if ((c0 = decode_char( p[0] )) > 63) return 0;
if ((c1 = decode_char( p[1] )) > 63) return 0;
if ((c2 = decode_char( p[2] )) > 63) return 0;
if (buf)
{
buf[i + 0] = (c0 << 2) | (c1 >> 4);
buf[i + 1] = (c1 << 4) | (c2 >> 2);
}
i += 2;
}
else
{
if ((c0 = decode_char( p[0] )) > 63) return 0;
if ((c1 = decode_char( p[1] )) > 63) return 0;
if ((c2 = decode_char( p[2] )) > 63) return 0;
if ((c3 = decode_char( p[3] )) > 63) return 0;
if (buf)
{
buf[i + 0] = (c0 << 2) | (c1 >> 4);
buf[i + 1] = (c1 << 4) | (c2 >> 2);
buf[i + 2] = (c2 << 6) | c3;
}
i += 3;
}
return i;
}
static struct authinfo *alloc_authinfo(void)
{
struct authinfo *ret;
if (!(ret = HeapAlloc(GetProcessHeap(), 0, sizeof(*ret) ))) return NULL;
SecInvalidateHandle(&ret->cred);
SecInvalidateHandle(&ret->ctx);
memset(&ret->exp, 0, sizeof(ret->exp));
ret->scheme = 0;
ret->attr = 0;
ret->max_token = 0;
ret->data = NULL;
ret->data_len = 0;
ret->finished = FALSE;
return ret;
}
static void destroy_authinfo(struct authinfo *info)
{
if (!info) return;
if (SecIsValidHandle(&info->ctx))
DeleteSecurityContext(&info->ctx);
if (SecIsValidHandle(&info->cred))
FreeCredentialsHandle(&info->cred);
HeapFree(GetProcessHeap(), 0, info->data);
HeapFree(GetProcessHeap(), 0, info);
}
static const WCHAR basicW[] = {'B','a','s','i','c',0};
static const WCHAR ntlmW[] = {'N','T','L','M',0};
static const WCHAR passportW[] = {'P','a','s','s','p','o','r','t',0};
static const WCHAR digestW[] = {'D','i','g','e','s','t',0};
static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0};
static const struct
{
const WCHAR *str;
unsigned int len;
DWORD scheme;
}
auth_schemes[] =
{
{ basicW, ARRAYSIZE(basicW) - 1, RPC_C_HTTP_AUTHN_SCHEME_BASIC },
{ ntlmW, ARRAYSIZE(ntlmW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NTLM },
{ passportW, ARRAYSIZE(passportW) - 1, RPC_C_HTTP_AUTHN_SCHEME_PASSPORT },
{ digestW, ARRAYSIZE(digestW) - 1, RPC_C_HTTP_AUTHN_SCHEME_DIGEST },
{ negotiateW, ARRAYSIZE(negotiateW) - 1, RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE }
};
static const unsigned int num_auth_schemes = sizeof(auth_schemes)/sizeof(auth_schemes[0]);
static DWORD auth_scheme_from_header( const WCHAR *header )
{
unsigned int i;
for (i = 0; i < num_auth_schemes; i++)
{
if (!strncmpiW( header, auth_schemes[i].str, auth_schemes[i].len ) &&
(header[auth_schemes[i].len] == ' ' || !header[auth_schemes[i].len])) return auth_schemes[i].scheme;
}
return 0;
}
static BOOL get_authvalue(HINTERNET request, DWORD scheme, WCHAR *buffer, DWORD buflen)
{
DWORD len, index = 0;
for (;;)
{
len = buflen;
if (!HttpQueryInfoW(request, HTTP_QUERY_WWW_AUTHENTICATE, buffer, &len, &index)) return FALSE;
if (auth_scheme_from_header(buffer) == scheme) break;
}
return TRUE;
}
static RPC_STATUS do_authorization(HINTERNET request, SEC_WCHAR *servername,
const RPC_HTTP_TRANSPORT_CREDENTIALS_W *creds, struct authinfo **auth_ptr)
{
struct authinfo *info = *auth_ptr;
SEC_WINNT_AUTH_IDENTITY_W *id = creds->TransportCredentials;
RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE;
if (!qos || qos->qos->AdditionalSecurityInfoType != RPC_C_AUTHN_INFO_TYPE_HTTP) if ((!info && !(info = alloc_authinfo()))) return RPC_S_SERVER_UNAVAILABLE;
return RPC_S_OK;
creds = qos->qos->u.HttpCredentials; switch (creds->AuthnSchemes[0])
if (creds->AuthenticationTarget != RPC_C_HTTP_AUTHN_TARGET_SERVER || !creds->NumberOfAuthnSchemes)
return RPC_S_OK;
if (creds->AuthnSchemes[0] != RPC_C_HTTP_AUTHN_SCHEME_BASIC)
{ {
FIXME("scheme %u not supported\n", creds->AuthnSchemes[0]); case RPC_C_HTTP_AUTHN_SCHEME_BASIC:
return RPC_S_OK; {
int userlen = WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, NULL, 0, NULL, NULL);
int passlen = WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, NULL, 0, NULL, NULL);
info->data_len = userlen + passlen + 1;
if (!(info->data = HeapAlloc(GetProcessHeap(), 0, info->data_len)))
{
status = RPC_S_OUT_OF_MEMORY;
break;
} }
id = creds->TransportCredentials; WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, info->data, userlen, NULL, NULL);
if (!id->User || !id->Password) return RPC_S_OK; info->data[userlen] = ':';
WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, info->data + userlen + 1, passlen, NULL, NULL);
userlen = WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, NULL, 0, NULL, NULL); info->scheme = RPC_C_HTTP_AUTHN_SCHEME_BASIC;
passlen = WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, NULL, 0, NULL, NULL); info->finished = TRUE;
status = RPC_S_OK;
datalen = userlen + passlen + 1; break;
if (!(data = HeapAlloc(GetProcessHeap(), 0, datalen))) return RPC_S_OUT_OF_MEMORY; }
case RPC_C_HTTP_AUTHN_SCHEME_NTLM:
WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, data, userlen, NULL, NULL); case RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE:
data[userlen] = ':';
WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, data + userlen + 1, passlen, NULL, NULL);
len = ((datalen + 2) * 4) / 3;
if ((header = HeapAlloc(GetProcessHeap(), 0, sizeof(basicW) + (len + 2) * sizeof(WCHAR))))
{ {
memcpy(header, basicW, sizeof(basicW));
ptr = header + sizeof(basicW) / sizeof(basicW[0]); static SEC_WCHAR ntlmW[] = {'N','T','L','M',0}, negotiateW[] = {'N','e','g','o','t','i','a','t','e',0};
len = encode_base64(data, datalen, ptr); SECURITY_STATUS ret;
SecBufferDesc out_desc, in_desc;
SecBuffer out, in;
ULONG flags = ISC_REQ_CONNECTION|ISC_REQ_USE_DCE_STYLE|ISC_REQ_MUTUAL_AUTH|ISC_REQ_DELEGATE;
SEC_WCHAR *scheme;
int scheme_len;
const WCHAR *p;
WCHAR auth_value[2048];
DWORD size = sizeof(auth_value);
BOOL first = FALSE;
if (creds->AuthnSchemes[0] == RPC_C_HTTP_AUTHN_SCHEME_NTLM) scheme = ntlmW;
else scheme = negotiateW;
scheme_len = strlenW( scheme );
if (!*auth_ptr)
{
TimeStamp exp;
SecPkgInfoW *pkg_info;
ret = AcquireCredentialsHandleW(NULL, scheme, SECPKG_CRED_OUTBOUND, NULL, id, NULL, NULL, &info->cred, &exp);
if (ret != SEC_E_OK) break;
ret = QuerySecurityPackageInfoW(scheme, &pkg_info);
if (ret != SEC_E_OK) break;
info->max_token = pkg_info->cbMaxToken;
FreeContextBuffer(pkg_info);
first = TRUE;
}
else
{
if (info->finished || !get_authvalue(request, creds->AuthnSchemes[0], auth_value, size)) break;
if (auth_scheme_from_header(auth_value) != info->scheme)
{
ERR("authentication scheme changed\n");
break;
}
}
in.BufferType = SECBUFFER_TOKEN;
in.cbBuffer = 0;
in.pvBuffer = NULL;
in_desc.ulVersion = 0;
in_desc.cBuffers = 1;
in_desc.pBuffers = &in;
p = auth_value + scheme_len;
if (!first && *p == ' ')
{
int len = strlenW(++p);
in.cbBuffer = decode_base64(p, len, NULL);
if (!(in.pvBuffer = HeapAlloc(GetProcessHeap(), 0, in.cbBuffer))) break;
decode_base64(p, len, in.pvBuffer);
}
out.BufferType = SECBUFFER_TOKEN;
out.cbBuffer = info->max_token;
if (!(out.pvBuffer = HeapAlloc(GetProcessHeap(), 0, out.cbBuffer)))
{
HeapFree(GetProcessHeap(), 0, in.pvBuffer);
break;
}
out_desc.ulVersion = 0;
out_desc.cBuffers = 1;
out_desc.pBuffers = &out;
ret = InitializeSecurityContextW(first ? &info->cred : NULL, first ? NULL : &info->ctx,
first ? servername : NULL, flags, 0, SECURITY_NETWORK_DREP,
in.pvBuffer ? &in_desc : NULL, 0, &info->ctx, &out_desc,
&info->attr, &info->exp);
HeapFree(GetProcessHeap(), 0, in.pvBuffer);
if (ret == SEC_E_OK)
{
HeapFree(GetProcessHeap(), 0, info->data);
info->data = out.pvBuffer;
info->data_len = out.cbBuffer;
info->finished = TRUE;
TRACE("sending last auth packet\n");
status = RPC_S_OK;
}
else if (ret == SEC_I_CONTINUE_NEEDED)
{
HeapFree(GetProcessHeap(), 0, info->data);
info->data = out.pvBuffer;
info->data_len = out.cbBuffer;
TRACE("sending next auth packet\n");
status = RPC_S_OK;
}
else
{
ERR("InitializeSecurityContextW failed with error 0x%08x\n", ret);
HeapFree(GetProcessHeap(), 0, out.pvBuffer);
break;
}
info->scheme = creds->AuthnSchemes[0];
break;
}
default:
FIXME("scheme %u not supported\n", creds->AuthnSchemes[0]);
break;
}
if (status != RPC_S_OK)
{
destroy_authinfo(info);
*auth_ptr = NULL;
return status;
}
*auth_ptr = info;
return RPC_S_OK;
}
static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, char *data, int data_len)
{
static const WCHAR authW[] = {'A','u','t','h','o','r','i','z','a','t','i','o','n',':',' '};
static const WCHAR basicW[] = {'B','a','s','i','c',' '};
static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',' '};
static const WCHAR ntlmW[] = {'N','T','L','M',' '};
int scheme_len, auth_len = sizeof(authW) / sizeof(authW[0]), len = ((data_len + 2) * 4) / 3;
const WCHAR *scheme_str;
WCHAR *header, *ptr;
RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE;
switch (scheme)
{
case RPC_C_HTTP_AUTHN_SCHEME_BASIC:
scheme_str = basicW;
scheme_len = sizeof(basicW) / sizeof(basicW[0]);
break;
case RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE:
scheme_str = negotiateW;
scheme_len = sizeof(negotiateW) / sizeof(negotiateW[0]);
break;
case RPC_C_HTTP_AUTHN_SCHEME_NTLM:
scheme_str = ntlmW;
scheme_len = sizeof(ntlmW) / sizeof(ntlmW[0]);
break;
default:
ERR("unknown scheme %u\n", scheme);
return RPC_S_SERVER_UNAVAILABLE;
}
if ((header = HeapAlloc(GetProcessHeap(), 0, (auth_len + scheme_len + len + 2) * sizeof(WCHAR))))
{
memcpy(header, authW, auth_len * sizeof(WCHAR));
ptr = header + auth_len;
memcpy(ptr, scheme_str, scheme_len * sizeof(WCHAR));
ptr += scheme_len;
len = encode_base64(data, data_len, ptr);
ptr[len++] = '\r'; ptr[len++] = '\r';
ptr[len++] = '\n'; ptr[len++] = '\n';
ptr[len] = 0; ptr[len] = 0;
if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_ADD_IF_NEW))) status = RPC_S_OK; if (HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_ADD|HTTP_ADDREQ_FLAG_REPLACE))
status = RPC_S_OK;
HeapFree(GetProcessHeap(), 0, header); HeapFree(GetProcessHeap(), 0, header);
} }
HeapFree(GetProcessHeap(), 0, data); return status;
}
static void drain_content(HINTERNET request)
{
DWORD count, len = 0, size = sizeof(len);
char buf[2048];
HttpQueryInfoW(request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, &len, &size, NULL);
if (!len) return;
for (;;)
{
count = min(sizeof(buf), len);
if (!InternetReadFile(request, buf, count, &count) || !count) return;
len -= count;
}
}
static RPC_STATUS authorize_request(RpcConnection_http *httpc, HINTERNET request)
{
static const WCHAR authW[] = {'A','u','t','h','o','r','i','z','a','t','i','o','n',':','\r','\n',0};
struct authinfo *info = NULL;
RPC_STATUS status;
BOOL ret;
for (;;)
{
status = do_authorization(request, httpc->servername, httpc->common.QOS->qos->u.HttpCredentials, &info);
if (status != RPC_S_OK) break;
status = insert_authorization_header(request, info->scheme, info->data, info->data_len);
if (status != RPC_S_OK) break;
prepare_async_request(httpc->async_data);
ret = HttpSendRequestW(request, NULL, 0, NULL, 0);
status = wait_async_request(httpc->async_data, ret, httpc->cancel_event);
if (status != RPC_S_OK || info->finished) break;
status = rpcrt4_http_check_response(request);
if (status != RPC_S_OK && status != ERROR_ACCESS_DENIED) break;
drain_content(request);
}
if (info->scheme != RPC_C_HTTP_AUTHN_SCHEME_BASIC)
HttpAddRequestHeadersW(request, authW, -1, HTTP_ADDREQ_FLAG_REPLACE);
destroy_authinfo(info);
return status; return status;
} }
@ -2473,6 +2854,31 @@ static RPC_STATUS insert_cookie_header(HINTERNET request, const WCHAR *value)
return status; return status;
} }
static BOOL has_credentials(RpcConnection_http *httpc)
{
RPC_HTTP_TRANSPORT_CREDENTIALS_W *creds;
SEC_WINNT_AUTH_IDENTITY_W *id;
if (!httpc->common.QOS || httpc->common.QOS->qos->AdditionalSecurityInfoType != RPC_C_AUTHN_INFO_TYPE_HTTP)
return FALSE;
creds = httpc->common.QOS->qos->u.HttpCredentials;
if (creds->AuthenticationTarget != RPC_C_HTTP_AUTHN_TARGET_SERVER || !creds->NumberOfAuthnSchemes)
return FALSE;
id = creds->TransportCredentials;
if (!id || !id->User || !id->Password) return FALSE;
return TRUE;
}
static BOOL is_secure(RpcConnection_http *httpc)
{
return httpc->common.QOS &&
(httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) &&
(httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL);
}
static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection)
{ {
RpcConnection_http *httpc = (RpcConnection_http *)Connection; RpcConnection_http *httpc = (RpcConnection_http *)Connection;
@ -2485,7 +2891,7 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection)
DWORD flags; DWORD flags;
WCHAR *url; WCHAR *url;
RPC_STATUS status; RPC_STATUS status;
BOOL secure; BOOL secure, credentials;
HttpTimerThreadData *timer_data; HttpTimerThreadData *timer_data;
HANDLE thread; HANDLE thread;
@ -2518,13 +2924,13 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection)
strcatW(url, wszColon); strcatW(url, wszColon);
MultiByteToWideChar(CP_ACP, 0, Connection->Endpoint, -1, url+strlenW(url), strlen(Connection->Endpoint)+1); MultiByteToWideChar(CP_ACP, 0, Connection->Endpoint, -1, url+strlenW(url), strlen(Connection->Endpoint)+1);
secure = httpc->common.QOS && secure = is_secure(httpc);
(httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && credentials = has_credentials(httpc);
(httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL);
flags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_NO_CACHE_WRITE | flags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_NO_CACHE_WRITE |
INTERNET_FLAG_NO_AUTO_REDIRECT; INTERNET_FLAG_NO_AUTO_REDIRECT;
if (secure) flags |= INTERNET_FLAG_SECURE; if (secure) flags |= INTERNET_FLAG_SECURE;
if (credentials) flags |= INTERNET_FLAG_NO_AUTH;
httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, wszAcceptTypes, httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, wszAcceptTypes,
flags, (DWORD_PTR)httpc->async_data); flags, (DWORD_PTR)httpc->async_data);
@ -2534,13 +2940,28 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection)
HeapFree(GetProcessHeap(), 0, url); HeapFree(GetProcessHeap(), 0, url);
return RPC_S_SERVER_UNAVAILABLE; return RPC_S_SERVER_UNAVAILABLE;
} }
status = insert_authorization_header(httpc->in_request, httpc->common.QOS);
if (status != RPC_S_OK)
return status;
status = insert_cookie_header(httpc->in_request, Connection->CookieAuth); status = insert_cookie_header(httpc->in_request, Connection->CookieAuth);
if (status != RPC_S_OK) if (status != RPC_S_OK)
{
HeapFree(GetProcessHeap(), 0, url);
return status; return status;
}
if (credentials)
{
status = authorize_request(httpc, httpc->in_request);
if (status != RPC_S_OK)
{
HeapFree(GetProcessHeap(), 0, url);
return status;
}
status = rpcrt4_http_check_response(httpc->in_request);
if (status != RPC_S_OK)
{
HeapFree(GetProcessHeap(), 0, url);
return status;
}
drain_content(httpc->in_request);
}
httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes,
flags, (DWORD_PTR)httpc->async_data); flags, (DWORD_PTR)httpc->async_data);
@ -2550,29 +2971,26 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection)
ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); ERR("HttpOpenRequestW failed with error %d\n", GetLastError());
return RPC_S_SERVER_UNAVAILABLE; return RPC_S_SERVER_UNAVAILABLE;
} }
status = insert_authorization_header(httpc->out_request, httpc->common.QOS);
if (status != RPC_S_OK)
return status;
status = insert_cookie_header(httpc->out_request, Connection->CookieAuth); status = insert_cookie_header(httpc->out_request, Connection->CookieAuth);
if (status != RPC_S_OK) if (status != RPC_S_OK)
return status; return status;
status = rpcrt4_http_prepare_in_pipe(httpc->in_request, if (credentials)
httpc->async_data, {
httpc->cancel_event, status = authorize_request(httpc, httpc->out_request);
&httpc->connection_uuid, if (status != RPC_S_OK)
&httpc->in_pipe_uuid, return status;
&Connection->assoc->http_uuid); }
status = rpcrt4_http_prepare_in_pipe(httpc->in_request, httpc->async_data, httpc->cancel_event,
&httpc->connection_uuid, &httpc->in_pipe_uuid,
&Connection->assoc->http_uuid, credentials);
if (status != RPC_S_OK) if (status != RPC_S_OK)
return status; return status;
status = rpcrt4_http_prepare_out_pipe(httpc->out_request, status = rpcrt4_http_prepare_out_pipe(httpc->out_request, httpc->async_data, httpc->cancel_event,
httpc->async_data, &httpc->connection_uuid, &httpc->out_pipe_uuid,
httpc->cancel_event, &httpc->flow_control_increment, credentials);
&httpc->connection_uuid,
&httpc->out_pipe_uuid,
&httpc->flow_control_increment);
if (status != RPC_S_OK) if (status != RPC_S_OK)
return status; return status;
@ -2835,6 +3253,8 @@ static int rpcrt4_ncacn_http_close(RpcConnection *Connection)
RpcHttpAsyncData_Release(httpc->async_data); RpcHttpAsyncData_Release(httpc->async_data);
if (httpc->cancel_event) if (httpc->cancel_event)
CloseHandle(httpc->cancel_event); CloseHandle(httpc->cancel_event);
HeapFree(GetProcessHeap(), 0, httpc->servername);
httpc->servername = NULL;
return 0; return 0;
} }
@ -2992,8 +3412,6 @@ static const struct protseq_ops protseq_list[] =
}, },
}; };
#define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0]))
const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq) const struct protseq_ops *rpcrt4_get_protseq_ops(const char *protseq)
{ {
unsigned int i; unsigned int i;

5
reactos/dll/win32/rpcrt4/rpcrt4_main.c
View file

@ -365,7 +365,8 @@ static RPC_STATUS RPC_UuidGetNodeAddress(BYTE *address)
*/ */
RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid) RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid)
{ {
static int initialised, count; static BOOL initialised;
static int count;
ULONGLONG time; ULONGLONG time;
static ULONGLONG timelast; static ULONGLONG timelast;
@ -384,7 +385,7 @@ RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid)
sequence &= 0x1fff; sequence &= 0x1fff;
status = RPC_UuidGetNodeAddress(address); status = RPC_UuidGetNodeAddress(address);
initialised = 1; initialised = TRUE;
} }
/* Generate time element of the UUID. Account for going faster /* Generate time element of the UUID. Account for going faster

2
reactos/media/doc/README.WINE
View file

@ -166,7 +166,7 @@ reactos/dll/win32/rasapi32 # Synced to Wine-1.7.1
reactos/dll/win32/resutils # Synced to Wine-1.7.1 reactos/dll/win32/resutils # Synced to Wine-1.7.1
reactos/dll/win32/riched20 # Synced to Wine-1.7.17 reactos/dll/win32/riched20 # Synced to Wine-1.7.17
reactos/dll/win32/riched32 # Synced to Wine-1.7.1 reactos/dll/win32/riched32 # Synced to Wine-1.7.1
reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.1 reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.17
reactos/dll/win32/rsabase # Synced to Wine-1.7.1 reactos/dll/win32/rsabase # Synced to Wine-1.7.1
reactos/dll/win32/rsaenh # Synced to Wine-1.7.17 reactos/dll/win32/rsaenh # Synced to Wine-1.7.17
reactos/dll/win32/sccbase # Synced to Wine-1.7.1 reactos/dll/win32/sccbase # Synced to Wine-1.7.1