From 67a85b3f1bca7e0590ae97d07a6ef32c418e64d1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 12 Nov 2005 07:48:56 +0000 Subject: r11697: - added a generic SMB2 getinfo call - added a SMB2-SCANGETINFO test for scanning for available info levels - added names for the info levels I recognise to smb2.h (This used to be commit fe5986067e2aaca039d70393ccc8761434f18fe6) --- source4/libcli/smb2/close.c | 5 ++- source4/libcli/smb2/config.mk | 3 +- source4/libcli/smb2/create.c | 3 -- source4/libcli/smb2/getinfo.c | 90 ++++++++++++++++++++++++++++++++++++++++ source4/libcli/smb2/request.c | 2 +- source4/libcli/smb2/smb2.h | 2 + source4/libcli/smb2/smb2_calls.h | 47 +++++++++++++++++++++ source4/libcli/smb2/transport.c | 6 +-- 8 files changed, 148 insertions(+), 10 deletions(-) create mode 100644 source4/libcli/smb2/getinfo.c (limited to 'source4/libcli') diff --git a/source4/libcli/smb2/close.c b/source4/libcli/smb2/close.c index b60c1b3071..2802e2f27e 100644 --- a/source4/libcli/smb2/close.c +++ b/source4/libcli/smb2/close.c @@ -1,7 +1,7 @@ /* Unix SMB/CIFS implementation. - SMB2 client tree handling + SMB2 client close handling Copyright (C) Andrew Tridgell 2005 @@ -61,7 +61,8 @@ NTSTATUS smb2_close_recv(struct smb2_request *req, struct smb2_close *io) return NT_STATUS_BUFFER_TOO_SMALL; } - io->out.buffer_code = SVAL(req->in.body, 0x00); + SMB2_CHECK_BUFFER_CODE(req, 0x3C); + io->out.flags = SVAL(req->in.body, 0x02); io->out._pad = IVAL(req->in.body, 0x04); io->out.create_time = smbcli_pull_nttime(req->in.body, 0x08); diff --git a/source4/libcli/smb2/config.mk b/source4/libcli/smb2/config.mk index 097ed6df12..b7ecdcb98d 100644 --- a/source4/libcli/smb2/config.mk +++ b/source4/libcli/smb2/config.mk @@ -7,5 +7,6 @@ OBJ_FILES = \ tcon.o \ create.o \ close.o \ - connect.o + connect.o \ + getinfo.o REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBPACKET diff --git a/source4/libcli/smb2/create.c b/source4/libcli/smb2/create.c index 1316626432..9483f35ca1 100644 --- a/source4/libcli/smb2/create.c +++ b/source4/libcli/smb2/create.c @@ -85,9 +85,6 @@ struct smb2_request *smb2_create_send(struct smb2_tree *tree, struct smb2_create */ NTSTATUS smb2_create_recv(struct smb2_request *req, struct smb2_create *io) { - smb2_request_receive(req); - dump_data(0, req->in.body, req->in.body_size); - if (!smb2_request_receive(req) || smb2_request_is_error(req)) { return smb2_request_destroy(req); diff --git a/source4/libcli/smb2/getinfo.c b/source4/libcli/smb2/getinfo.c new file mode 100644 index 0000000000..c8976e4230 --- /dev/null +++ b/source4/libcli/smb2/getinfo.c @@ -0,0 +1,90 @@ +/* + Unix SMB/CIFS implementation. + + SMB2 client getinfo calls + + 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 "libcli/smb2/smb2.h" +#include "libcli/smb2/smb2_calls.h" + +/* + send a getinfo request +*/ +struct smb2_request *smb2_getinfo_send(struct smb2_tree *tree, struct smb2_getinfo *io) +{ + struct smb2_request *req; + + req = smb2_request_init_tree(tree, SMB2_OP_GETINFO, 0x28); + if (req == NULL) return NULL; + + SSVAL(req->out.body, 0x00, io->in.buffer_code); + SSVAL(req->out.body, 0x02, io->in.level); + SIVAL(req->out.body, 0x04, io->in.max_response_size); + SIVAL(req->out.body, 0x08, io->in.unknown1); + SIVAL(req->out.body, 0x0C, io->in.unknown2); + SIVAL(req->out.body, 0x10, io->in.unknown3); + SIVAL(req->out.body, 0x14, io->in.unknown4); + SBVAL(req->out.body, 0x18, io->in.handle.data[0]); + SBVAL(req->out.body, 0x20, io->in.handle.data[1]); + + smb2_transport_send(req); + + return req; +} + + +/* + recv a getinfo reply +*/ +NTSTATUS smb2_getinfo_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx, + struct smb2_getinfo *io) +{ + NTSTATUS status; + + if (!smb2_request_receive(req) || + smb2_request_is_error(req)) { + return smb2_request_destroy(req); + } + + if (req->in.body_size < 0x08) { + return NT_STATUS_BUFFER_TOO_SMALL; + } + + SMB2_CHECK_BUFFER_CODE(req, 0x09); + + status = smb2_pull_ofs_blob(req, req->in.body+0x02, &io->out.blob); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + talloc_steal(mem_ctx, io->out.blob.data); + + return smb2_request_destroy(req); +} + +/* + sync getinfo request +*/ +NTSTATUS smb2_getinfo(struct smb2_tree *tree, TALLOC_CTX *mem_ctx, + struct smb2_getinfo *io) +{ + struct smb2_request *req = smb2_getinfo_send(tree, io); + return smb2_getinfo_recv(req, mem_ctx, io); +} diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c index ccffef9b88..4b95d141a3 100644 --- a/source4/libcli/smb2/request.c +++ b/source4/libcli/smb2/request.c @@ -188,7 +188,7 @@ DATA_BLOB smb2_pull_blob(struct smb2_request *req, uint8_t *ptr, uint_t size) } /* - pull a ofs/length/blob triple into a data blob + pull a ofs/length/blob triple from a data blob the ptr points to the start of the offset/length pair */ NTSTATUS smb2_pull_ofs_blob(struct smb2_request *req, uint8_t *ptr, DATA_BLOB *blob) diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h index f77eab22d1..e99e8d3945 100644 --- a/source4/libcli/smb2/smb2.h +++ b/source4/libcli/smb2/smb2.h @@ -166,7 +166,9 @@ struct smb2_request { #define SMB2_OP_CLOSE 0x06 #define SMB2_OP_READ 0x08 #define SMB2_OP_WRITE 0x09 +#define SMB2_OP_CANCEL 0x0c #define SMB2_OP_FIND 0x0e +#define SMB2_OP_NOTIFY 0x0f #define SMB2_OP_GETINFO 0x10 #define SMB2_OP_SETINFO 0x11 #define SMB2_OP_BREAK 0x12 diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h index 859655355d..5e9efd2868 100644 --- a/source4/libcli/smb2/smb2_calls.h +++ b/source4/libcli/smb2/smb2_calls.h @@ -155,3 +155,50 @@ struct smb2_close { } out; }; +/* fs information levels */ +#define SMB2_GETINFO_FS_01 0x0102 +#define SMB2_GETINFO_FS_03 0x0302 +#define SMB2_GETINFO_FS_04 0x0402 +#define SMB2_GETINFO_FS_ATTRIB_INFO 0x0502 +#define SMB2_GETINFO_FS_06 0x0602 +#define SMB2_GETINFO_FS_07 0x0702 +#define SMB2_GETINFO_FS_08 0x0802 + +/* class 3 levels */ +#define SMB2_GETINFO_3_00 0x0003 + +/* file information levels */ +#define SMB2_GETINFO_FILE_BASIC_INFO 0x0401 +#define SMB2_GETINFO_FILE_05 0x0501 +#define SMB2_GETINFO_FILE_06 0x0601 +#define SMB2_GETINFO_FILE_07 0x0701 +#define SMB2_GETINFO_FILE_ACCESS_INFO 0x0801 +#define SMB2_GETINFO_FILE_0E 0x0e01 +#define SMB2_GETINFO_FILE_10 0x1001 +#define SMB2_GETINFO_FILE_11 0x1101 +#define SMB2_GETINFO_FILE_ALL_INFO 0x1201 +#define SMB2_GETINFO_FILE_NAME_INFO 0x1501 +#define SMB2_GETINFO_FILE_STREAM_INFO 0x1601 +#define SMB2_GETINFO_FILE_1C 0x1c01 +#define SMB2_GETINFO_FILE_STANDARD_INFO 0x2201 +#define SMB2_GETINFO_FILE_ATTRIB_INFO 0x2301 + + +struct smb2_getinfo { + struct { + uint16_t buffer_code; + uint16_t level; + uint32_t max_response_size; + uint32_t unknown1; + uint32_t unknown2; + uint32_t unknown3; + uint32_t unknown4; + struct smb2_handle handle; + } in; + + struct { + uint16_t buffer_code; + DATA_BLOB blob; + } out; +}; + diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c index 9940379f98..e87c7a68c0 100644 --- a/source4/libcli/smb2/transport.c +++ b/source4/libcli/smb2/transport.c @@ -184,7 +184,7 @@ static NTSTATUS smb2_transport_finish_recv(void *private, DATA_BLOB blob) req->status = NT_STATUS(IVAL(hdr, SMB2_HDR_STATUS)); DEBUG(2, ("SMB2 RECV seqnum=0x%llx\n", req->seqnum)); - dump_data(2, req->in.body, req->in.body_size); + dump_data(5, req->in.body, req->in.body_size); /* if this request has an async handler then call that to notify that the reply has been received. This might destroy @@ -197,7 +197,7 @@ static NTSTATUS smb2_transport_finish_recv(void *private, DATA_BLOB blob) return NT_STATUS_OK; error: - dump_data(2, buffer, len); + dump_data(5, buffer, len); if (req) { DLIST_REMOVE(transport->pending_recv, req); req->state = SMB2_REQUEST_ERROR; @@ -253,7 +253,7 @@ void smb2_transport_send(struct smb2_request *req) _smb_setlen(req->out.buffer, req->out.size - NBT_HDR_SIZE); DEBUG(2, ("SMB2 send seqnum=0x%llx\n", req->seqnum)); - dump_data(2, req->out.body, req->out.body_size); + dump_data(5, req->out.body, req->out.body_size); /* check if the transport is dead */ if (req->transport->socket->sock == NULL) { -- cgit