From 2674d0c458410a96d6e33e190a6924e857bbe8be Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 15 May 2012 10:23:54 +0200 Subject: libcli/smb: move smb2cli_create.c from source3 to the toplevel metze --- libcli/smb/smb2cli_create.c | 279 +++++++++++++++++++++++++++++++++++++++ libcli/smb/smbXcli_base.h | 35 +++++ libcli/smb/wscript_build | 1 + source3/Makefile.in | 2 +- source3/libsmb/smb2cli.h | 35 ----- source3/libsmb/smb2cli_create.c | 281 ---------------------------------------- source3/wscript_build | 1 - 7 files changed, 316 insertions(+), 318 deletions(-) create mode 100644 libcli/smb/smb2cli_create.c delete mode 100644 source3/libsmb/smb2cli_create.c diff --git a/libcli/smb/smb2cli_create.c b/libcli/smb/smb2cli_create.c new file mode 100644 index 0000000000..29b0396815 --- /dev/null +++ b/libcli/smb/smb2cli_create.c @@ -0,0 +1,279 @@ +/* + Unix SMB/CIFS implementation. + smb2 lib + Copyright (C) Volker Lendecke 2011 + + 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 "smb2_create_blob.h" + +struct smb2cli_create_state { + uint8_t fixed[56]; + + uint8_t oplock_level; + uint32_t create_action; + NTTIME creation_time; + NTTIME last_access_time; + NTTIME last_write_time; + NTTIME change_time; + uint64_t allocation_size; + uint64_t end_of_file; + uint32_t file_attributes; + uint64_t fid_persistent; + uint64_t fid_volatile; + struct smb2_create_blobs blobs; +}; + +static void smb2cli_create_done(struct tevent_req *subreq); + +struct tevent_req *smb2cli_create_send( + TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + uint32_t tcon_id, + const char *filename, + uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ + uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ + uint32_t desired_access, + uint32_t file_attributes, + uint32_t share_access, + uint32_t create_disposition, + uint32_t create_options, + struct smb2_create_blobs *blobs) +{ + struct tevent_req *req, *subreq; + struct smb2cli_create_state *state; + uint8_t *fixed; + uint8_t *name_utf16; + size_t name_utf16_len; + DATA_BLOB blob; + NTSTATUS status; + size_t blobs_offset; + uint8_t *dyn; + size_t dyn_len; + + req = tevent_req_create(mem_ctx, &state, + struct smb2cli_create_state); + if (req == NULL) { + return NULL; + } + + if (!convert_string_talloc(state, CH_UNIX, CH_UTF16, + filename, strlen(filename), + &name_utf16, &name_utf16_len)) { + tevent_req_oom(req); + return tevent_req_post(req, ev); + } + + if (strlen(filename) == 0) { + TALLOC_FREE(name_utf16); + name_utf16_len = 0; + } + + fixed = state->fixed; + + SSVAL(fixed, 0, 57); + SCVAL(fixed, 3, oplock_level); + SIVAL(fixed, 4, impersonation_level); + SIVAL(fixed, 24, desired_access); + SIVAL(fixed, 28, file_attributes); + SIVAL(fixed, 32, share_access); + SIVAL(fixed, 36, create_disposition); + SIVAL(fixed, 40, create_options); + + SSVAL(fixed, 44, SMB2_HDR_BODY + 56); + SSVAL(fixed, 46, name_utf16_len); + + blob = data_blob_null; + + if (blobs != NULL) { + status = smb2_create_blob_push(state, &blob, *blobs); + if (tevent_req_nterror(req, status)) { + return tevent_req_post(req, ev); + } + } + + blobs_offset = name_utf16_len; + blobs_offset = ((blobs_offset + 3) & ~3); + + if (blob.length > 0) { + SIVAL(fixed, 48, blobs_offset + SMB2_HDR_BODY + 56); + SIVAL(fixed, 52, blob.length); + } + + dyn_len = MAX(1, blobs_offset + blob.length); + dyn = talloc_zero_array(state, uint8_t, dyn_len); + if (tevent_req_nomem(dyn, req)) { + return tevent_req_post(req, ev); + } + + if (name_utf16) { + memcpy(dyn, name_utf16, name_utf16_len); + TALLOC_FREE(name_utf16); + } + + if (blob.data != NULL) { + memcpy(dyn + blobs_offset, + blob.data, blob.length); + data_blob_free(&blob); + } + + subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_CREATE, + 0, 0, /* flags */ + timeout_msec, + 0xFEFF, /* pid */ + tcon_id, + session, + state->fixed, sizeof(state->fixed), + dyn, dyn_len); + if (tevent_req_nomem(subreq, req)) { + return tevent_req_post(req, ev); + } + tevent_req_set_callback(subreq, smb2cli_create_done, req); + return req; +} + +static void smb2cli_create_done(struct tevent_req *subreq) +{ + struct tevent_req *req = + tevent_req_callback_data(subreq, + struct tevent_req); + struct smb2cli_create_state *state = + tevent_req_data(req, + struct smb2cli_create_state); + NTSTATUS status; + struct iovec *iov; + uint8_t *body; + uint32_t offset, length; + static const struct smb2cli_req_expected_response expected[] = { + { + .status = NT_STATUS_OK, + .body_size = 0x59 + } + }; + + status = smb2cli_req_recv(subreq, state, &iov, + expected, ARRAY_SIZE(expected)); + if (tevent_req_nterror(req, status)) { + return; + } + + body = (uint8_t *)iov[1].iov_base; + + state->oplock_level = CVAL(body, 2); + state->create_action = IVAL(body, 4); + state->creation_time = BVAL(body, 8); + state->last_access_time = BVAL(body, 16); + state->last_write_time = BVAL(body, 24); + state->change_time = BVAL(body, 32); + state->allocation_size = BVAL(body, 40); + state->end_of_file = BVAL(body, 48); + state->file_attributes = IVAL(body, 56); + state->fid_persistent = BVAL(body, 64); + state->fid_volatile = BVAL(body, 72); + + offset = IVAL(body, 80); + length = IVAL(body, 84); + + if ((offset != 0) && (length != 0)) { + if ((offset != SMB2_HDR_BODY + 88) || + (length > iov[2].iov_len)) { + tevent_req_nterror( + req, NT_STATUS_INVALID_NETWORK_RESPONSE); + return; + } + status = smb2_create_blob_parse( + state, data_blob_const(iov[2].iov_base, length), + &state->blobs); + if (tevent_req_nterror(req, status)) { + return; + } + } + tevent_req_done(req); +} + +NTSTATUS smb2cli_create_recv(struct tevent_req *req, + uint64_t *fid_persistent, + uint64_t *fid_volatile) +{ + struct smb2cli_create_state *state = + tevent_req_data(req, + struct smb2cli_create_state); + NTSTATUS status; + + if (tevent_req_is_nterror(req, &status)) { + return status; + } + *fid_persistent = state->fid_persistent; + *fid_volatile = state->fid_volatile; + return NT_STATUS_OK; +} + +NTSTATUS smb2cli_create(struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + uint32_t tcon_id, + const char *filename, + uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ + uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ + uint32_t desired_access, + uint32_t file_attributes, + uint32_t share_access, + uint32_t create_disposition, + uint32_t create_options, + struct smb2_create_blobs *blobs, + uint64_t *fid_persistent, + uint64_t *fid_volatile) +{ + 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 = tevent_context_init(frame); + if (ev == NULL) { + goto fail; + } + req = smb2cli_create_send(frame, ev, conn, timeout_msec, session, + tcon_id, filename, oplock_level, + impersonation_level, desired_access, + file_attributes, share_access, + create_disposition, create_options, + blobs); + if (req == NULL) { + goto fail; + } + if (!tevent_req_poll_ntstatus(req, ev, &status)) { + goto fail; + } + status = smb2cli_create_recv(req, fid_persistent, fid_volatile); + fail: + TALLOC_FREE(frame); + return status; +} diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index 81fb1fd582..5e5dc2b883 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -290,4 +290,39 @@ NTSTATUS smb2cli_logoff(struct smbXcli_conn *conn, uint32_t timeout_msec, struct smbXcli_session *session); +struct tevent_req *smb2cli_create_send( + TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + uint32_t tcon_id, + const char *filename, + uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ + uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ + uint32_t desired_access, + uint32_t file_attributes, + uint32_t share_access, + uint32_t create_disposition, + uint32_t create_options, + struct smb2_create_blobs *blobs); +NTSTATUS smb2cli_create_recv(struct tevent_req *req, + uint64_t *fid_persistent, + uint64_t *fid_volatile); +NTSTATUS smb2cli_create(struct smbXcli_conn *conn, + uint32_t timeout_msec, + struct smbXcli_session *session, + uint32_t tcon_id, + const char *filename, + uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ + uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ + uint32_t desired_access, + uint32_t file_attributes, + uint32_t share_access, + uint32_t create_disposition, + uint32_t create_options, + struct smb2_create_blobs *blobs, + uint64_t *fid_persistent, + uint64_t *fid_volatile); + #endif /* _SMBXCLI_BASE_H_ */ diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build index 4447005b11..d8bf59e94a 100755 --- a/libcli/smb/wscript_build +++ b/libcli/smb/wscript_build @@ -9,6 +9,7 @@ bld.SAMBA_LIBRARY('cli_smb_common', smbXcli_base.c smb1cli_trans.c smb2cli_session.c + smb2cli_create.c ''', deps='LIBCRYPTO errors gensec krb5samba LIBASYNC_REQ', public_deps='talloc samba-util', diff --git a/source3/Makefile.in b/source3/Makefile.in index 5d70e6db1b..c538804364 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -619,7 +619,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ ../libcli/smb/smb1cli_trans.o \ ../libcli/smb/smb2cli_session.o \ libsmb/smb2cli_tcon.o \ - libsmb/smb2cli_create.o \ + ../libcli/smb/smb2cli_create.o \ ../libcli/smb/smb2_create_blob.o \ ../libcli/smb/smb2_signing.o \ libsmb/smb2cli_close.o \ diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h index 003e0de956..6a4e0771e7 100644 --- a/source3/libsmb/smb2cli.h +++ b/source3/libsmb/smb2cli.h @@ -37,41 +37,6 @@ struct tevent_req *smb2cli_tdis_send(TALLOC_CTX *mem_ctx, NTSTATUS smb2cli_tdis_recv(struct tevent_req *req); NTSTATUS smb2cli_tdis(struct cli_state *cli); -struct tevent_req *smb2cli_create_send( - TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session, - uint32_t tcon_id, - const char *filename, - uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ - uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ - uint32_t desired_access, - uint32_t file_attributes, - uint32_t share_access, - uint32_t create_disposition, - uint32_t create_options, - struct smb2_create_blobs *blobs); -NTSTATUS smb2cli_create_recv(struct tevent_req *req, - uint64_t *fid_persistent, - uint64_t *fid_volatile); -NTSTATUS smb2cli_create(struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session, - uint32_t tcon_id, - const char *filename, - uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ - uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ - uint32_t desired_access, - uint32_t file_attributes, - uint32_t share_access, - uint32_t create_disposition, - uint32_t create_options, - struct smb2_create_blobs *blobs, - uint64_t *fid_persistent, - uint64_t *fid_volatile); - struct tevent_req *smb2cli_close_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct smbXcli_conn *conn, diff --git a/source3/libsmb/smb2cli_create.c b/source3/libsmb/smb2cli_create.c deleted file mode 100644 index d9800f5024..0000000000 --- a/source3/libsmb/smb2cli_create.c +++ /dev/null @@ -1,281 +0,0 @@ -/* - Unix SMB/CIFS implementation. - smb2 lib - Copyright (C) Volker Lendecke 2011 - - 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 "client.h" -#include "async_smb.h" -#include "../libcli/smb/smbXcli_base.h" -#include "smb2cli.h" -#include "libsmb/proto.h" -#include "lib/util/tevent_ntstatus.h" -#include "libcli/smb/smb2_create_blob.h" - -struct smb2cli_create_state { - uint8_t fixed[56]; - - uint8_t oplock_level; - uint32_t create_action; - NTTIME creation_time; - NTTIME last_access_time; - NTTIME last_write_time; - NTTIME change_time; - uint64_t allocation_size; - uint64_t end_of_file; - uint32_t file_attributes; - uint64_t fid_persistent; - uint64_t fid_volatile; - struct smb2_create_blobs blobs; -}; - -static void smb2cli_create_done(struct tevent_req *subreq); - -struct tevent_req *smb2cli_create_send( - TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session, - uint32_t tcon_id, - const char *filename, - uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ - uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ - uint32_t desired_access, - uint32_t file_attributes, - uint32_t share_access, - uint32_t create_disposition, - uint32_t create_options, - struct smb2_create_blobs *blobs) -{ - struct tevent_req *req, *subreq; - struct smb2cli_create_state *state; - uint8_t *fixed; - uint8_t *name_utf16; - size_t name_utf16_len; - DATA_BLOB blob; - NTSTATUS status; - size_t blobs_offset; - uint8_t *dyn; - size_t dyn_len; - - req = tevent_req_create(mem_ctx, &state, - struct smb2cli_create_state); - if (req == NULL) { - return NULL; - } - - if (!convert_string_talloc(state, CH_UNIX, CH_UTF16, - filename, strlen(filename), - &name_utf16, &name_utf16_len)) { - tevent_req_oom(req); - return tevent_req_post(req, ev); - } - - if (strlen(filename) == 0) { - TALLOC_FREE(name_utf16); - name_utf16_len = 0; - } - - fixed = state->fixed; - - SSVAL(fixed, 0, 57); - SCVAL(fixed, 3, oplock_level); - SIVAL(fixed, 4, impersonation_level); - SIVAL(fixed, 24, desired_access); - SIVAL(fixed, 28, file_attributes); - SIVAL(fixed, 32, share_access); - SIVAL(fixed, 36, create_disposition); - SIVAL(fixed, 40, create_options); - - SSVAL(fixed, 44, SMB2_HDR_BODY + 56); - SSVAL(fixed, 46, name_utf16_len); - - blob = data_blob_null; - - if (blobs != NULL) { - status = smb2_create_blob_push(state, &blob, *blobs); - if (tevent_req_nterror(req, status)) { - return tevent_req_post(req, ev); - } - } - - blobs_offset = name_utf16_len; - blobs_offset = ((blobs_offset + 3) & ~3); - - if (blob.length > 0) { - SIVAL(fixed, 48, blobs_offset + SMB2_HDR_BODY + 56); - SIVAL(fixed, 52, blob.length); - } - - dyn_len = MAX(1, blobs_offset + blob.length); - dyn = talloc_zero_array(state, uint8_t, dyn_len); - if (tevent_req_nomem(dyn, req)) { - return tevent_req_post(req, ev); - } - - if (name_utf16) { - memcpy(dyn, name_utf16, name_utf16_len); - TALLOC_FREE(name_utf16); - } - - if (blob.data != NULL) { - memcpy(dyn + blobs_offset, - blob.data, blob.length); - data_blob_free(&blob); - } - - subreq = smb2cli_req_send(state, ev, conn, SMB2_OP_CREATE, - 0, 0, /* flags */ - timeout_msec, - 0xFEFF, /* pid */ - tcon_id, - session, - state->fixed, sizeof(state->fixed), - dyn, dyn_len); - if (tevent_req_nomem(subreq, req)) { - return tevent_req_post(req, ev); - } - tevent_req_set_callback(subreq, smb2cli_create_done, req); - return req; -} - -static void smb2cli_create_done(struct tevent_req *subreq) -{ - struct tevent_req *req = - tevent_req_callback_data(subreq, - struct tevent_req); - struct smb2cli_create_state *state = - tevent_req_data(req, - struct smb2cli_create_state); - NTSTATUS status; - struct iovec *iov; - uint8_t *body; - uint32_t offset, length; - static const struct smb2cli_req_expected_response expected[] = { - { - .status = NT_STATUS_OK, - .body_size = 0x59 - } - }; - - status = smb2cli_req_recv(subreq, state, &iov, - expected, ARRAY_SIZE(expected)); - if (tevent_req_nterror(req, status)) { - return; - } - - body = (uint8_t *)iov[1].iov_base; - - state->oplock_level = CVAL(body, 2); - state->create_action = IVAL(body, 4); - state->creation_time = BVAL(body, 8); - state->last_access_time = BVAL(body, 16); - state->last_write_time = BVAL(body, 24); - state->change_time = BVAL(body, 32); - state->allocation_size = BVAL(body, 40); - state->end_of_file = BVAL(body, 48); - state->file_attributes = IVAL(body, 56); - state->fid_persistent = BVAL(body, 64); - state->fid_volatile = BVAL(body, 72); - - offset = IVAL(body, 80); - length = IVAL(body, 84); - - if ((offset != 0) && (length != 0)) { - if ((offset != SMB2_HDR_BODY + 88) || - (length > iov[2].iov_len)) { - tevent_req_nterror( - req, NT_STATUS_INVALID_NETWORK_RESPONSE); - return; - } - status = smb2_create_blob_parse( - state, data_blob_const(iov[2].iov_base, length), - &state->blobs); - if (tevent_req_nterror(req, status)) { - return; - } - } - tevent_req_done(req); -} - -NTSTATUS smb2cli_create_recv(struct tevent_req *req, - uint64_t *fid_persistent, - uint64_t *fid_volatile) -{ - struct smb2cli_create_state *state = - tevent_req_data(req, - struct smb2cli_create_state); - NTSTATUS status; - - if (tevent_req_is_nterror(req, &status)) { - return status; - } - *fid_persistent = state->fid_persistent; - *fid_volatile = state->fid_volatile; - return NT_STATUS_OK; -} - -NTSTATUS smb2cli_create(struct smbXcli_conn *conn, - uint32_t timeout_msec, - struct smbXcli_session *session, - uint32_t tcon_id, - const char *filename, - uint8_t oplock_level, /* SMB2_OPLOCK_LEVEL_* */ - uint32_t impersonation_level, /* SMB2_IMPERSONATION_* */ - uint32_t desired_access, - uint32_t file_attributes, - uint32_t share_access, - uint32_t create_disposition, - uint32_t create_options, - struct smb2_create_blobs *blobs, - uint64_t *fid_persistent, - uint64_t *fid_volatile) -{ - 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 = tevent_context_init(frame); - if (ev == NULL) { - goto fail; - } - req = smb2cli_create_send(frame, ev, conn, timeout_msec, session, - tcon_id, filename, oplock_level, - impersonation_level, desired_access, - file_attributes, share_access, - create_disposition, create_options, - blobs); - if (req == NULL) { - goto fail; - } - if (!tevent_req_poll_ntstatus(req, ev, &status)) { - goto fail; - } - status = smb2cli_create_recv(req, fid_persistent, fid_volatile); - fail: - TALLOC_FREE(frame); - return status; -} diff --git a/source3/wscript_build b/source3/wscript_build index 99d7bd8074..9e768ccd95 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -131,7 +131,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c libsmb/async_smb.c libsmb/clisigning.c libsmb/smb2cli_tcon.c - libsmb/smb2cli_create.c libsmb/smb2cli_close.c libsmb/smb2cli_flush.c libsmb/smb2cli_read.c -- cgit