diff options
| -rw-r--r-- | source4/librpc/config.mk | 16 | ||||
| -rw-r--r-- | source4/librpc/rpc/config.mk | 17 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.c | 5 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.h | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_smb2.c | 474 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 72 |
6 files changed, 564 insertions, 22 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 9e2ec48264..bf50a23608 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -25,21 +25,7 @@ REQUIRED_SUBSYSTEMS = LIBCOMPRESSION # End SUBSYSTEM NDR_COMPRESSION ################################################ -################################################ -# Start SUBSYSTEM RPC_RAW -[SUBSYSTEM::RPC_RAW] -INIT_OBJ_FILES = \ - rpc/dcerpc.o -ADD_OBJ_FILES = \ - rpc/dcerpc_auth.o \ - rpc/dcerpc_schannel.o \ - rpc/dcerpc_util.o \ - rpc/dcerpc_error.o \ - rpc/dcerpc_smb.o \ - rpc/dcerpc_sock.o -REQUIRED_SUBSYSTEMS = SOCKET -# End SUBSYSTEM RPC_RAW -################################################ +include rpc/config.mk [SUBSYSTEM::NDR_AUDIOSRV] INIT_FUNCTION = dcerpc_audiosrv_init diff --git a/source4/librpc/rpc/config.mk b/source4/librpc/rpc/config.mk new file mode 100644 index 0000000000..046db2d323 --- /dev/null +++ b/source4/librpc/rpc/config.mk @@ -0,0 +1,17 @@ +################################################ +# Start SUBSYSTEM RPC_RAW +[SUBSYSTEM::RPC_RAW] +INIT_OBJ_FILES = \ + dcerpc.o +ADD_OBJ_FILES = \ + dcerpc_auth.o \ + dcerpc_schannel.o \ + dcerpc_util.o \ + dcerpc_error.o \ + dcerpc_smb.o \ + dcerpc_smb2.o \ + dcerpc_sock.o +REQUIRED_SUBSYSTEMS = SOCKET +# End SUBSYSTEM RPC_RAW +################################################ + diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index b485864c7b..220b061f3c 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -550,11 +550,16 @@ static void dcerpc_recv_data(struct dcerpc_connection *conn, DATA_BLOB *blob, NT { struct ncacn_packet pkt; + if (NT_STATUS_IS_OK(status) && blob->length == 0) { + status = NT_STATUS_UNEXPECTED_NETWORK_ERROR; + } + /* the transport may be telling us of a severe error, such as a dropped socket */ if (!NT_STATUS_IS_OK(status)) { data_blob_free(blob); dcerpc_connection_dead(conn, status); + return; } /* parse the basic packet to work out what type of response this is */ diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index a526ed5a01..e1285c349f 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -142,6 +142,8 @@ struct dcerpc_pipe { /* enable krb5 auth */ #define DCERPC_AUTH_KRB5 (1<<16) +#define DCERPC_SMB2 (1<<17) + /* this is used to find pointers to calls */ diff --git a/source4/librpc/rpc/dcerpc_smb2.c b/source4/librpc/rpc/dcerpc_smb2.c new file mode 100644 index 0000000000..56d568a663 --- /dev/null +++ b/source4/librpc/rpc/dcerpc_smb2.c @@ -0,0 +1,474 @@ +/* + Unix SMB/CIFS implementation. + + dcerpc over SMB2 transport + + Copyright (C) Andrew Tridgell 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 2 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, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "includes.h" +#include "libcli/raw/libcliraw.h" +#include "librpc/gen_ndr/ndr_security.h" +#include "libcli/composite/composite.h" +#include "libcli/smb2/smb2.h" +#include "libcli/smb2/smb2_calls.h" + +/* transport private information used by SMB2 pipe transport */ +struct smb2_private { + struct smb2_handle handle; + struct smb2_tree *tree; + const char *server_name; +}; + + +/* + tell the dcerpc layer that the transport is dead +*/ +static void pipe_dead(struct dcerpc_connection *c, NTSTATUS status) +{ + c->transport.recv_data(c, NULL, status); +} + + +/* + this holds the state of an in-flight call +*/ +struct smb2_read_state { + struct dcerpc_connection *c; + DATA_BLOB data; +}; + +/* + called when a read request has completed +*/ +static void smb2_read_callback(struct smb2_request *req) +{ + struct smb2_private *smb; + struct smb2_read_state *state; + struct smb2_read io; + uint16_t frag_length; + NTSTATUS status; + + state = talloc_get_type(req->async.private, struct smb2_read_state); + smb = talloc_get_type(state->c->transport.private, struct smb2_private); + + status = smb2_read_recv(req, state, &io); + if (NT_STATUS_IS_ERR(status)) { + pipe_dead(state->c, status); + talloc_free(state); + return; + } + + status = data_blob_append(state, &state->data, + io.out.data.data, io.out.data.length); + if (NT_STATUS_IS_ERR(status)) { + pipe_dead(state->c, status); + talloc_free(state); + return; + } + + if (state->data.length < 16) { + DEBUG(0,("dcerpc_smb2: short packet (length %d) in read callback!\n", + (int)state->data.length)); + pipe_dead(state->c, NT_STATUS_INFO_LENGTH_MISMATCH); + talloc_free(state); + return; + } + + frag_length = dcerpc_get_frag_length(&state->data); + + if (frag_length <= state->data.length) { + DATA_BLOB data = state->data; + struct dcerpc_connection *c = state->c; + talloc_steal(c, data.data); + talloc_free(state); + c->transport.recv_data(c, &data, NT_STATUS_OK); + return; + } + + /* initiate another read request, as we only got part of a fragment */ + ZERO_STRUCT(io); + io.in.length = MIN(state->c->srv_max_xmit_frag, + frag_length - state->data.length); + io.in.handle = smb->handle; + + req = smb2_read_send(smb->tree, &io); + if (req == NULL) { + pipe_dead(state->c, NT_STATUS_NO_MEMORY); + talloc_free(state); + return; + } + + req->async.fn = smb2_read_callback; + req->async.private = state; +} + + +/* + trigger a read request from the server, possibly with some initial + data in the read buffer +*/ +static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLOB *blob) +{ + struct smb2_private *smb = c->transport.private; + struct smb2_read io; + struct smb2_read_state *state; + struct smb2_request *req; + + state = talloc(smb, struct smb2_read_state); + if (state == NULL) { + return NT_STATUS_NO_MEMORY; + } + + state->c = c; + if (blob == NULL) { + state->data = data_blob(NULL, 0); + } else { + state->data = *blob; + talloc_steal(state, state->data.data); + } + + ZERO_STRUCT(io); + io.in.handle = smb->handle; + + if (state->data.length >= 16) { + uint16_t frag_length = dcerpc_get_frag_length(&state->data); + io.in.length = frag_length - state->data.length; + } else { + io.in.length = 0x2000; + } + + req = smb2_read_send(smb->tree, &io); + if (req == NULL) { + return NT_STATUS_NO_MEMORY; + } + + req->async.fn = smb2_read_callback; + req->async.private = state; + + return NT_STATUS_OK; +} + + +/* + trigger a read request from the server +*/ +static NTSTATUS send_read_request(struct dcerpc_connection *c) +{ + return send_read_request_continue(c, NULL); +} + +/* + this holds the state of an in-flight trans call +*/ +struct smb2_trans_state { + struct dcerpc_connection *c; +}; + +/* + called when a trans request has completed +*/ +static void smb2_trans_callback(struct smb2_request *req) +{ + struct smb2_trans_state *state = talloc_get_type(req->async.private, + struct smb2_trans_state); + struct dcerpc_connection *c = state->c; + NTSTATUS status; + struct smb2_trans io; + + status = smb2_trans_recv(req, state, &io); + if (NT_STATUS_IS_ERR(status)) { + pipe_dead(c, status); + return; + } + + if (!NT_STATUS_EQUAL(status, STATUS_BUFFER_OVERFLOW)) { + DATA_BLOB data = io.out.out; + talloc_steal(c, data.data); + talloc_free(state); + c->transport.recv_data(c, &data, NT_STATUS_OK); + return; + } + + /* there is more to receive - setup a read */ + send_read_request_continue(c, &io.out.out); + talloc_free(state); +} + +/* + send a SMBtrans style request +*/ +static NTSTATUS smb2_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *blob) +{ + struct smb2_private *smb = talloc_get_type(c->transport.private, + struct smb2_private); + struct smb2_trans io; + struct smb2_trans_state *state; + struct smb2_request *req; + + state = talloc(smb, struct smb2_trans_state); + if (state == NULL) { + return NT_STATUS_NO_MEMORY; + } + + state->c = c; + + ZERO_STRUCT(io); + io.in.unknown1 = 0x0011c017; + io.in.handle = smb->handle; + io.in.max_response_size = 0x10000; + io.in.flags = 1; + io.in.out = *blob; + + req = smb2_trans_send(smb->tree, &io); + if (req == NULL) { + talloc_free(state); + return NT_STATUS_NO_MEMORY; + } + + req->async.fn = smb2_trans_callback; + req->async.private = state; + + talloc_steal(state, req); + + return NT_STATUS_OK; +} + +/* + called when a write request has completed +*/ +static void smb2_write_callback(struct smb2_request *req) +{ + struct dcerpc_connection *c = req->async.private; + + if (!NT_STATUS_IS_OK(req->status)) { + DEBUG(0,("dcerpc_smb2: write callback error\n")); + pipe_dead(c, req->status); + } + + smb2_request_destroy(req); +} + +/* + send a packet to the server +*/ +static NTSTATUS smb2_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, + BOOL trigger_read) +{ + struct smb2_private *smb = c->transport.private; + struct smb2_write io; + struct smb2_request *req; + + if (trigger_read) { + return smb2_send_trans_request(c, blob); + } + + ZERO_STRUCT(io); + io.in.handle = smb->handle; + io.in.data = *blob; + + req = smb2_write_send(smb->tree, &io); + if (req == NULL) { + return NT_STATUS_NO_MEMORY; + } + + req->async.fn = smb2_write_callback; + req->async.private = c; + + return NT_STATUS_OK; +} + +/* + shutdown SMB pipe connection +*/ +static NTSTATUS smb2_shutdown_pipe(struct dcerpc_connection *c) +{ + struct smb2_private *smb = c->transport.private; + struct smb2_close io; + struct smb2_request *req; + + /* maybe we're still starting up */ + if (!smb) return NT_STATUS_OK; + + ZERO_STRUCT(io); + io.in.handle = smb->handle; + req = smb2_close_send(smb->tree, &io); + if (req != NULL) { + /* we don't care if this fails, so just free it if it succeeds */ + req->async.fn = (void (*)(struct smb2_request *))talloc_free; + } + + talloc_free(smb); + + return NT_STATUS_OK; +} + +/* + return SMB server name +*/ +static const char *smb2_peer_name(struct dcerpc_connection *c) +{ + struct smb2_private *smb = talloc_get_type(c->transport.private, + struct smb2_private); + return smb->server_name; +} + +/* + fetch the user session key +*/ +static NTSTATUS smb2_session_key(struct dcerpc_connection *c, DATA_BLOB *session_key) +{ + struct smb2_private *smb = talloc_get_type(c->transport.private, + struct smb2_private); + *session_key = smb->tree->session->session_key; + if (session_key->data == NULL) { + return NT_STATUS_NO_USER_SESSION_KEY; + } + return NT_STATUS_OK; +} + +struct pipe_open_smb2_state { + struct dcerpc_connection *c; + struct composite_context *ctx; +}; + +static void pipe_open_recv(struct smb2_request *req); + +struct composite_context *dcerpc_pipe_open_smb2_send(struct dcerpc_connection *c, + struct smb2_tree *tree, + const char *pipe_name) +{ + struct composite_context *ctx; + struct pipe_open_smb2_state *state; + struct smb2_create io; + struct smb2_request *req; + + ctx = talloc_zero(NULL, struct composite_context); + if (ctx == NULL) goto failed; + ctx->state = COMPOSITE_STATE_IN_PROGRESS; + ctx->event_ctx = talloc_reference(c, c->event_ctx); + + state = talloc(ctx, struct pipe_open_smb2_state); + if (state == NULL) goto failed; + + state->c = c; + state->ctx = ctx; + + ZERO_STRUCT(io); + io.in.access_mask = + SEC_STD_READ_CONTROL | + SEC_FILE_READ_ATTRIBUTE | + SEC_FILE_WRITE_ATTRIBUTE | + SEC_STD_SYNCHRONIZE | + SEC_FILE_READ_EA | + SEC_FILE_WRITE_EA | + SEC_FILE_READ_DATA | + SEC_FILE_WRITE_DATA | + SEC_FILE_APPEND_DATA; + io.in.share_access = + NTCREATEX_SHARE_ACCESS_READ | + NTCREATEX_SHARE_ACCESS_WRITE; + io.in.open_disposition = NTCREATEX_DISP_OPEN; + io.in.create_options = 0x400040; + io.in.impersonation = NTCREATEX_IMPERSONATION_IMPERSONATION; + + if ((strncasecmp(pipe_name, "/pipe/", 6) == 0) || + (strncasecmp(pipe_name, "\\pipe\\", 6) == 0)) { + pipe_name += 6; + } + io.in.fname = pipe_name; + + req = smb2_create_send(tree, &io); + if (req == NULL) goto failed; + + req->async.fn = pipe_open_recv; + req->async.private = state; + + return ctx; + + failed: + talloc_free(ctx); + return NULL; +} + +static void pipe_open_recv(struct smb2_request *req) +{ + struct pipe_open_smb2_state *state = + talloc_get_type(req->async.private, + struct pipe_open_smb2_state); + struct composite_context *ctx = state->ctx; + struct dcerpc_connection *c = state->c; + struct smb2_tree *tree = req->tree; + struct smb2_private *smb; + struct smb2_create io; + + ctx->status = smb2_create_recv(req, state, &io); + if (!composite_is_ok(ctx)) return; + + /* + fill in the transport methods + */ + c->transport.transport = NCACN_NP; + c->transport.private = NULL; + c->transport.shutdown_pipe = smb2_shutdown_pipe; + c->transport.peer_name = smb2_peer_name; + + c->transport.send_request = smb2_send_request; + c->transport.send_read = send_read_request; + c->transport.recv_data = NULL; + + /* Over-ride the default session key with the SMB session key */ + c->security_state.session_key = smb2_session_key; + + smb = talloc(c, struct smb2_private); + if (composite_nomem(smb, ctx)) return; + + smb->handle = io.out.handle; + smb->tree = talloc_reference(smb, tree); + smb->server_name= strupper_talloc(smb, + tree->session->transport->socket->hostname); + if (composite_nomem(smb->server_name, ctx)) return; + + c->transport.private = smb; + + composite_done(ctx); +} + +NTSTATUS dcerpc_pipe_open_smb2_recv(struct composite_context *c) +{ + NTSTATUS status = composite_wait(c); + talloc_free(c); + return status; +} + +NTSTATUS dcerpc_pipe_open_smb2(struct dcerpc_connection *c, + struct smb2_tree *tree, + const char *pipe_name) +{ + struct composite_context *ctx = dcerpc_pipe_open_smb2_send(c, tree, pipe_name); + return dcerpc_pipe_open_smb2_recv(ctx); +} + +/* + return the SMB2 tree used for a dcerpc over SMB2 pipe +*/ +struct smb2_tree *dcerpc_smb2_tree(struct dcerpc_connection *c) +{ + struct smb2_private *smb = talloc_get_type(c->transport.private, + struct smb2_private); + return smb->tree; +} diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index c3e928b6f1..b21ab38b05 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -201,7 +201,8 @@ static const struct { {"validate", DCERPC_DEBUG_VALIDATE_BOTH}, {"print", DCERPC_DEBUG_PRINT_BOTH}, {"padcheck", DCERPC_DEBUG_PAD_CHECK}, - {"bigendian", DCERPC_PUSH_BIGENDIAN} + {"bigendian", DCERPC_PUSH_BIGENDIAN}, + {"smb2", DCERPC_SMB2} }; const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor) @@ -1014,12 +1015,12 @@ NTSTATUS dcerpc_pipe_auth(struct dcerpc_pipe *p, /* open a rpc connection to a rpc pipe on SMB using the binding structure to determine the endpoint and options */ -static NTSTATUS dcerpc_pipe_connect_ncacn_np(TALLOC_CTX *tmp_ctx, - struct dcerpc_pipe *p, - struct dcerpc_binding *binding, - const char *pipe_uuid, - uint32_t pipe_version, - struct cli_credentials *credentials) +static NTSTATUS dcerpc_pipe_connect_ncacn_np_smb(TALLOC_CTX *tmp_ctx, + struct dcerpc_pipe *p, + struct dcerpc_binding *binding, + const char *pipe_uuid, + uint32_t pipe_version, + struct cli_credentials *credentials) { NTSTATUS status; struct smbcli_state *cli; @@ -1056,6 +1057,63 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_np(TALLOC_CTX *tmp_ctx, return NT_STATUS_OK; } +/* open a rpc connection to a rpc pipe on SMB2 using the binding + structure to determine the endpoint and options */ +static NTSTATUS dcerpc_pipe_connect_ncacn_np_smb2(TALLOC_CTX *tmp_ctx, + struct dcerpc_pipe *p, + struct dcerpc_binding *binding, + const char *pipe_uuid, + uint32_t pipe_version, + struct cli_credentials *credentials) +{ + NTSTATUS status; + struct smb2_tree *tree; + const char *pipe_name = NULL; + + if (binding->flags & DCERPC_SCHANNEL) { + credentials = cli_credentials_init(tmp_ctx); + cli_credentials_set_anonymous(credentials); + cli_credentials_guess(credentials); + } + status = smb2_connect(tmp_ctx, binding->host, "IPC$", credentials, &tree, + p->conn->event_ctx); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0,("Failed to connect to %s - %s\n", + binding->host, nt_errstr(status))); + return status; + } + + pipe_name = binding->endpoint; + + status = dcerpc_pipe_open_smb2(p->conn, tree, pipe_name); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0,("Failed to open pipe %s - %s\n", pipe_name, nt_errstr(status))); + return status; + } + + talloc_steal(p->conn, tree); + + return NT_STATUS_OK; +} + + +/* open a rpc connection to a rpc pipe on SMB using the binding + structure to determine the endpoint and options */ +static NTSTATUS dcerpc_pipe_connect_ncacn_np(TALLOC_CTX *tmp_ctx, + struct dcerpc_pipe *p, + struct dcerpc_binding *binding, + const char *pipe_uuid, + uint32_t pipe_version, + struct cli_credentials *credentials) +{ + if (binding->flags & DCERPC_SMB2) { + return dcerpc_pipe_connect_ncacn_np_smb2(tmp_ctx, p, binding, pipe_uuid, + pipe_version, credentials); + } + return dcerpc_pipe_connect_ncacn_np_smb(tmp_ctx, p, binding, pipe_uuid, + pipe_version, credentials); +} + /* open a rpc connection to a rpc pipe on SMP using the binding structure to determine the endpoint and options */ static NTSTATUS dcerpc_pipe_connect_ncalrpc(TALLOC_CTX *tmp_ctx, |