From 310fa875091a85bb5d7be196906723f14305d406 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 25 Nov 2005 05:23:55 +0000 Subject: r11888: - added SMB2 trans support - added session key to SMB2 - renamed 'unknown2' in create to 'impersonation' (This used to be commit aef915f312a78bf8a4123f7c40fcd14ff293d934) --- source4/include/structs.h | 1 + source4/libcli/smb2/config.mk | 3 +- source4/libcli/smb2/create.c | 2 +- source4/libcli/smb2/session.c | 7 +++ source4/libcli/smb2/smb2.h | 2 + source4/libcli/smb2/smb2_calls.h | 23 ++++++++- source4/libcli/smb2/trans.c | 108 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 source4/libcli/smb2/trans.c (limited to 'source4') diff --git a/source4/include/structs.h b/source4/include/structs.h index c461c6443f..d5bc9de24a 100644 --- a/source4/include/structs.h +++ b/source4/include/structs.h @@ -356,4 +356,5 @@ struct smb2_setinfo; struct smb2_read; struct smb2_write; struct smb2_find; +struct smb2_trans; struct smb2_handle; diff --git a/source4/libcli/smb2/config.mk b/source4/libcli/smb2/config.mk index c0974dbfa5..1a41c5c8ed 100644 --- a/source4/libcli/smb2/config.mk +++ b/source4/libcli/smb2/config.mk @@ -12,5 +12,6 @@ OBJ_FILES = \ write.o \ read.o \ setinfo.o \ - find.o + find.o \ + trans.o REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBPACKET diff --git a/source4/libcli/smb2/create.c b/source4/libcli/smb2/create.c index 564eba7f46..c7bb190559 100644 --- a/source4/libcli/smb2/create.c +++ b/source4/libcli/smb2/create.c @@ -71,7 +71,7 @@ struct smb2_request *smb2_create_send(struct smb2_tree *tree, struct smb2_create if (req == NULL) return NULL; SSVAL(req->out.body, 0x02, io->in.oplock_flags); - SIVAL(req->out.body, 0x04, io->in.unknown2); + SIVAL(req->out.body, 0x04, io->in.impersonation); SIVAL(req->out.body, 0x08, io->in.unknown3[0]); SIVAL(req->out.body, 0x0C, io->in.unknown3[1]); SIVAL(req->out.body, 0x10, io->in.unknown3[2]); diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c index 0a13a288fc..c62b24797d 100644 --- a/source4/libcli/smb2/session.c +++ b/source4/libcli/smb2/session.c @@ -149,10 +149,17 @@ static void session_request_handler(struct smb2_request *req) if (NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED) || (NT_STATUS_IS_OK(c->status) && NT_STATUS_EQUAL(state->gensec_status, NT_STATUS_MORE_PROCESSING_REQUIRED))) { + NTSTATUS session_key_err; + DATA_BLOB session_key; c->status = gensec_update(session->gensec, c, state->io.out.secblob, &state->io.in.secblob); state->gensec_status = c->status; + + session_key_err = gensec_session_key(session->gensec, &session_key); + if (NT_STATUS_IS_OK(session_key_err)) { + session->session_key = session_key; + } } session->uid = state->io.out.uid; diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h index 0ff8b87143..7b6824f4d9 100644 --- a/source4/libcli/smb2/smb2.h +++ b/source4/libcli/smb2/smb2.h @@ -66,6 +66,7 @@ struct smb2_session { struct smb2_transport *transport; struct gensec_security *gensec; uint64_t uid; + DATA_BLOB session_key; }; @@ -164,6 +165,7 @@ struct smb2_request { #define SMB2_OP_CLOSE 0x06 #define SMB2_OP_READ 0x08 #define SMB2_OP_WRITE 0x09 +#define SMB2_OP_TRANS 0x0b #define SMB2_OP_CANCEL 0x0c #define SMB2_OP_FIND 0x0e #define SMB2_OP_NOTIFY 0x0f diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h index 6d99000a42..07f74ca229 100644 --- a/source4/libcli/smb2/smb2_calls.h +++ b/source4/libcli/smb2/smb2_calls.h @@ -113,7 +113,7 @@ struct smb2_create { /* static body buffer 56 (0x38) bytes */ /* uint16_t buffer_code; 0x39 = 0x38 + 1 */ uint16_t oplock_flags; /* SMB2_CREATE_FLAG_* */ - uint32_t unknown2; + uint32_t impersonation; uint32_t unknown3[4]; uint32_t access_mask; @@ -303,3 +303,24 @@ struct smb2_find { DATA_BLOB blob; } out; }; + +struct smb2_trans { + struct { + uint32_t unknown1; + struct smb2_handle handle; + uint32_t unknown2; + uint32_t max_response_size; + uint64_t flags; + DATA_BLOB in; + DATA_BLOB out; + } in; + + struct { + uint32_t unknown1; + struct smb2_handle handle; + uint32_t unknown2; + uint32_t unknown3; + DATA_BLOB in; + DATA_BLOB out; + } out; +}; diff --git a/source4/libcli/smb2/trans.c b/source4/libcli/smb2/trans.c new file mode 100644 index 0000000000..fd80315e3f --- /dev/null +++ b/source4/libcli/smb2/trans.c @@ -0,0 +1,108 @@ +/* + Unix SMB/CIFS implementation. + + SMB2 client trans call + + 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 trans request +*/ +struct smb2_request *smb2_trans_send(struct smb2_tree *tree, struct smb2_trans *io) +{ + NTSTATUS status; + struct smb2_request *req; + + req = smb2_request_init_tree(tree, SMB2_OP_TRANS, 0x38, + io->in.in.length+io->in.out.length); + if (req == NULL) return NULL; + + SSVAL(req->out.body, 0x02, 0); /* pad */ + SIVAL(req->out.body, 0x04, io->in.unknown1); + smb2_push_handle(req->out.body+0x08, &io->in.handle); + SIVAL(req->out.body, 0x20, io->in.unknown2); + SIVAL(req->out.body, 0x2C, io->in.max_response_size); + SBVAL(req->out.body, 0x30, io->in.flags); + + status = smb2_push_o32s32_blob(&req->out, 0x18, io->in.out); + if (!NT_STATUS_IS_OK(status)) { + talloc_free(req); + return NULL; + } + + status = smb2_push_o32s32_blob(&req->out, 0x24, io->in.in); + if (!NT_STATUS_IS_OK(status)) { + talloc_free(req); + return NULL; + } + + smb2_transport_send(req); + + return req; +} + + +/* + recv a trans reply +*/ +NTSTATUS smb2_trans_recv(struct smb2_request *req, + TALLOC_CTX *mem_ctx, struct smb2_trans *io) +{ + NTSTATUS status; + + if (!smb2_request_receive(req) || + smb2_request_is_error(req)) { + return smb2_request_destroy(req); + } + + SMB2_CHECK_PACKET_RECV(req, 0x30, True); + + io->out.unknown1 = IVAL(req->in.body, 0x04); + smb2_pull_handle(req->in.body+0x08, &io->out.handle); + status = smb2_pull_o32s32_blob(&req->in, mem_ctx, req->in.body+0x18, &io->out.in); + if (!NT_STATUS_IS_OK(status)) { + smb2_request_destroy(req); + return status; + } + + status = smb2_pull_o32s32_blob(&req->in, mem_ctx, req->in.body+0x20, &io->out.out); + if (!NT_STATUS_IS_OK(status)) { + smb2_request_destroy(req); + return status; + } + + + io->out.unknown2 = IVAL(req->in.body, 0x28); + io->out.unknown3 = IVAL(req->in.body, 0x2C); + + return smb2_request_destroy(req); +} + +/* + sync trans request +*/ +NTSTATUS smb2_trans(struct smb2_tree *tree, TALLOC_CTX *mem_ctx, struct smb2_trans *io) +{ + struct smb2_request *req = smb2_trans_send(tree, io); + return smb2_trans_recv(req, mem_ctx, io); +} -- cgit