December 2009 - Wine-Commits

James Hawkins : msi: Fix a record handle leak.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 37a058208d78fc2b9f4884a20abcbea2d861ff2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a058208d78fc2b9f4884a20… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:36:09 2009 -0800 msi: Fix a record handle leak. --- dlls/msi/database.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index d823dc6..3896454 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -622,6 +622,7 @@ static UINT msi_add_records_to_table(MSIDATABASE *db, LPWSTR *columns, LPWSTR *t while (MSI_ViewFetch(view, &rec) != ERROR_NO_MORE_ITEMS) { r = MSI_ViewModify(view, MSIMODIFY_DELETE, rec); + msiobj_release(&rec->hdr); if (r != ERROR_SUCCESS) goto done; }

1 0

James Hawkins : msi: Free each stream name when deleting the streams view.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 12134243c35c02062e94781be9ac3e721541ee03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12134243c35c02062e94781be… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:35:39 2009 -0800 msi: Free each stream name when deleting the streams view. --- dlls/msi/streams.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index faa27c8..61cebff 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -402,6 +402,7 @@ static UINT STREAMS_delete(struct tagMSIVIEW *view) { if (sv->streams[i] && sv->streams[i]->stream) IStream_Release(sv->streams[i]->stream); + msi_free(sv->streams[i]->name); msi_free(sv->streams[i]); }

1 0

James Hawkins : msi: Make sure we don' t access pcchValueBuf when szBuffer is NULL, as pcchValueBuf is not required to be initialized in this case.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: f4829063bcd69abfe2825bf7041797df79db80f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4829063bcd69abfe2825bf70… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:35:27 2009 -0800 msi: Make sure we don't access pcchValueBuf when szBuffer is NULL, as pcchValueBuf is not required to be initialized in this case. --- dlls/msi/msi.c | 30 +++++++++++++++++------------- dlls/msi/tests/msi.c | 4 ++-- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2515714..4d9da4c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -901,7 +901,7 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, WCHAR packagecode[GUID_SIZE]; BOOL badconfig = FALSE; LONG res; - DWORD save, type = REG_NONE; + DWORD type = REG_NONE; static WCHAR empty[] = {0}; static const WCHAR sourcelist[] = { @@ -1036,22 +1036,26 @@ static UINT MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, if (pcchValueBuf) { - save = *pcchValueBuf; - - if (strlenW(val) < *pcchValueBuf) - r = msi_strcpy_to_awstring(val, szValue, pcchValueBuf); - else if (szValue->str.a || szValue->str.w) - r = ERROR_MORE_DATA; + /* If szBuffer (szValue->str) is NULL, there's no need to copy the value + * out. Also, *pcchValueBuf may be uninitialized in this case, so we + * can't rely on its value. + */ + if (szValue->str.a || szValue->str.w) + { + DWORD size = *pcchValueBuf; + if (strlenW(val) < size) + r = msi_strcpy_to_awstring(val, szValue, &size); + else + { + r = ERROR_MORE_DATA; + } + } if (!badconfig) *pcchValueBuf = lstrlenW(val); - else if (r == ERROR_SUCCESS) - { - *pcchValueBuf = save; - r = ERROR_BAD_CONFIGURATION; - } } - else if (badconfig) + + if (badconfig) r = ERROR_BAD_CONFIGURATION; if (val != empty) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index e249965..e3baa09 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2779,7 +2779,7 @@ static void test_MsiGetProductInfo(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(sz == 4, "Expected 4, got %d\n", sz); - /* lpValueBuf is NULL, pcchValueBuf is too small */ + /* lpValueBuf is non-NULL, pcchValueBuf is too small */ sz = 2; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz); @@ -2787,7 +2787,7 @@ static void test_MsiGetProductInfo(void) ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(sz == 4, "Expected 4, got %d\n", sz); - /* lpValueBuf is NULL, pcchValueBuf is exactly 4 */ + /* lpValueBuf is non-NULL, pcchValueBuf is exactly 4 */ sz = 4; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA(prodcode, INSTALLPROPERTY_HELPLINK, buf, &sz);

1 0

James Hawkins : msi: Store the number of types we queried. We were leaking these types because we didn't have the correct count.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 3188792a3048f20626f18d4fe3e7429149fcc277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3188792a3048f20626f18d4fe… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:35:45 2009 -0800 msi: Store the number of types we queried. We were leaking these types because we didn't have the correct count. This change also fixes weird 8-space indenting in free_merge_tables. --- dlls/msi/database.c | 50 +++++++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index adbdb9d..d823dc6 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1451,6 +1451,7 @@ static UINT msi_get_query_types(MSIQUERY *query, LPWSTR **types, DWORD *numtypes goto end; } + *numtypes = count; for (i=1; i<=count; i++ ) { (*types)[i-1] = strdupW(MSI_RecordGetString(prec, i)); @@ -1477,32 +1478,36 @@ static void merge_free_rows(MERGETABLE *table) static void free_merge_table(MERGETABLE *table) { - UINT i; + UINT i; - if (table->labels != NULL) - { - for (i = 0; i < table->numlabels; i++) - msi_free(table->labels[i]); - msi_free(table->labels); - } + if (table->labels != NULL) + { + for (i = 0; i < table->numlabels; i++) + msi_free(table->labels[i]); - if (table->columns != NULL) - { - for (i = 0; i < table->numcolumns; i++) - msi_free(table->columns[i]); - msi_free(table->columns); - } + msi_free(table->labels); + } - if (table->types != NULL) - { - for (i = 0; i < table->numtypes; i++) - msi_free(table->types[i]); - msi_free(table->types); - } - msi_free(table->name); - merge_free_rows(table); + if (table->columns != NULL) + { + for (i = 0; i < table->numcolumns; i++) + msi_free(table->columns[i]); - msi_free(table); + msi_free(table->columns); + } + + if (table->types != NULL) + { + for (i = 0; i < table->numtypes; i++) + msi_free(table->types[i]); + + msi_free(table->types); + } + + msi_free(table->name); + merge_free_rows(table); + + msi_free(table); } static UINT msi_get_merge_table (MSIDATABASE *db, LPCWSTR name, MERGETABLE **ptable) @@ -1753,7 +1758,6 @@ UINT WINAPI MsiDatabaseMergeW(MSIHANDLE hDatabase, MSIHANDLE hDatabaseMerge, LIST_FOR_EACH_SAFE(item, cursor, &tabledata) { MERGETABLE *table = LIST_ENTRY(item, MERGETABLE, entry); - list_remove(&table->entry); free_merge_table(table); }

1 0

James Hawkins : msi: Free each storage name when deleting the storages view .
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: d2fe01aa32f3cf37e1d9e1d402ea13f972ce8361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fe01aa32f3cf37e1d9e1d40… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Dec 13 19:36:03 2009 -0800 msi: Free each storage name when deleting the storages view. --- dlls/msi/storages.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 844db8d..f2fb317 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -437,6 +437,7 @@ static UINT STORAGES_delete(struct tagMSIVIEW *view) if (sv->storages[i]->storage) IStorage_Release(sv->storages[i]->storage); + msi_free(sv->storages[i]->name); msi_free(sv->storages[i]); }

1 0

Rob Shearman : rpcrt4: Override authentication functions for ncalrpc protocol to do nothing.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 95026f9d6b6092158d6c22ce21dc7fd651117fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95026f9d6b6092158d6c22ce2… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 21:35:54 2009 +0000 rpcrt4: Override authentication functions for ncalrpc protocol to do nothing. The protocol is local only and therefore encryption/decryption isn't necessary to keep the data private, and methods are built into the protocol for impersonating the user of the calling thread. --- dlls/rpcrt4/rpc_transport.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e7bda8c..f8c8d1f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -769,6 +769,35 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d return RPC_S_OK; } +static BOOL rpcrt4_ncalrpc_is_authorized(RpcConnection *conn) +{ + return FALSE; +} + +static RPC_STATUS rpcrt4_ncalrpc_authorize(RpcConnection *conn, BOOL first_time, + unsigned char *in_buffer, + unsigned int in_size, + unsigned char *out_buffer, + unsigned int *out_size) +{ + /* since this protocol is local to the machine there is no need to + * authenticate the caller */ + *out_size = 0; + return RPC_S_OK; +} + +static RPC_STATUS rpcrt4_ncalrpc_secure_packet(RpcConnection *conn, + enum secure_packet_direction dir, + RpcPktHdr *hdr, unsigned int hdr_size, + unsigned char *stub_data, unsigned int stub_data_size, + RpcAuthVerifier *auth_hdr, + unsigned char *auth_value, unsigned int auth_value_size) +{ + /* since this protocol is local to the machine there is no need to secure + * the packet */ + return RPC_S_OK; +} + /**** ncacn_ip_tcp support ****/ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, @@ -2694,9 +2723,9 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncalrpc_get_top_of_tower, rpcrt4_ncalrpc_parse_top_of_tower, NULL, - RPCRT4_default_is_authorized, - RPCRT4_default_authorize, - RPCRT4_default_secure_packet, + rpcrt4_ncalrpc_is_authorized, + rpcrt4_ncalrpc_authorize, + rpcrt4_ncalrpc_secure_packet, }, { "ncacn_ip_tcp", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP },

1 0

Rob Shearman : rpcrt4: Allow the connection to override the authentication mechanism for a connection type .
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: deae193ac8a8cbb8378203388ffd08354b9f8e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=deae193ac8a8cbb8378203388… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 21:35:47 2009 +0000 rpcrt4: Allow the connection to override the authentication mechanism for a connection type. --- dlls/rpcrt4/rpc_binding.h | 30 +++++++++ dlls/rpcrt4/rpc_message.c | 145 +++++++++++++++++++++++++++---------------- dlls/rpcrt4/rpc_message.h | 3 + dlls/rpcrt4/rpc_transport.c | 12 ++++ 4 files changed, 136 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=deae193ac8a8cbb837820…

1 0

Rob Shearman : rpcrt4: Allow the authentication details of the client to be transport-specific.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 3dbf356f8f3326ce3d4f42b72cd1c28ec2320d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbf356f8f3326ce3d4f42b72… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 21:36:05 2009 +0000 rpcrt4: Allow the authentication details of the client to be transport-specific. --- dlls/rpcrt4/rpc_binding.c | 22 ++++------------------ dlls/rpcrt4/rpc_binding.h | 8 ++++++++ dlls/rpcrt4/rpc_message.c | 35 +++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpc_message.h | 1 + dlls/rpcrt4/rpc_transport.c | 4 ++++ 5 files changed, 52 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 68ab461..8bfc493 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1614,25 +1614,11 @@ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE * TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, AuthnSvc, AuthzSvc, Flags); - if (!bind->AuthInfo) return RPC_S_BINDING_HAS_NO_AUTH; - - if (Privs) *Privs = (RPC_AUTHZ_HANDLE)bind->AuthInfo->identity; - if (ServerPrincName) - { - *ServerPrincName = RPCRT4_strdupW(bind->AuthInfo->server_principal_name); - if (!*ServerPrincName) return ERROR_OUTOFMEMORY; - } - if (AuthnLevel) *AuthnLevel = bind->AuthInfo->AuthnLevel; - if (AuthnSvc) *AuthnSvc = bind->AuthInfo->AuthnSvc; - if (AuthzSvc) - { - FIXME("authorization service not implemented\n"); - *AuthzSvc = RPC_C_AUTHZ_NONE; - } - if (Flags) - FIXME("flags 0x%x not implemented\n", Flags); + if (!bind->FromConn) return RPC_S_INVALID_BINDING; - return RPC_S_OK; + return rpcrt4_conn_inquire_auth_client(bind->FromConn, Privs, + ServerPrincName, AuthnLevel, + AuthnSvc, AuthzSvc, Flags); } /*********************************************************************** diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 908967c..e523ba6 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -111,6 +111,7 @@ struct connection_ops { RPC_STATUS (*secure_packet)(RpcConnection *Connection, enum secure_packet_direction dir, RpcPktHdr *hdr, unsigned int hdr_size, unsigned char *stub_data, unsigned int stub_data_size, RpcAuthVerifier *auth_hdr, unsigned char *auth_value, unsigned int auth_value_size); RPC_STATUS (*impersonate_client)(RpcConnection *conn); RPC_STATUS (*revert_to_self)(RpcConnection *conn); + RPC_STATUS (*inquire_auth_client)(RpcConnection *, RPC_AUTHZ_HANDLE *, RPC_WSTR *, ULONG *, ULONG *, ULONG *, ULONG); }; /* don't know what MS's structure looks like */ @@ -230,6 +231,13 @@ static inline RPC_STATUS rpcrt4_conn_revert_to_self( return conn->ops->revert_to_self(conn); } +static inline RPC_STATUS rpcrt4_conn_inquire_auth_client( + RpcConnection *conn, RPC_AUTHZ_HANDLE *privs, RPC_WSTR *server_princ_name, + ULONG *authn_level, ULONG *authn_svc, ULONG *authz_svc, ULONG flags) +{ + return conn->ops->inquire_auth_client(conn, privs, server_princ_name, authn_level, authn_svc, authz_svc, flags); +} + /* floors 3 and up */ RPC_STATUS RpcTransport_GetTopOfTower(unsigned char *tower_data, size_t *tower_size, const char *protseq, const char *networkaddr, const char *endpoint); RPC_STATUS RpcTransport_ParseTopOfTower(const unsigned char *tower_data, size_t tower_size, char **protseq, char **networkaddr, char **endpoint); diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 520f247..45a0398 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1177,6 +1177,41 @@ RPC_STATUS RPCRT4_default_revert_to_self(RpcConnection *conn) } /*********************************************************************** + * RPCRT4_default_inquire_auth_client (internal) + * + * Default function to retrieve the authentication details that the client + * is using to call the server. + */ +RPC_STATUS RPCRT4_default_inquire_auth_client( + RpcConnection *conn, RPC_AUTHZ_HANDLE *privs, RPC_WSTR *server_princ_name, + ULONG *authn_level, ULONG *authn_svc, ULONG *authz_svc, ULONG flags) +{ + if (!conn->AuthInfo) return RPC_S_BINDING_HAS_NO_AUTH; + + if (privs) + { + FIXME("privs not implemented\n"); + *privs = NULL; + } + if (server_princ_name) + { + *server_princ_name = RPCRT4_strdupW(conn->AuthInfo->server_principal_name); + if (!*server_princ_name) return ERROR_OUTOFMEMORY; + } + if (authn_level) *authn_level = conn->AuthInfo->AuthnLevel; + if (authn_svc) *authn_svc = conn->AuthInfo->AuthnSvc; + if (authz_svc) + { + FIXME("authorization service not implemented\n"); + *authz_svc = RPC_C_AUTHZ_NONE; + } + if (flags) + FIXME("flags 0x%x not implemented\n", flags); + + return RPC_S_OK; +} + +/*********************************************************************** * RPCRT4_Send (internal) * * Transmit a packet over connection in acceptable fragments. diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 2a441d6..2509527 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -55,5 +55,6 @@ BOOL RPCRT4_default_is_authorized(RpcConnection *Connection); RPC_STATUS RPCRT4_default_secure_packet(RpcConnection *Connection, enum secure_packet_direction dir, RpcPktHdr *hdr, unsigned int hdr_size, unsigned char *stub_data, unsigned int stub_data_size, RpcAuthVerifier *auth_hdr, unsigned char *auth_value, unsigned int auth_value_size); RPC_STATUS RPCRT4_default_impersonate_client(RpcConnection *conn); RPC_STATUS RPCRT4_default_revert_to_self(RpcConnection *conn); +RPC_STATUS RPCRT4_default_inquire_auth_client(RpcConnection *conn, RPC_AUTHZ_HANDLE *privs, RPC_WSTR *server_princ_name, ULONG *authn_level, ULONG *authn_svc, ULONG *authz_svc, ULONG flags); #endif diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6dbac41..00ada8e 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2753,6 +2753,7 @@ static const struct connection_ops conn_protseq_list[] = { RPCRT4_default_secure_packet, rpcrt4_conn_np_impersonate_client, rpcrt4_conn_np_revert_to_self, + RPCRT4_default_inquire_auth_client, }, { "ncalrpc", { EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_PIPE }, @@ -2772,6 +2773,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncalrpc_secure_packet, rpcrt4_conn_np_impersonate_client, rpcrt4_conn_np_revert_to_self, + RPCRT4_default_inquire_auth_client, }, { "ncacn_ip_tcp", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP }, @@ -2791,6 +2793,7 @@ static const struct connection_ops conn_protseq_list[] = { RPCRT4_default_secure_packet, RPCRT4_default_impersonate_client, RPCRT4_default_revert_to_self, + RPCRT4_default_inquire_auth_client, }, { "ncacn_http", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_HTTP }, @@ -2810,6 +2813,7 @@ static const struct connection_ops conn_protseq_list[] = { RPCRT4_default_secure_packet, RPCRT4_default_impersonate_client, RPCRT4_default_revert_to_self, + RPCRT4_default_inquire_auth_client, }, };

1 0

Rob Shearman : rpcrt4: Implement client impersonation.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: d918587f1d15437f42ad57086f637668a95754a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d918587f1d15437f42ad57086… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 21:36:01 2009 +0000 rpcrt4: Implement client impersonation. --- dlls/rpcrt4/rpc_binding.c | 32 ++++++++++++++++++------ dlls/rpcrt4/rpc_binding.h | 14 ++++++++++ dlls/rpcrt4/rpc_message.c | 56 +++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpc_message.h | 2 + dlls/rpcrt4/rpc_transport.c | 50 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 146 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index a4dff4a..68ab461 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1052,9 +1052,17 @@ RPC_STATUS RPC_ENTRY RpcBindingReset(RPC_BINDING_HANDLE Binding) */ RPC_STATUS WINAPI RpcImpersonateClient(RPC_BINDING_HANDLE BindingHandle) { - FIXME("(%p): stub\n", BindingHandle); - ImpersonateSelf(SecurityImpersonation); - return RPC_S_OK; + RpcBinding *bind; + + TRACE("(%p)\n", BindingHandle); + + if (!BindingHandle) BindingHandle = I_RpcGetCurrentCallHandle(); + if (!BindingHandle) return RPC_S_INVALID_BINDING; + + bind = BindingHandle; + if (bind->FromConn) + return rpcrt4_conn_impersonate_client(bind->FromConn); + return RPC_S_WRONG_KIND_OF_BINDING; } /*********************************************************************** @@ -1077,8 +1085,17 @@ RPC_STATUS WINAPI RpcImpersonateClient(RPC_BINDING_HANDLE BindingHandle) */ RPC_STATUS WINAPI RpcRevertToSelfEx(RPC_BINDING_HANDLE BindingHandle) { - FIXME("(%p): stub\n", BindingHandle); - return RPC_S_OK; + RpcBinding *bind; + + TRACE("(%p)\n", BindingHandle); + + if (!BindingHandle) BindingHandle = I_RpcGetCurrentCallHandle(); + if (!BindingHandle) return RPC_S_INVALID_BINDING; + + bind = BindingHandle; + if (bind->FromConn) + return rpcrt4_conn_revert_to_self(bind->FromConn); + return RPC_S_WRONG_KIND_OF_BINDING; } static inline BOOL has_nt_auth_identity(ULONG AuthnLevel) @@ -1431,9 +1448,8 @@ BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQuali */ RPC_STATUS WINAPI RpcRevertToSelf(void) { - FIXME("stub\n"); - RevertToSelf(); - return RPC_S_OK; + TRACE("\n"); + return RpcRevertToSelfEx(NULL); } /*********************************************************************** diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index fc3fd7d..908967c 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -109,6 +109,8 @@ struct connection_ops { BOOL (*is_authorized)(RpcConnection *conn); RPC_STATUS (*authorize)(RpcConnection *conn, BOOL first_time, unsigned char *in_buffer, unsigned int in_len, unsigned char *out_buffer, unsigned int *out_len); RPC_STATUS (*secure_packet)(RpcConnection *Connection, enum secure_packet_direction dir, RpcPktHdr *hdr, unsigned int hdr_size, unsigned char *stub_data, unsigned int stub_data_size, RpcAuthVerifier *auth_hdr, unsigned char *auth_value, unsigned int auth_value_size); + RPC_STATUS (*impersonate_client)(RpcConnection *conn); + RPC_STATUS (*revert_to_self)(RpcConnection *conn); }; /* don't know what MS's structure looks like */ @@ -216,6 +218,18 @@ static inline RPC_STATUS rpcrt4_conn_secure_packet( return conn->ops->secure_packet(conn, dir, hdr, hdr_size, stub_data, stub_data_size, auth_hdr, auth_value, auth_value_size); } +static inline RPC_STATUS rpcrt4_conn_impersonate_client( + RpcConnection *conn) +{ + return conn->ops->impersonate_client(conn); +} + +static inline RPC_STATUS rpcrt4_conn_revert_to_self( + RpcConnection *conn) +{ + return conn->ops->revert_to_self(conn); +} + /* floors 3 and up */ RPC_STATUS RpcTransport_GetTopOfTower(unsigned char *tower_data, size_t *tower_size, const char *protseq, const char *networkaddr, const char *endpoint); RPC_STATUS RpcTransport_ParseTopOfTower(const unsigned char *tower_data, size_t tower_size, char **protseq, char **networkaddr, char **endpoint); diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 0f4b61c..520f247 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -1121,6 +1121,62 @@ BOOL RPCRT4_default_is_authorized(RpcConnection *Connection) } /*********************************************************************** + * RPCRT4_default_impersonate_client (internal) + * + */ +RPC_STATUS RPCRT4_default_impersonate_client(RpcConnection *conn) +{ + SECURITY_STATUS sec_status; + + TRACE("(%p)\n", conn); + + if (!conn->AuthInfo || !SecIsValidHandle(&conn->ctx)) + return RPC_S_NO_CONTEXT_AVAILABLE; + sec_status = ImpersonateSecurityContext(&conn->ctx); + if (sec_status != SEC_E_OK) + WARN("ImpersonateSecurityContext returned 0x%08x\n", sec_status); + switch (sec_status) + { + case SEC_E_UNSUPPORTED_FUNCTION: + return RPC_S_CANNOT_SUPPORT; + case SEC_E_NO_IMPERSONATION: + return RPC_S_NO_CONTEXT_AVAILABLE; + case SEC_E_OK: + return RPC_S_OK; + default: + return RPC_S_SEC_PKG_ERROR; + } +} + +/*********************************************************************** + * RPCRT4_default_revert_to_self (internal) + * + */ +RPC_STATUS RPCRT4_default_revert_to_self(RpcConnection *conn) +{ + SECURITY_STATUS sec_status; + + TRACE("(%p)\n", conn); + + if (!conn->AuthInfo || !SecIsValidHandle(&conn->ctx)) + return RPC_S_NO_CONTEXT_AVAILABLE; + sec_status = RevertSecurityContext(&conn->ctx); + if (sec_status != SEC_E_OK) + WARN("RevertSecurityContext returned 0x%08x\n", sec_status); + switch (sec_status) + { + case SEC_E_UNSUPPORTED_FUNCTION: + return RPC_S_CANNOT_SUPPORT; + case SEC_E_NO_IMPERSONATION: + return RPC_S_NO_CONTEXT_AVAILABLE; + case SEC_E_OK: + return RPC_S_OK; + default: + return RPC_S_SEC_PKG_ERROR; + } +} + +/*********************************************************************** * RPCRT4_Send (internal) * * Transmit a packet over connection in acceptable fragments. diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 07a2581..2a441d6 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -53,5 +53,7 @@ RPC_STATUS RPCRT4_ServerGetRegisteredAuthInfo(USHORT auth_type, CredHandle *cred RPC_STATUS RPCRT4_default_authorize(RpcConnection *conn, BOOL first_time, unsigned char *in_buffer, unsigned int in_size, unsigned char *out_buffer, unsigned int *out_size); BOOL RPCRT4_default_is_authorized(RpcConnection *Connection); RPC_STATUS RPCRT4_default_secure_packet(RpcConnection *Connection, enum secure_packet_direction dir, RpcPktHdr *hdr, unsigned int hdr_size, unsigned char *stub_data, unsigned int stub_data_size, RpcAuthVerifier *auth_hdr, unsigned char *auth_value, unsigned int auth_value_size); +RPC_STATUS RPCRT4_default_impersonate_client(RpcConnection *conn); +RPC_STATUS RPCRT4_default_revert_to_self(RpcConnection *conn); #endif diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index f8c8d1f..6dbac41 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -586,6 +586,48 @@ static RPC_STATUS rpcrt4_ncacn_np_parse_top_of_tower(const unsigned char *tower_ return RPC_S_OK; } +static RPC_STATUS rpcrt4_conn_np_impersonate_client(RpcConnection *conn) +{ + RpcConnection_np *npc = (RpcConnection_np *)conn; + BOOL ret; + + TRACE("(%p)\n", conn); + + if (conn->AuthInfo && SecIsValidHandle(&conn->ctx)) + return RPCRT4_default_impersonate_client(conn); + + ret = ImpersonateNamedPipeClient(npc->pipe); + if (!ret) + { + DWORD error = GetLastError(); + WARN("ImpersonateNamedPipeClient failed with error %u\n", error); + switch (error) + { + case ERROR_CANNOT_IMPERSONATE: + return RPC_S_NO_CONTEXT_AVAILABLE; + } + } + return RPC_S_OK; +} + +static RPC_STATUS rpcrt4_conn_np_revert_to_self(RpcConnection *conn) +{ + BOOL ret; + + TRACE("(%p)\n", conn); + + if (conn->AuthInfo && SecIsValidHandle(&conn->ctx)) + return RPCRT4_default_revert_to_self(conn); + + ret = RevertToSelf(); + if (!ret) + { + WARN("RevertToSelf failed with error %u\n", GetLastError()); + return RPC_S_NO_CONTEXT_AVAILABLE; + } + return RPC_S_OK; +} + typedef struct _RpcServerProtseq_np { RpcServerProtseq common; @@ -2709,6 +2751,8 @@ static const struct connection_ops conn_protseq_list[] = { RPCRT4_default_is_authorized, RPCRT4_default_authorize, RPCRT4_default_secure_packet, + rpcrt4_conn_np_impersonate_client, + rpcrt4_conn_np_revert_to_self, }, { "ncalrpc", { EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_PIPE }, @@ -2726,6 +2770,8 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncalrpc_is_authorized, rpcrt4_ncalrpc_authorize, rpcrt4_ncalrpc_secure_packet, + rpcrt4_conn_np_impersonate_client, + rpcrt4_conn_np_revert_to_self, }, { "ncacn_ip_tcp", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP }, @@ -2743,6 +2789,8 @@ static const struct connection_ops conn_protseq_list[] = { RPCRT4_default_is_authorized, RPCRT4_default_authorize, RPCRT4_default_secure_packet, + RPCRT4_default_impersonate_client, + RPCRT4_default_revert_to_self, }, { "ncacn_http", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_HTTP }, @@ -2760,6 +2808,8 @@ static const struct connection_ops conn_protseq_list[] = { RPCRT4_default_is_authorized, RPCRT4_default_authorize, RPCRT4_default_secure_packet, + RPCRT4_default_impersonate_client, + RPCRT4_default_revert_to_self, }, };

1 0

Rob Shearman : rpcrt4: Override inquire_auth_client for ncalrpc transport to always indicate that the connection is authenticated .
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: f823f2181e4387057222bd6431ddf0e62352dd0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f823f2181e4387057222bd643… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Dec 13 21:36:09 2009 +0000 rpcrt4: Override inquire_auth_client for ncalrpc transport to always indicate that the connection is authenticated. --- dlls/rpcrt4/rpc_binding.c | 2 +- dlls/rpcrt4/rpc_transport.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 8bfc493..a534b7d 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1594,8 +1594,8 @@ RpcBindingInqAuthClientExA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE * if (status == RPC_S_OK && ServerPrincName) { *ServerPrincName = (RPC_CSTR)RPCRT4_strdupWtoA(principal); + if (!*ServerPrincName && principal) status = ERROR_OUTOFMEMORY; RpcStringFreeW(&principal); - if (!*ServerPrincName) return ERROR_OUTOFMEMORY; } return status; diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 00ada8e..07a1e04 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -840,6 +840,36 @@ static RPC_STATUS rpcrt4_ncalrpc_secure_packet(RpcConnection *conn, return RPC_S_OK; } +static RPC_STATUS rpcrt4_ncalrpc_inquire_auth_client( + RpcConnection *conn, RPC_AUTHZ_HANDLE *privs, RPC_WSTR *server_princ_name, + ULONG *authn_level, ULONG *authn_svc, ULONG *authz_svc, ULONG flags) +{ + TRACE("(%p, %p, %p, %p, %p, %p, 0x%x)\n", conn, privs, + server_princ_name, authn_level, authn_svc, authz_svc, flags); + + if (privs) + { + FIXME("privs not implemented\n"); + *privs = NULL; + } + if (server_princ_name) + { + FIXME("server_princ_name not implemented\n"); + *server_princ_name = NULL; + } + if (authn_level) *authn_level = RPC_C_AUTHN_LEVEL_PKT_PRIVACY; + if (authn_svc) *authn_svc = RPC_C_AUTHN_WINNT; + if (authz_svc) + { + FIXME("authorization service not implemented\n"); + *authz_svc = RPC_C_AUTHZ_NONE; + } + if (flags) + FIXME("flags 0x%x not implemented\n", flags); + + return RPC_S_OK; +} + /**** ncacn_ip_tcp support ****/ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, @@ -2773,7 +2803,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncalrpc_secure_packet, rpcrt4_conn_np_impersonate_client, rpcrt4_conn_np_revert_to_self, - RPCRT4_default_inquire_auth_client, + rpcrt4_ncalrpc_inquire_auth_client, }, { "ncacn_ip_tcp", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP },

1 0