From 898297b7a1ef4397b018327b83e3f77c709f94f8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 25 Jul 2017 12:11:37 +0200 Subject: libsmb: Add smb2cli_notify() Bug: https://bugzilla.samba.org/show_bug.cgi?id=13382 Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison (cherry picked from commit ad33964f8c85b67a2d2b451bece208d8bfb8cad6) --- libcli/smb/smb2cli_notify.c | 178 ++++++++++++++++++++++++++++++++++++++++++++ libcli/smb/smbXcli_base.h | 26 +++++++ libcli/smb/wscript | 1 + 3 files changed, 205 insertions(+) create mode 100644 libcli/smb/smb2cli_notify.c (limited to 'libcli') diff --git a/libcli/smb/smb2cli_notify.c b/libcli/smb/smb2cli_notify.c new file mode 100644 index 00000000000..0a23cf9ad03 --- /dev/null +++ b/libcli/smb/smb2cli_notify.c @@ -0,0 +1,178 @@ +/* + Unix SMB/CIFS implementation. + smb2 lib + Copyright (C) Volker Lendecke 2017 + + 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 "system/network.h" +#include "lib/util/tevent_ntstatus.h" +#include "smb_common.h" +#include "smbXcli_base.h" +#include "librpc/gen_ndr/ndr_notify.h" + +struct smb2cli_notify_state { + uint8_t fixed[32]; + + struct iovec *recv_iov; + uint8_t *data; + uint32_t data_length; +}; + +static void smb2cli_notify_done(struct tevent_req *subreq); + +struct tevent_req *smb2cli_notify_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + struct smbXcli_tcon *tcon, + uint32_t output_buffer_length, + uint64_t fid_persistent, + uint64_t fid_volatile, + uint32_t completion_filter, + bool recursive) +{ + struct tevent_req *req, *subreq; + struct smb2cli_notify_state *state; + uint8_t *fixed; + + req = tevent_req_create(mem_ctx, &state, + struct smb2cli_notify_state); + if (req == NULL) { + return NULL; + } + fixed = state->fixed; + SSVAL(fixed, 0, 32); + SSVAL(fixed, 2, recursive ? SMB2_WATCH_TREE : 0); + SIVAL(fixed, 4, output_buffer_length); + SBVAL(fixed, 8, fid_persistent); + SBVAL(fixed, 16, fid_volatile); + SIVAL(fixed, 24, completion_filter); + SIVAL(fixed, 28, 0); /* reserved */ + + subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_NOTIFY, + 0, 0, /* flags */ + timeout_msec, + tcon, + session, + state->fixed, sizeof(state->fixed), + NULL, 0, /* dyn* */ + 0); /* max_dyn_len */ + if (tevent_req_nomem(subreq, req)) { + return tevent_req_post(req, ev); + } + tevent_req_set_callback(subreq, smb2cli_notify_done, req); + return req; +} + +static void smb2cli_notify_done(struct tevent_req *subreq) +{ + struct tevent_req *req = tevent_req_callback_data( + subreq, struct tevent_req); + struct smb2cli_notify_state *state = tevent_req_data( + req, struct smb2cli_notify_state); + NTSTATUS status; + struct iovec *iov; + uint16_t data_offset; + static const struct smb2cli_req_expected_response expected[] = { + { + .status = NT_STATUS_OK, + .body_size = 0x09 + } + }; + + status = smb2cli_req_recv(subreq, state, &iov, + expected, ARRAY_SIZE(expected)); + TALLOC_FREE(subreq); + if (tevent_req_nterror(req, status)) { + return; + } + + data_offset = SVAL(iov[1].iov_base, 2); + state->data_length = IVAL(iov[1].iov_base, 4); + + if ((data_offset != SMB2_HDR_BODY + 8) || + (state->data_length > iov[2].iov_len)) { + tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE); + return; + } + + state->recv_iov = iov; + state->data = (uint8_t *)iov[2].iov_base; + tevent_req_done(req); +} + +NTSTATUS smb2cli_notify_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, + uint8_t **data, uint32_t *data_length) +{ + struct smb2cli_notify_state *state = tevent_req_data( + req, struct smb2cli_notify_state); + NTSTATUS status; + + if (tevent_req_is_nterror(req, &status)) { + return status; + } + talloc_steal(mem_ctx, state->recv_iov); + *data_length = state->data_length; + *data = state->data; + return NT_STATUS_OK; +} + +NTSTATUS smb2cli_notify(struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + struct smbXcli_tcon *tcon, + uint32_t output_buffer_length, + uint64_t fid_persistent, + uint64_t fid_volatile, + uint32_t completion_filter, + bool recursive, + TALLOC_CTX *mem_ctx, + uint8_t **data, + uint32_t *data_length) +{ + TALLOC_CTX *frame = talloc_stackframe(); + struct tevent_context *ev; + struct tevent_req *req; + NTSTATUS status = NT_STATUS_NO_MEMORY; + + if (smbXcli_conn_has_async_calls(conn)) { + /* + * Can't use sync call while an async call is in flight + */ + status = NT_STATUS_INVALID_PARAMETER; + goto fail; + } + ev = samba_tevent_context_init(frame); + if (ev == NULL) { + goto fail; + } + req = smb2cli_notify_send(frame, ev, conn, timeout_msec, + session, tcon, output_buffer_length, + fid_persistent, fid_volatile, + completion_filter, recursive); + if (req == NULL) { + goto fail; + } + if (!tevent_req_poll_ntstatus(req, ev, &status)) { + goto fail; + } + status = smb2cli_notify_recv(req, mem_ctx, data, data_length); + fail: + TALLOC_FREE(frame); + return status; +} diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index 2532084c524..20ef26e3353 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -811,6 +811,32 @@ NTSTATUS smb2cli_query_directory(struct smbXcli_conn *conn, uint8_t **data, uint32_t *data_length); +struct tevent_req *smb2cli_notify_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + struct smbXcli_tcon *tcon, + uint32_t output_buffer_length, + uint64_t fid_persistent, + uint64_t fid_volatile, + uint32_t completion_filter, + bool recursive); +NTSTATUS smb2cli_notify_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, + uint8_t **data, uint32_t *data_length); +NTSTATUS smb2cli_notify(struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + struct smbXcli_tcon *tcon, + uint32_t output_buffer_length, + uint64_t fid_persistent, + uint64_t fid_volatile, + uint32_t completion_filter, + bool recursive, + TALLOC_CTX *mem_ctx, + uint8_t **data, + uint32_t *data_length); + struct tevent_req *smb2cli_ioctl_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct smbXcli_conn *conn, diff --git a/libcli/smb/wscript b/libcli/smb/wscript index e6628266ddc..53a5c213953 100644 --- a/libcli/smb/wscript +++ b/libcli/smb/wscript @@ -39,6 +39,7 @@ def build(bld): smb2cli_flush.c smb2cli_set_info.c smb2cli_query_info.c + smb2cli_notify.c smb2cli_query_directory.c smb2cli_ioctl.c smb2cli_echo.c -- cgit v1.2.1