diff options
Diffstat (limited to 'source4/librpc')
| -rw-r--r-- | source4/librpc/config.mk | 3 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 185 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_secondary.c | 317 |
3 files changed, 320 insertions, 185 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index f31ccf57f0..5cec7e1f67 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -476,7 +476,8 @@ OBJ_FILES = \ rpc/dcerpc_smb.o \ rpc/dcerpc_smb2.o \ rpc/dcerpc_sock.o \ - rpc/dcerpc_connect.o + rpc/dcerpc_connect.o \ + rpc/dcerpc_secondary.o PRIVATE_DEPENDENCIES = \ samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \ LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER \ diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 443b8b458a..3e49e6972b 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -5,7 +5,7 @@ Copyright (C) Andrew Tridgell 2003 Copyright (C) Jelmer Vernooij 2004 - Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005 + Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005-2007 Copyright (C) Rafal Szczesniak 2005 This program is free software; you can redistribute it and/or modify @@ -915,186 +915,3 @@ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx, return dcerpc_pipe_connect_recv(c, parent_ctx, pp); } - -struct sec_conn_state { - struct dcerpc_pipe *pipe; - struct dcerpc_pipe *pipe2; - struct dcerpc_binding *binding; - struct smbcli_tree *tree; -}; - - -static void continue_open_smb(struct composite_context *ctx); -static void continue_open_tcp(struct composite_context *ctx); -static void continue_open_pipe(struct composite_context *ctx); -static void continue_pipe_open(struct composite_context *c); - - -/* - Send request to create a secondary dcerpc connection from a primary - connection -*/ -struct composite_context* dcerpc_secondary_connection_send(struct dcerpc_pipe *p, - struct dcerpc_binding *b) -{ - struct composite_context *c; - struct sec_conn_state *s; - struct composite_context *pipe_smb_req; - struct composite_context *pipe_tcp_req; - struct composite_context *pipe_ncalrpc_req; - - /* composite context allocation and setup */ - c = composite_create(p, p->conn->event_ctx); - if (c == NULL) return NULL; - - s = talloc_zero(c, struct sec_conn_state); - if (composite_nomem(s, c)) return c; - c->private_data = s; - - s->pipe = p; - s->binding = b; - - /* initialise second dcerpc pipe based on primary pipe's event context */ - s->pipe2 = dcerpc_pipe_init(c, s->pipe->conn->event_ctx); - if (composite_nomem(s->pipe2, c)) return c; - - /* open second dcerpc pipe using the same transport as for primary pipe */ - switch (s->pipe->conn->transport.transport) { - case NCACN_NP: - /* get smb tree of primary dcerpc pipe opened on smb */ - s->tree = dcerpc_smb_tree(s->pipe->conn); - if (!s->tree) { - composite_error(c, NT_STATUS_INVALID_PARAMETER); - return c; - } - - pipe_smb_req = dcerpc_pipe_open_smb_send(s->pipe2, s->tree, - s->binding->endpoint); - composite_continue(c, pipe_smb_req, continue_open_smb, c); - return c; - - case NCACN_IP_TCP: - pipe_tcp_req = dcerpc_pipe_open_tcp_send(s->pipe2->conn, - s->binding->host, - s->binding->target_hostname, - atoi(s->binding->endpoint)); - composite_continue(c, pipe_tcp_req, continue_open_tcp, c); - return c; - - case NCALRPC: - pipe_ncalrpc_req = dcerpc_pipe_open_pipe_send(s->pipe2->conn, - s->binding->endpoint); - composite_continue(c, pipe_ncalrpc_req, continue_open_pipe, c); - return c; - - default: - /* looks like a transport we don't support */ - composite_error(c, NT_STATUS_NOT_SUPPORTED); - } - - return c; -} - - -/* - Stage 2 of secondary_connection: Receive result of pipe open request on smb -*/ -static void continue_open_smb(struct composite_context *ctx) -{ - struct composite_context *c = talloc_get_type(ctx->async.private_data, - struct composite_context); - - c->status = dcerpc_pipe_open_smb_recv(ctx); - if (!composite_is_ok(c)) return; - - continue_pipe_open(c); -} - - -/* - Stage 2 of secondary_connection: Receive result of pipe open request on tcp/ip -*/ -static void continue_open_tcp(struct composite_context *ctx) -{ - struct composite_context *c = talloc_get_type(ctx->async.private_data, - struct composite_context); - - c->status = dcerpc_pipe_open_tcp_recv(ctx); - if (!composite_is_ok(c)) return; - - continue_pipe_open(c); -} - - -/* - Stage 2 of secondary_connection: Receive result of pipe open request on ncalrpc -*/ -static void continue_open_pipe(struct composite_context *ctx) -{ - struct composite_context *c = talloc_get_type(ctx->async.private_data, - struct composite_context); - - c->status = dcerpc_pipe_open_pipe_recv(ctx); - if (!composite_is_ok(c)) return; - - continue_pipe_open(c); -} - - -/* - Stage 3 of secondary_connection: Get binding data and flags from primary pipe - and say if we're done ok. -*/ -static void continue_pipe_open(struct composite_context *c) -{ - struct sec_conn_state *s; - - s = talloc_get_type(c->private_data, struct sec_conn_state); - - s->pipe2->conn->flags = s->pipe->conn->flags; - s->pipe2->binding = s->binding; - if (!talloc_reference(s->pipe2, s->binding)) { - composite_error(c, NT_STATUS_NO_MEMORY); - return; - } - - composite_done(c); -} - - -/* - Receive result of secondary rpc connection request and return - second dcerpc pipe. -*/ -NTSTATUS dcerpc_secondary_connection_recv(struct composite_context *c, - struct dcerpc_pipe **p2) -{ - NTSTATUS status = composite_wait(c); - struct sec_conn_state *s; - - s = talloc_get_type(c->private_data, struct sec_conn_state); - - if (NT_STATUS_IS_OK(status)) { - *p2 = talloc_steal(s->pipe, s->pipe2); - } - - talloc_free(c); - return status; -} - -/* - Create a secondary dcerpc connection from a primary connection - - sync version - - If the primary is a SMB connection then the secondary connection - will be on the same SMB connection, but using a new fnum -*/ -NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p, - struct dcerpc_pipe **p2, - struct dcerpc_binding *b) -{ - struct composite_context *c; - - c = dcerpc_secondary_connection_send(p, b); - return dcerpc_secondary_connection_recv(c, p2); -} diff --git a/source4/librpc/rpc/dcerpc_secondary.c b/source4/librpc/rpc/dcerpc_secondary.c new file mode 100644 index 0000000000..685055d957 --- /dev/null +++ b/source4/librpc/rpc/dcerpc_secondary.c @@ -0,0 +1,317 @@ +/* + Unix SMB/CIFS implementation. + + dcerpc connect functions + + Copyright (C) Andrew Tridgell 2003 + Copyright (C) Jelmer Vernooij 2004 + Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005-2007 + Copyright (C) Rafal Szczesniak 2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + + +#include "includes.h" +#include "libcli/composite/composite.h" +#include "lib/events/events.h" +#include "librpc/rpc/dcerpc.h" +#include "auth/credentials/credentials.h" + + +struct sec_conn_state { + struct dcerpc_pipe *pipe; + struct dcerpc_pipe *pipe2; + struct dcerpc_binding *binding; + struct smbcli_tree *tree; +}; + + +static void continue_open_smb(struct composite_context *ctx); +static void continue_open_tcp(struct composite_context *ctx); +static void continue_open_pipe(struct composite_context *ctx); +static void continue_pipe_open(struct composite_context *c); + + +/* + Send request to create a secondary dcerpc connection from a primary + connection +*/ +struct composite_context* dcerpc_secondary_connection_send(struct dcerpc_pipe *p, + struct dcerpc_binding *b) +{ + struct composite_context *c; + struct sec_conn_state *s; + struct composite_context *pipe_smb_req; + struct composite_context *pipe_tcp_req; + struct composite_context *pipe_ncalrpc_req; + + /* composite context allocation and setup */ + c = composite_create(p, p->conn->event_ctx); + if (c == NULL) return NULL; + + s = talloc_zero(c, struct sec_conn_state); + if (composite_nomem(s, c)) return c; + c->private_data = s; + + s->pipe = p; + s->binding = b; + + /* initialise second dcerpc pipe based on primary pipe's event context */ + s->pipe2 = dcerpc_pipe_init(c, s->pipe->conn->event_ctx); + if (composite_nomem(s->pipe2, c)) return c; + + /* open second dcerpc pipe using the same transport as for primary pipe */ + switch (s->pipe->conn->transport.transport) { + case NCACN_NP: + /* get smb tree of primary dcerpc pipe opened on smb */ + s->tree = dcerpc_smb_tree(s->pipe->conn); + if (!s->tree) { + composite_error(c, NT_STATUS_INVALID_PARAMETER); + return c; + } + + pipe_smb_req = dcerpc_pipe_open_smb_send(s->pipe2, s->tree, + s->binding->endpoint); + composite_continue(c, pipe_smb_req, continue_open_smb, c); + return c; + + case NCACN_IP_TCP: + pipe_tcp_req = dcerpc_pipe_open_tcp_send(s->pipe2->conn, + s->binding->host, + s->binding->target_hostname, + atoi(s->binding->endpoint)); + composite_continue(c, pipe_tcp_req, continue_open_tcp, c); + return c; + + case NCALRPC: + pipe_ncalrpc_req = dcerpc_pipe_open_pipe_send(s->pipe2->conn, + s->binding->endpoint); + composite_continue(c, pipe_ncalrpc_req, continue_open_pipe, c); + return c; + + default: + /* looks like a transport we don't support */ + composite_error(c, NT_STATUS_NOT_SUPPORTED); + } + + return c; +} + + +/* + Stage 2 of secondary_connection: Receive result of pipe open request on smb +*/ +static void continue_open_smb(struct composite_context *ctx) +{ + struct composite_context *c = talloc_get_type(ctx->async.private_data, + struct composite_context); + + c->status = dcerpc_pipe_open_smb_recv(ctx); + if (!composite_is_ok(c)) return; + + continue_pipe_open(c); +} + + +/* + Stage 2 of secondary_connection: Receive result of pipe open request on tcp/ip +*/ +static void continue_open_tcp(struct composite_context *ctx) +{ + struct composite_context *c = talloc_get_type(ctx->async.private_data, + struct composite_context); + + c->status = dcerpc_pipe_open_tcp_recv(ctx); + if (!composite_is_ok(c)) return; + + continue_pipe_open(c); +} + + +/* + Stage 2 of secondary_connection: Receive result of pipe open request on ncalrpc +*/ +static void continue_open_pipe(struct composite_context *ctx) +{ + struct composite_context *c = talloc_get_type(ctx->async.private_data, + struct composite_context); + + c->status = dcerpc_pipe_open_pipe_recv(ctx); + if (!composite_is_ok(c)) return; + + continue_pipe_open(c); +} + + +/* + Stage 3 of secondary_connection: Get binding data and flags from primary pipe + and say if we're done ok. +*/ +static void continue_pipe_open(struct composite_context *c) +{ + struct sec_conn_state *s; + + s = talloc_get_type(c->private_data, struct sec_conn_state); + + s->pipe2->conn->flags = s->pipe->conn->flags; + s->pipe2->binding = s->binding; + if (!talloc_reference(s->pipe2, s->binding)) { + composite_error(c, NT_STATUS_NO_MEMORY); + return; + } + + composite_done(c); +} + + +/* + Receive result of secondary rpc connection request and return + second dcerpc pipe. +*/ +NTSTATUS dcerpc_secondary_connection_recv(struct composite_context *c, + struct dcerpc_pipe **p2) +{ + NTSTATUS status = composite_wait(c); + struct sec_conn_state *s; + + s = talloc_get_type(c->private_data, struct sec_conn_state); + + if (NT_STATUS_IS_OK(status)) { + *p2 = talloc_steal(s->pipe, s->pipe2); + } + + talloc_free(c); + return status; +} + +/* + Create a secondary dcerpc connection from a primary connection + - sync version + + If the primary is a SMB connection then the secondary connection + will be on the same SMB connection, but using a new fnum +*/ +NTSTATUS dcerpc_secondary_connection(struct dcerpc_pipe *p, + struct dcerpc_pipe **p2, + struct dcerpc_binding *b) +{ + struct composite_context *c; + + c = dcerpc_secondary_connection_send(p, b); + return dcerpc_secondary_connection_recv(c, p2); +} + +/* + Create a secondary DCERPC connection, then bind (and possibly + authenticate) using the supplied credentials. + + This creates a second connection, to the same host (and on ncacn_np on the same connection) as the first +*/ +struct sec_auth_conn_state { + struct dcerpc_pipe *pipe2; + struct dcerpc_binding *binding; + const struct dcerpc_interface_table *table; + struct cli_credentials *credentials; + struct composite_context *ctx; +}; + +static void dcerpc_secondary_auth_connection_bind(struct composite_context *ctx); +static void dcerpc_secondary_auth_connection_continue(struct composite_context *ctx); + +struct composite_context* dcerpc_secondary_auth_connection_send(struct dcerpc_pipe *p, + struct dcerpc_binding *binding, + const struct dcerpc_interface_table *table, + struct cli_credentials *credentials) +{ + + struct composite_context *c, *secondary_conn_ctx; + struct sec_auth_conn_state *s; + + /* composite context allocation and setup */ + c = composite_create(p, p->conn->event_ctx); + if (c == NULL) return NULL; + + s = talloc_zero(c, struct sec_auth_conn_state); + if (composite_nomem(s, c)) return c; + c->private_data = s; + s->ctx = c; + + s->binding = binding; + s->table = table; + s->credentials = credentials; + + secondary_conn_ctx = dcerpc_secondary_connection_send(p, binding); + + if (composite_nomem(secondary_conn_ctx, s->ctx)) { + talloc_free(c); + return NULL; + } + + composite_continue(s->ctx, secondary_conn_ctx, dcerpc_secondary_auth_connection_bind, + s); + return c; +} + +/* + Stage 2 of secondary_auth_connection: + Having made the secondary connection, we will need to do an (authenticated) bind +*/ +static void dcerpc_secondary_auth_connection_bind(struct composite_context *ctx) +{ + struct composite_context *secondary_auth_ctx; + struct sec_auth_conn_state *s = talloc_get_type(ctx->async.private_data, + struct sec_auth_conn_state); + + s->ctx->status = dcerpc_secondary_connection_recv(ctx, &s->pipe2); + if (!composite_is_ok(s->ctx)) return; + + secondary_auth_ctx = dcerpc_pipe_auth_send(s->pipe2, s->binding, s->table, s->credentials); + composite_continue(s->ctx, secondary_auth_ctx, dcerpc_secondary_auth_connection_continue, s); + +} + +/* + Stage 3 of secondary_auth_connection: Receive result of authenticated bind request +*/ +static void dcerpc_secondary_auth_connection_continue(struct composite_context *ctx) +{ + struct sec_auth_conn_state *s = talloc_get_type(ctx->async.private_data, + struct sec_auth_conn_state); + + s->ctx->status = dcerpc_pipe_auth_recv(ctx, s, &s->pipe2); + if (!composite_is_ok(s->ctx)) return; + + composite_done(s->ctx); +} + +/* + Receive an authenticated pipe, created as a secondary connection +*/ +NTSTATUS dcerpc_secondary_auth_connection_recv(struct composite_context *c, + TALLOC_CTX *mem_ctx, + struct dcerpc_pipe **p) +{ + NTSTATUS status = composite_wait(c); + struct sec_auth_conn_state *s; + + s = talloc_get_type(c->private_data, struct sec_auth_conn_state); + + if (NT_STATUS_IS_OK(status)) { + *p = talloc_steal(mem_ctx, s->pipe2); + } + + talloc_free(c); + return status; +} |