From 7dfbb2835f395105982c8e42529c468de3cffcb4 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 15 May 2009 11:50:20 +0200 Subject: s3:smbd: implement SMB2 Tree Connect For now this only checks if the share is present or not. metze --- source3/smbd/globals.h | 23 +++++ source3/smbd/smb2_server.c | 54 +++++++++++- source3/smbd/smb2_sesssetup.c | 13 +++ source3/smbd/smb2_tcon.c | 196 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 285 insertions(+), 1 deletion(-) create mode 100644 source3/smbd/smb2_tcon.c (limited to 'source3/smbd') diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index c03da19981..a26311e7da 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -202,6 +202,7 @@ extern int num_children; struct tstream_context; struct smbd_smb2_request; struct smbd_smb2_session; +struct smbd_smb2_tcon; DATA_BLOB negprot_spnego(void); @@ -222,10 +223,12 @@ NTSTATUS smbd_smb2_request_done(struct smbd_smb2_request *req, DATA_BLOB body, DATA_BLOB *dyn); NTSTATUS smbd_smb2_request_check_session(struct smbd_smb2_request *req); +NTSTATUS smbd_smb2_request_check_tcon(struct smbd_smb2_request *req); NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req); NTSTATUS smbd_smb2_request_process_sesssetup(struct smbd_smb2_request *req); NTSTATUS smbd_smb2_request_process_logoff(struct smbd_smb2_request *req); +NTSTATUS smbd_smb2_request_process_tcon(struct smbd_smb2_request *req); NTSTATUS smbd_smb2_request_process_keepalive(struct smbd_smb2_request *req); struct smbd_smb2_request { @@ -236,6 +239,9 @@ struct smbd_smb2_request { /* the session the request operates on, maybe NULL */ struct smbd_smb2_session *session; + /* the tcon the request operates on, maybe NULL */ + struct smbd_smb2_tcon *tcon; + int current_idx; struct { @@ -292,6 +298,23 @@ struct smbd_smb2_session { NTSTATUS status; uint64_t vuid; AUTH_NTLMSSP_STATE *auth_ntlmssp_state; + + struct { + /* an id tree used to allocate tids */ + struct idr_context *idtree; + + /* this is the limit of tid values for this connection */ + uint32_t limit; + + struct smbd_smb2_tcon *list; + } tcons; +}; + +struct smbd_smb2_tcon { + struct smbd_smb2_tcon *prev, *next; + struct smbd_smb2_session *session; + uint32_t tid; + int snum; }; struct smbd_server_connection { diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c index c6160189fe..a11ffd7624 100644 --- a/source3/smbd/smb2_server.c +++ b/source3/smbd/smb2_server.c @@ -315,13 +315,17 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } - return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); + return smbd_smb2_request_process_tcon(req); case SMB2_OP_TDIS: status = smbd_smb2_request_check_session(req); if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_CREATE: @@ -329,6 +333,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_CLOSE: @@ -336,6 +344,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_FLUSH: @@ -343,6 +355,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_READ: @@ -350,6 +366,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_WRITE: @@ -357,6 +377,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_LOCK: @@ -364,6 +388,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_IOCTL: @@ -371,6 +399,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_CANCEL: @@ -384,6 +416,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_NOTIFY: @@ -391,6 +427,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_GETINFO: @@ -398,6 +438,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_SETINFO: @@ -405,6 +449,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); case SMB2_OP_BREAK: @@ -412,6 +460,10 @@ static NTSTATUS smbd_smb2_request_dispatch(struct smbd_smb2_request *req) if (!NT_STATUS_IS_OK(status)) { return smbd_smb2_request_error(req, status); } + status = smbd_smb2_request_check_tcon(req); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } return smbd_smb2_request_error(req, NT_STATUS_NOT_IMPLEMENTED); } diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index a7fef4ab2f..fafda24ca4 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -115,6 +115,11 @@ static int smbd_smb2_session_destructor(struct smbd_smb2_session *session) return 0; } + /* first free all tcons */ + while (session->tcons.list) { + talloc_free(session->tcons.list); + } + idr_remove(session->conn->smb2.sessions.idtree, session->vuid); DLIST_REMOVE(session->conn->smb2.sessions.list, session); @@ -150,6 +155,14 @@ static NTSTATUS smbd_smb2_session_setup(struct smbd_smb2_request *req, return NT_STATUS_INSUFFICIENT_RESOURCES; } session->vuid = id; + + session->tcons.idtree = idr_init(session); + if (session->tcons.idtree == NULL) { + return NT_STATUS_NO_MEMORY; + } + session->tcons.limit = 0x00FFFFFF; + session->tcons.list = NULL; + DLIST_ADD_END(req->conn->smb2.sessions.list, session, struct smbd_smb2_session *); session->conn = req->conn; diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c new file mode 100644 index 0000000000..895677c984 --- /dev/null +++ b/source3/smbd/smb2_tcon.c @@ -0,0 +1,196 @@ +/* + Unix SMB/CIFS implementation. + Core SMB2 server + + Copyright (C) Stefan Metzmacher 2009 + + 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 . +*/ + +#include "includes.h" +#include "smbd/globals.h" +#include "../source4/libcli/smb2/smb2_constants.h" + +static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, + const char *share, + uint32_t *out_tree_id); + +NTSTATUS smbd_smb2_request_process_tcon(struct smbd_smb2_request *req) +{ + const uint8_t *inbody; + int i = req->current_idx; + uint8_t *outhdr; + DATA_BLOB outbody; + size_t expected_body_size = 0x09; + size_t body_size; + uint16_t in_path_offset; + uint16_t in_path_length; + DATA_BLOB in_path_buffer; + char *in_path_string; + size_t in_path_string_size; + uint32_t out_tree_id; + NTSTATUS status; + bool ok; + + if (req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) { + return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER); + } + + inbody = (const uint8_t *)req->in.vector[i+1].iov_base; + + body_size = SVAL(inbody, 0x00); + if (body_size != expected_body_size) { + return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER); + } + + in_path_offset = SVAL(inbody, 0x04); + in_path_length = SVAL(inbody, 0x06); + + if (in_path_offset != (SMB2_HDR_BODY + (body_size & 0xFFFFFFFE))) { + return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER); + } + + if (in_path_length > req->in.vector[i+2].iov_len) { + return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER); + } + + in_path_buffer.data = (uint8_t *)req->in.vector[i+2].iov_base; + in_path_buffer.length = in_path_length; + + ok = convert_string_talloc(req, CH_UTF16, CH_UNIX, + in_path_buffer.data, + in_path_buffer.length, + &in_path_string, + &in_path_string_size, false); + if (!ok) { + return smbd_smb2_request_error(req, NT_STATUS_ILLEGAL_CHARACTER); + } + + status = smbd_smb2_tree_connect(req, in_path_string, &out_tree_id); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); + } + + outhdr = (uint8_t *)req->out.vector[i].iov_base; + + outbody = data_blob_talloc(req->out.vector, NULL, 0x10); + if (outbody.data == NULL) { + return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY); + } + + SIVAL(outhdr, SMB2_HDR_TID, out_tree_id); + + SSVAL(outbody.data, 0x00, 0x10); /* struct size */ + SCVAL(outbody.data, 0x02, 0); /* share type */ + SCVAL(outbody.data, 0x03, 0); /* reserved */ + SIVAL(outbody.data, 0x04, 0); /* share flags */ + SIVAL(outbody.data, 0x08, 0); /* capabilities */ + SIVAL(outbody.data, 0x0C, 0); /* maximal access */ + + return smbd_smb2_request_done(req, outbody, NULL); +} + +static int smbd_smb2_tcon_destructor(struct smbd_smb2_tcon *tcon) +{ + if (tcon->session == NULL) { + return 0; + } + + idr_remove(tcon->session->tcons.idtree, tcon->tid); + DLIST_REMOVE(tcon->session->tcons.list, tcon); + + tcon->tid = 0; + tcon->session = NULL; + + return 0; +} + +static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req, + const char *in_path, + uint32_t *out_tree_id) +{ + const char *share = in_path; + fstring service; + int snum = -1; + struct smbd_smb2_tcon *tcon; + int id; + + if (strncmp(share, "\\\\", 2) == 0) { + const char *p = strchr(share+2, '\\'); + if (p) { + share = p + 1; + } + } + + DEBUG(10,("smbd_smb2_tree_connect: path[%s] share[%s]\n", + in_path, share)); + + fstrcpy(service, share); + + strlower_m(service); + + snum = find_service(service); + if (snum < 0) { + DEBUG(1,("smbd_smb2_tree_connect: couldn't find service %s\n", + service)); + return NT_STATUS_BAD_NETWORK_NAME; + } + + /* TODO: do more things... */ + + /* create a new tcon as child of the session */ + tcon = talloc_zero(req->session, struct smbd_smb2_tcon); + if (tcon == NULL) { + return NT_STATUS_NO_MEMORY; + } + id = idr_get_new_random(req->session->tcons.idtree, + tcon, + req->session->tcons.limit); + if (id == -1) { + return NT_STATUS_INSUFFICIENT_RESOURCES; + } + tcon->tid = id; + tcon->snum = snum; + + DLIST_ADD_END(req->session->tcons.list, tcon, + struct smbd_smb2_tcon *); + tcon->session = req->session; + talloc_set_destructor(tcon, smbd_smb2_tcon_destructor); + + *out_tree_id = tcon->tid; + return NT_STATUS_OK; +} + +NTSTATUS smbd_smb2_request_check_tcon(struct smbd_smb2_request *req) +{ + const uint8_t *inhdr; + int i = req->current_idx; + uint32_t in_tid; + void *p; + struct smbd_smb2_tcon *tcon; + + inhdr = (const uint8_t *)req->in.vector[i+0].iov_base; + + in_tid = IVAL(inhdr, SMB2_HDR_TID); + + /* lookup an existing session */ + p = idr_find(req->session->tcons.idtree, in_tid); + if (p == NULL) { + return NT_STATUS_NETWORK_NAME_DELETED; + } + tcon = talloc_get_type_abort(p, struct smbd_smb2_tcon); + + req->tcon = tcon; + return NT_STATUS_OK; +} -- cgit