Changeset 940 for branches/client-3.0/src

Timestamp:

Jul 26, 2016, 12:07:18 PM (9 years ago)

Author:

Paul Smedley

Message:

Support file listings on SMB2+ connections

File:

• branches/client-3.0/src/smbwrp.c (modified) (2 diffs)

branches/client-3.0/src/smbwrp.c

@@ -916 +916 @@
 }
 
+/***************************************************************
+ Wrapper that allows SMB2 to list a directory.
+ Synchronous only. 
+ Based on cli_smb2_list
+***************************************************************/
+
+NTSTATUS list_files_smb2(struct cli_state *cli,
+                        const char *pathname,
+                        uint16_t attribute,
+                        NTSTATUS (*fn)(const char *,
+                                struct smbwrp_fileinfo *,
+                                const char *,
+                                void *),
+                        void *state)
+{
+        NTSTATUS status;
+        uint16_t fnum = 0xffff;
+        char *parent_dir = NULL;
+        const char *mask = NULL;
+        struct smb2_hnd *ph = NULL;
+        bool processed_file = false;
+        TALLOC_CTX *frame = talloc_stackframe();
+        TALLOC_CTX *subframe = NULL;
+        bool mask_has_wild;
+        void *dircachectx = NULL;
+        smbwrp_fileinfo wrpfinfo;
+
+        if (smbXcli_conn_has_async_calls(cli->conn)) {
+                /*
+                 * Can't use sync call while an async call is in flight
+                 */
+                status = NT_STATUS_INVALID_PARAMETER;
+                goto fail;
+        }
+
+        if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+                status = NT_STATUS_INVALID_PARAMETER;
+                goto fail;
+        }
+
+        /* Get the directory name. */
+        if (!windows_parent_dirname(frame,
+                                pathname,
+                                &parent_dir,
+                                &mask)) {
+                status = NT_STATUS_NO_MEMORY;
+                goto fail;
+        }
+
+        mask_has_wild = ms_has_wild(mask);
+
+        status = cli_smb2_create_fnum(cli,
+                        parent_dir,
+                        0,                      /* create_flags */
+                        SEC_DIR_LIST|SEC_DIR_READ_ATTRIBUTE,/* desired_access */
+                        FILE_ATTRIBUTE_DIRECTORY, /* file attributes */
+                        FILE_SHARE_READ|FILE_SHARE_WRITE, /* share_access */
+                        FILE_OPEN,              /* create_disposition */
+                        FILE_DIRECTORY_FILE,    /* create_options */
+                        &fnum,
+                        NULL);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                goto fail;
+        }
+
+        status = map_fnum_to_smb2_handle(cli,
+                                        fnum,
+                                        &ph);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto fail;
+        }
+
+        do {
+                uint8_t *dir_data = NULL;
+                uint32_t dir_data_length = 0;
+                uint32_t next_offset = 0;
+                subframe = talloc_stackframe();
+
+                status = smb2cli_query_directory(cli->conn,
+                                        cli->timeout,
+                                        cli->smb2.session,
+                                        cli->smb2.tcon,
+                                        SMB2_FIND_ID_BOTH_DIRECTORY_INFO,
+                                        0,      /* flags */
+                                        0,      /* file_index */
+                                        ph->fid_persistent,
+                                        ph->fid_volatile,
+                                        mask,
+                                        0xffff,
+                                        subframe,
+                                        &dir_data,
+                                        &dir_data_length);
+
+                if (!NT_STATUS_IS_OK(status)) {
+                        if (NT_STATUS_EQUAL(status, STATUS_NO_MORE_FILES)) {
+                                break;
+                        }
+                        goto fail;
+                }
+
+                do {
+                        struct file_info *finfo = talloc_zero(subframe,
+                                                        struct file_info);
+
+                        if (finfo == NULL) {
+                                status = NT_STATUS_NO_MEMORY;
+                                goto fail;
+                        }
+
+                        status = parse_finfo_id_both_directory_info(dir_data,
+                                                dir_data_length,
+                                                finfo,
+                                                &next_offset);
+
+                        if (!NT_STATUS_IS_OK(status)) {
+                                goto fail;
+                        }
+
+                        if (dir_check_ftype((uint32_t)finfo->mode,
+                                        (uint32_t)attribute)) {
+                                /*
+                                 * Only process if attributes match.
+                                 * On SMB1 server does this, so on
+                                 * SMB2 we need to emulate in the
+                                 * client.
+                                 *
+                                 * https://bugzilla.samba.org/show_bug.cgi?id=10260
+                                 */
+                                processed_file = true;
+
+                                //as samba and this client have different finfo, we need to convert
+                                memset(&wrpfinfo, 0, sizeof(wrpfinfo));
+                                wrpfinfo.size = finfo[0].size;
+                                wrpfinfo.attr = finfo[0].mode;
+                                wrpfinfo.ctime = convert_timespec_to_time_t(finfo[0].ctime_ts);
+                                wrpfinfo.mtime = convert_timespec_to_time_t(finfo[0].mtime_ts);
+                                wrpfinfo.atime = convert_timespec_to_time_t(finfo[0].atime_ts);
+                                wrpfinfo.easize = finfo[0].easize;
+                                strncpy(wrpfinfo.fname, finfo[0].name, sizeof(wrpfinfo.fname) -1);
+
+                                status = fn(cli->dfs_mountpoint,
+                                        &wrpfinfo,
+                                        pathname,
+                                        state);
+
+                                if (!NT_STATUS_IS_OK(status)) {
+                                        /* not sure why this is required on OS/2 */
+                                        if (status != NT_STATUS_WAIT_1)
+                                                break;
+                                }
+                        }
+
+                        TALLOC_FREE(finfo);
+
+                        /* Move to next entry. */
+                        if (next_offset) {
+                                dir_data += next_offset;
+                                dir_data_length -= next_offset;
+                        }
+                } while (next_offset != 0);
+
+                TALLOC_FREE(subframe);
+
+                if (!mask_has_wild) {
+                        /*
+                         * MacOSX 10 doesn't set STATUS_NO_MORE_FILES
+                         * when handed a non-wildcard path. Do it
+                         * for the server (with a non-wildcard path
+                         * there should only ever be one file returned.
+                         */
+                        status = STATUS_NO_MORE_FILES;
+                        break;
+                }
+
+        } while (NT_STATUS_IS_OK(status));
+
+        if (NT_STATUS_EQUAL(status, STATUS_NO_MORE_FILES)) {
+                status = NT_STATUS_OK;
+        }
+
+        if (NT_STATUS_IS_OK(status) && !processed_file) {
+                /*
+                 * In SMB1 findfirst returns NT_STATUS_NO_SUCH_FILE
+                 * if no files match. Emulate this in the client.
+                 */
+                status = NT_STATUS_NO_SUCH_FILE;
+        }
+
+  fail:
+
+        if (fnum != 0xffff) {
+                cli_smb2_close_fnum(cli, fnum);
+        }
+        TALLOC_FREE(subframe);
+        TALLOC_FREE(frame);
+        return status;
+}
+
+
 /****************************************************************************
  Do a directory listing, calling fn on each file found.
@@ -933 +1133 @@
         void *dircachectx = NULL;
         smbwrp_fileinfo wrpfinfo;
+
+        if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+        debuglocal(4,"SMB2 detected, calling list_files_smb2()\n");
+                return list_files_smb2(cli, mask, attribute, fn, state);
 
         /* Try to get the listing from cache. */