s3:smbd: add marshalling layer for SMB2 Lock support

metze

4 files changed, 232 insertions, 1 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 904188db6d..01ab5f0a58 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -772,6 +772,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
 	       smbd/smb2_flush.o \
 	       smbd/smb2_read.o \
 	       smbd/smb2_write.o \
+	       smbd/smb2_lock.o \
 	       smbd/smb2_ioctl.o \
 	       smbd/smb2_keepalive.o \
 	       smbd/smb2_find.o \
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 29a0dd06c0..3d195c84f0 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -215,6 +215,7 @@ NTSTATUS smbd_smb2_request_process_close(struct smbd_smb2_request *req);
 NTSTATUS smbd_smb2_request_process_flush(struct smbd_smb2_request *req);
 NTSTATUS smbd_smb2_request_process_read(struct smbd_smb2_request *req);
 NTSTATUS smbd_smb2_request_process_write(struct smbd_smb2_request *req);
+NTSTATUS smbd_smb2_request_process_lock(struct smbd_smb2_request *req);
 NTSTATUS smbd_smb2_request_process_ioctl(struct smbd_smb2_request *req);
 NTSTATUS smbd_smb2_request_process_keepalive(struct smbd_smb2_request *req);
 NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req);
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
new file mode 100644
index 0000000000..3ffe053481
--- /dev/null
+++ b/source3/smbd/smb2_lock.c
@@ -0,0 +1,229 @@
+/*
+   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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "smbd/globals.h"
+#include "../source4/libcli/smb2/smb2_constants.h"
+
+struct smbd_smb2_lock_element {
+	uint64_t offset;
+	uint64_t length;
+	uint32_t flags;
+};
+
+static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
+						 struct tevent_context *ev,
+						 struct smbd_smb2_request *smb2req,
+						 uint64_t in_file_id_volatile,
+						 uint16_t in_lock_count,
+						 struct smbd_smb2_lock_element *in_locks);
+static NTSTATUS smbd_smb2_lock_recv(struct tevent_req *req);
+
+static void smbd_smb2_request_lock_done(struct tevent_req *subreq);
+NTSTATUS smbd_smb2_request_process_lock(struct smbd_smb2_request *req)
+{
+	const uint8_t *inhdr;
+	const uint8_t *inbody;
+	int i = req->current_idx;
+	size_t expected_body_size = 0x30;
+	size_t body_size;
+	uint16_t in_lock_count;
+	uint64_t in_file_id_persistent;
+	uint64_t in_file_id_volatile;
+	struct smbd_smb2_lock_element *in_locks;
+	struct tevent_req *subreq;
+	const uint8_t *lock_buffer;
+
+	inhdr = (const uint8_t *)req->in.vector[i+0].iov_base;
+	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_lock_count			= CVAL(inbody, 0x02);
+	/* 0x04 4 bytes reserved */
+	in_file_id_persistent		= BVAL(inbody, 0x08);
+	in_file_id_volatile		= BVAL(inbody, 0x10);
+
+	if (in_lock_count < 1) {
+		return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+	}
+
+	if (((in_lock_count - 1) * 0x18) > req->in.vector[i+2].iov_len) {
+		return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+	}
+
+	if (req->compat_chain_fsp) {
+		/* skip check */
+	} else if (in_file_id_persistent != 0) {
+		return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
+	}
+
+	in_locks = talloc_array(req, struct smbd_smb2_lock_element,
+				in_lock_count);
+	if (in_locks == NULL) {
+		return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
+	}
+
+	i = 0;
+	lock_buffer = inbody + 0x18;
+
+	in_locks[i].offset	= BVAL(lock_buffer, 0x00);
+	in_locks[i].length	= BVAL(lock_buffer, 0x08);
+	in_locks[i].flags	= BVAL(lock_buffer, 0x10);
+
+	lock_buffer = (const uint8_t *)req->in.vector[i+2].iov_base;
+
+	for (i=1; i < in_lock_count; i++) {
+		in_locks[i].offset	= BVAL(lock_buffer, 0x00);
+		in_locks[i].length	= BVAL(lock_buffer, 0x08);
+		in_locks[i].flags	= BVAL(lock_buffer, 0x10);
+
+		lock_buffer += 0x18;
+	}
+
+	subreq = smbd_smb2_lock_send(req,
+				     req->conn->smb2.event_ctx,
+				     req,
+				     in_file_id_volatile,
+				     in_lock_count,
+				     in_locks);
+	if (subreq == NULL) {
+		return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
+	}
+	tevent_req_set_callback(subreq, smbd_smb2_request_lock_done, req);
+
+	if (tevent_req_is_in_progress(subreq)) {
+		return smbd_smb2_request_pending_queue(req);
+	}
+
+	return NT_STATUS_OK;
+}
+
+static void smbd_smb2_request_lock_done(struct tevent_req *subreq)
+{
+	struct smbd_smb2_request *req = tevent_req_callback_data(subreq,
+					struct smbd_smb2_request);
+	DATA_BLOB outbody;
+	NTSTATUS status;
+	NTSTATUS error; /* transport error */
+
+	status = smbd_smb2_lock_recv(subreq);
+	TALLOC_FREE(subreq);
+	if (!NT_STATUS_IS_OK(status)) {
+		error = smbd_smb2_request_error(req, status);
+		if (!NT_STATUS_IS_OK(error)) {
+			smbd_server_connection_terminate(req->conn,
+							 nt_errstr(error));
+			return;
+		}
+		return;
+	}
+
+	outbody = data_blob_talloc(req->out.vector, NULL, 0x04);
+	if (outbody.data == NULL) {
+		error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
+		if (!NT_STATUS_IS_OK(error)) {
+			smbd_server_connection_terminate(req->conn,
+							 nt_errstr(error));
+			return;
+		}
+		return;
+	}
+
+	SSVAL(outbody.data, 0x00, 0x04);	/* struct size */
+	SSVAL(outbody.data, 0x02, 0);		/* reserved */
+
+	error = smbd_smb2_request_done(req, outbody, NULL);
+	if (!NT_STATUS_IS_OK(error)) {
+		smbd_server_connection_terminate(req->conn,
+						 nt_errstr(error));
+		return;
+	}
+}
+
+struct smbd_smb2_lock_state {
+	struct smbd_smb2_request *smb2req;
+};
+
+static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
+						 struct tevent_context *ev,
+						 struct smbd_smb2_request *smb2req,
+						 uint64_t in_file_id_volatile,
+						 uint16_t in_lock_count,
+						 struct smbd_smb2_lock_element *in_locks)
+{
+	struct tevent_req *req;
+	struct smbd_smb2_lock_state *state;
+	struct smb_request *smbreq;
+	connection_struct *conn = smb2req->tcon->compat_conn;
+	files_struct *fsp;
+
+	req = tevent_req_create(mem_ctx, &state,
+				struct smbd_smb2_lock_state);
+	if (req == NULL) {
+		return NULL;
+	}
+	state->smb2req = smb2req;
+
+	DEBUG(10,("smbd_smb2_lock_send: file_id[0x%016llX]\n",
+		  (unsigned long long)in_file_id_volatile));
+
+	smbreq = smbd_smb2_fake_smb_request(smb2req);
+	if (tevent_req_nomem(smbreq, req)) {
+		return tevent_req_post(req, ev);
+	}
+
+	fsp = file_fsp(smbreq, (uint16_t)in_file_id_volatile);
+	if (fsp == NULL) {
+		tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
+		return tevent_req_post(req, ev);
+	}
+	if (conn != fsp->conn) {
+		tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
+		return tevent_req_post(req, ev);
+	}
+	if (smb2req->session->vuid != fsp->vuid) {
+		tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
+		return tevent_req_post(req, ev);
+	}
+
+	tevent_req_nterror(req, NT_STATUS_NOT_IMPLEMENTED);
+	return tevent_req_post(req, ev);
+}
+
+static NTSTATUS smbd_smb2_lock_recv(struct tevent_req *req)
+{
+	NTSTATUS status;
+
+	if (tevent_req_is_nterror(req, &status)) {
+		tevent_req_received(req);
+		return status;
+	}
+
+	tevent_req_received(req);
+	return NT_STATUS_OK;
+}
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 161db8f1d3..43afb1b901 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -716,7 +716,7 @@ 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_lock(req);
 
 	case SMB2_OP_IOCTL:
 		if (!NT_STATUS_IS_OK(session_status)) {