Changeset 752 for trunk/server/source4/torture/rpc

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/torture/rpc/samba3rpc.c (modified) (1 diff)
• source4/torture/rpc/samlogon.c (modified) (1 diff)
• source4/torture/rpc/samr.c (modified) (4 diffs)
• source4/torture/rpc/spoolss.c (modified) (11 diffs)

trunk/server/source4/torture/rpc/samba3rpc.c

@@ -775 +775 @@
                 DATA_BLOB confounded_session_key = data_blob_talloc(
                         mem_ctx, NULL, 16);
-                struct MD5Context ctx;
+                MD5_CTX ctx;
                 uint8_t confounder[16];
 

trunk/server/source4/torture/rpc/samlogon.c

@@ -1076 +1076 @@
         uint8_t client_chall[8];
 
-        struct MD5Context md5_session_nonce_ctx;
+        MD5_CTX md5_session_nonce_ctx;
         HMACMD5Context hmac_ctx;
 

trunk/server/source4/torture/rpc/samr.c

@@ -772 +772 @@
         char *newpass;
         struct dcerpc_binding_handle *b = p->binding_handle;
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         struct samr_GetUserPwInfo pwp;
         struct samr_PwInfo info;
@@ -857 +857 @@
         DATA_BLOB session_key;
         DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         uint8_t confounder[16];
         char *newpass;
@@ -1141 +1141 @@
         DATA_BLOB session_key;
         DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
-        struct MD5Context ctx;
+        MD5_CTX ctx;
         uint8_t confounder[16];
         char *newpass;
@@ -2459 +2459 @@
         DATA_BLOB confounded_session_key = data_blob_talloc(tctx, NULL, 16);
         uint8_t confounder[16];
-        struct MD5Context ctx;
+        MD5_CTX ctx;
 
         bool ret = true;

trunk/server/source4/torture/rpc/spoolss.c

@@ -36 +36 @@
 #include "libcli/raw/raw_proto.h"
 #include "libcli/resolve/resolve.h"
+#include "libcli/smb2/smb2.h"
+#include "libcli/smb2/smb2_calls.h"
 #include "lib/cmdline/popt_common.h"
 #include "system/filesys.h"
 #include "torture/ndr/ndr.h"
+#include "torture/smb2/proto.h"
 
 #define TORTURE_WELLKNOWN_PRINTER       "torture_wkn_printer"
@@ -50 +53 @@
 #define TORTURE_DRIVER_ADOBE_CUPSADDSMB "torture_driver_adobe_cupsaddsmb"
 #define TORTURE_DRIVER_TIMESTAMPS       "torture_driver_timestamps"
+#define TORTURE_DRIVER_DELETER          "torture_driver_deleter"
+#define TORTURE_DRIVER_DELETERIN        "torture_driver_deleterin"
+#define TORTURE_PRINTER_STATIC1         "print1"
 
 #define TOP_LEVEL_PRINT_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print"
@@ -5498 +5504 @@
         TEST_SET_SZ("description", comment, "newval");
         TEST_SET_SZ("location", location, "newval");
+        TEST_SET_SZ("driverName", drivername, "newval");
 /*      TEST_SET_DWORD("priority", priority, 25); */
 
@@ -7724 +7731 @@
 }
 
-static bool test_printer_sd(struct torture_context *tctx,
-                            void *private_data)
+/* use smbd file IO to spool a print job */
+static bool test_print_test_smbd(struct torture_context *tctx,
+                                 void *private_data)
 {
         struct torture_printer_context *t =
@@ -7731 +7739 @@
         struct dcerpc_pipe *p = t->spoolss_pipe;
         struct dcerpc_binding_handle *b = p->binding_handle;
-
-        torture_assert(tctx,
-                test_PrinterInfo_SD(tctx, b, &t->handle),
-                "failed to test security descriptors");
-
-        return true;
-}
-
-static bool test_printer_dm(struct torture_context *tctx,
+        NTSTATUS status;
+        uint32_t count;
+        union spoolss_JobInfo *info = NULL;
+        int i;
+
+        struct smb2_tree *tree;
+        struct smb2_handle job_h;
+        struct cli_credentials *credentials = cmdline_credentials;
+        struct smbcli_options options;
+        TALLOC_CTX *mem_ctx = talloc_new(tctx);
+        /*
+         * Do not test against the dynamically added printers, printing via
+         * smbd means that a different spoolss process may handle the
+         * OpenPrinter request to the one that handled the AddPrinter request.
+         * This currently leads to an ugly race condition where one process
+         * sees the new printer and one doesn't.
+         */
+        const char *share = TORTURE_PRINTER_STATIC1;
+
+        torture_comment(tctx, "Testing smbd job spooling\n");
+        lpcfg_smbcli_options(tctx->lp_ctx, &options);
+
+        status = smb2_connect(tctx,
+                              torture_setting_string(tctx, "host", NULL),
+                              lpcfg_smb_ports(tctx->lp_ctx),
+                              share,
+                              lpcfg_resolve_context(tctx->lp_ctx),
+                              credentials,
+                              &tree,
+                              tctx->ev,
+                              &options,
+                              lpcfg_socket_options(tctx->lp_ctx),
+                              lpcfg_gensec_settings(tctx, tctx->lp_ctx));
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Failed to connect to SMB2 printer %s - %s\n",
+                       share, nt_errstr(status));
+                return false;
+        }
+
+        status = torture_smb2_testfile(tree, "smbd_spooler_job", &job_h);
+        torture_assert_ntstatus_ok(tctx, status, "smbd spool job create");
+
+        status = smb2_util_write(tree, job_h, "exciting print job data", 0,
+                                 sizeof("exciting print job data"));
+        torture_assert_ntstatus_ok(tctx, status, "smbd spool job write");
+
+        /* check back end spoolss job was created */
+        torture_assert(tctx,
+                test_EnumJobs_args(tctx, b, &t->handle, 1, &count, &info),
+                "EnumJobs level 1 failed");
+
+        for (i = 0; i < count; i++) {
+                if (!strcmp(info[i].info1.document_name, "smbd_spooler_job")) {
+                        break;
+                }
+        }
+        torture_assert(tctx, (i != count), "smbd_spooler_job not found");
+
+        status = smb2_util_close(tree, job_h);
+        torture_assert_ntstatus_ok(tctx, status, "smbd spool job close");
+
+        /* disconnect from printer share */
+        talloc_free(mem_ctx);
+
+        return true;
+}
+
+static bool test_printer_sd(struct torture_context *tctx,
                             void *private_data)
-{
-        struct torture_printer_context *t =
-                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
-        struct dcerpc_pipe *p = t->spoolss_pipe;
-
-        torture_assert(tctx,
-                test_PrinterInfo_DevMode(tctx, p, &t->handle, t->info2.printername, t->devmode),
-                "failed to test devicemodes");
-
-        return true;
-}
-
-static bool test_printer_info_winreg(struct torture_context *tctx,
-                                     void *private_data)
-{
-        struct torture_printer_context *t =
-                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
-        struct dcerpc_pipe *p = t->spoolss_pipe;
-
-        torture_assert(tctx,
-                test_PrinterInfo_winreg(tctx, p, &t->handle, t->info2.printername),
-                "failed to test printer info winreg");
-
-        return true;
-}
-
-static bool test_printer_change_id(struct torture_context *tctx,
-                                   void *private_data)
-{
-        struct torture_printer_context *t =
-                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
-        struct dcerpc_pipe *p = t->spoolss_pipe;
-
-        torture_assert(tctx,
-                test_ChangeID(tctx, p, &t->handle),
-                "failed to test change id");
-
-        return true;
-}
-
-static bool test_printer_keys(struct torture_context *tctx,
-                              void *private_data)
 {
         struct torture_printer_context *t =
@@ -7790 +7815 @@
 
         torture_assert(tctx,
+                test_PrinterInfo_SD(tctx, b, &t->handle),
+                "failed to test security descriptors");
+
+        return true;
+}
+
+static bool test_printer_dm(struct torture_context *tctx,
+                            void *private_data)
+{
+        struct torture_printer_context *t =
+                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+        struct dcerpc_pipe *p = t->spoolss_pipe;
+
+        torture_assert(tctx,
+                test_PrinterInfo_DevMode(tctx, p, &t->handle, t->info2.printername, t->devmode),
+                "failed to test devicemodes");
+
+        return true;
+}
+
+static bool test_printer_info_winreg(struct torture_context *tctx,
+                                     void *private_data)
+{
+        struct torture_printer_context *t =
+                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+        struct dcerpc_pipe *p = t->spoolss_pipe;
+
+        torture_assert(tctx,
+                test_PrinterInfo_winreg(tctx, p, &t->handle, t->info2.printername),
+                "failed to test printer info winreg");
+
+        return true;
+}
+
+static bool test_printer_change_id(struct torture_context *tctx,
+                                   void *private_data)
+{
+        struct torture_printer_context *t =
+                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+        struct dcerpc_pipe *p = t->spoolss_pipe;
+
+        torture_assert(tctx,
+                test_ChangeID(tctx, p, &t->handle),
+                "failed to test change id");
+
+        return true;
+}
+
+static bool test_printer_keys(struct torture_context *tctx,
+                              void *private_data)
+{
+        struct torture_printer_context *t =
+                (struct torture_printer_context *)talloc_get_type_abort(private_data, struct torture_printer_context);
+        struct dcerpc_pipe *p = t->spoolss_pipe;
+        struct dcerpc_binding_handle *b = p->binding_handle;
+
+        torture_assert(tctx,
                 test_printer_all_keys(tctx, b, &t->handle),
                 "failed to test printer keys");
@@ -7905 +7987 @@
         torture_tcase_add_simple_test(tcase, "print_test", test_print_test);
         torture_tcase_add_simple_test(tcase, "print_test_extended", test_print_test_extended);
+        torture_tcase_add_simple_test(tcase, "print_test_smbd", test_print_test_smbd);
         torture_tcase_add_simple_test(tcase, "printer_info", test_printer_info);
         torture_tcase_add_simple_test(tcase, "sd", test_printer_sd);
@@ -8923 +9006 @@
 }
 
+static bool check_printer_driver_file(struct torture_context *tctx,
+                                      struct smbcli_state *cli,
+                                      struct torture_driver_context *d,
+                                      const char *file_name)
+{
+        const char *remote_arch_dir = driver_directory_dir(d->remote.driver_directory);
+        const char *remote_name = talloc_asprintf(tctx, "%s\\%d\\%s",
+                                                  remote_arch_dir,
+                                                  d->info8.version,
+                                                  file_name);
+        int fnum;
+
+        torture_assert(tctx, (file_name && strlen(file_name) != 0), "invalid filename");
+
+        torture_comment(tctx, "checking for driver file at %s\n", remote_name);
+
+        fnum = smbcli_open(cli->tree, remote_name, O_RDONLY, DENY_NONE);
+        if (fnum == -1) {
+                return false;
+        }
+
+        torture_assert_ntstatus_ok(tctx,
+                smbcli_close(cli->tree, fnum),
+                "failed to close driver file");
+
+        return true;
+}
+
+static bool check_printer_driver_files(struct torture_context *tctx,
+                                       const char *server_name,
+                                       struct torture_driver_context *d,
+                                       bool expect_exist)
+{
+        struct smbcli_state *cli;
+        const char *share_name = driver_directory_share(tctx, d->remote.driver_directory);
+        int i;
+
+        torture_assert(tctx,
+                connect_printer_driver_share(tctx, server_name, share_name, &cli),
+                "failed to connect to driver share");
+
+        torture_comment(tctx, "checking %sexistent driver files at \\\\%s\\%s\n",
+                        (expect_exist ? "": "non-"),
+                        server_name, share_name);
+
+        if (d->info8.driver_path && d->info8.driver_path[0]) {
+                torture_assert(tctx,
+                        check_printer_driver_file(tctx, cli, d, d->info8.driver_path) == expect_exist,
+                        "failed driver_path check");
+        }
+        if (d->info8.data_file && d->info8.data_file[0]) {
+                torture_assert(tctx,
+                        check_printer_driver_file(tctx, cli, d, d->info8.data_file) == expect_exist,
+                        "failed data_file check");
+        }
+        if (d->info8.config_file && d->info8.config_file[0]) {
+                torture_assert(tctx,
+                        check_printer_driver_file(tctx, cli, d, d->info8.config_file) == expect_exist,
+                        "failed config_file check");
+        }
+        if (d->info8.help_file && d->info8.help_file[0]) {
+                torture_assert(tctx,
+                        check_printer_driver_file(tctx, cli, d, d->info8.help_file) == expect_exist,
+                        "failed help_file check");
+        }
+        if (d->info8.dependent_files) {
+                for (i=0; d->info8.dependent_files->string && d->info8.dependent_files->string[i] != NULL; i++) {
+                        torture_assert(tctx,
+                                check_printer_driver_file(tctx, cli, d, d->info8.dependent_files->string[i]) == expect_exist,
+                                "failed dependent_files check");
+                }
+        }
+
+        talloc_free(cli);
+
+        return true;
+}
+
 static bool remove_printer_driver_file(struct torture_context *tctx,
                                        struct smbcli_state *cli,
@@ -9207 +9368 @@
         struct torture_driver_context *d;
 
+        if (!torture_setting_bool(tctx, "samba3", false)) {
+                torture_skip(tctx, "skipping adobe test which only works against samba3");
+        }
+
         d = talloc_zero(tctx, struct torture_driver_context);
 
@@ -9372 +9537 @@
 }
 
+static bool test_del_driver_all_files(struct torture_context *tctx,
+                                      struct dcerpc_pipe *p)
+{
+        struct torture_driver_context *d;
+        struct spoolss_StringArray *a;
+        uint32_t add_flags = APD_COPY_NEW_FILES;
+        uint32_t delete_flags = DPD_DELETE_ALL_FILES;
+        struct dcerpc_binding_handle *b = p->binding_handle;
+        const char *server_name_slash = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+
+        d = talloc_zero(tctx, struct torture_driver_context);
+
+        d->ex                           = true;
+        d->info8.version                = SPOOLSS_DRIVER_VERSION_200X;
+        d->info8.driver_name            = TORTURE_DRIVER_DELETER;
+        d->info8.architecture           = NULL;
+        d->info8.driver_path            = talloc_strdup(d, "pscript5.dll");
+        d->info8.data_file              = talloc_strdup(d, "cups6.ppd");
+        d->info8.config_file            = talloc_strdup(d, "cupsui6.dll");
+        d->info8.help_file              = talloc_strdup(d, "pscript.hlp");
+        d->local.environment            = talloc_strdup(d, SPOOLSS_ARCHITECTURE_x64);
+        d->local.driver_directory       = talloc_strdup(d, "/usr/share/cups/drivers/x64");
+
+        a                               = talloc_zero(d, struct spoolss_StringArray);
+        a->string                       = talloc_zero_array(a, const char *, 3);
+        a->string[0]                    = talloc_strdup(a->string, "cups6.inf");
+        a->string[1]                    = talloc_strdup(a->string, "cups6.ini");
+
+        d->info8.dependent_files        = a;
+        d->info8.architecture           = d->local.environment;
+
+        torture_assert(tctx,
+                fillup_printserver_info(tctx, p, d),
+                "failed to fillup printserver info");
+
+        if (!directory_exist(d->local.driver_directory)) {
+                torture_skip(tctx, "Skipping Printer Driver test as no local driver is available");
+        }
+
+        torture_assert(tctx,
+                upload_printer_driver(tctx, dcerpc_server_name(p), d),
+                "failed to upload printer driver");
+
+        torture_assert(tctx,
+                test_AddPrinterDriver_args_level_3(tctx, b, server_name_slash, &d->info8, add_flags, true, NULL),
+                "failed to add driver");
+
+        torture_assert(tctx,
+                test_DeletePrinterDriverEx(tctx, b, server_name_slash,
+                                           d->info8.driver_name,
+                                           d->local.environment,
+                                           delete_flags,
+                                           d->info8.version),
+                "failed to delete driver");
+
+        torture_assert(tctx,
+                check_printer_driver_files(tctx, dcerpc_server_name(p), d, false),
+                "printer driver file check failed");
+
+        talloc_free(d);
+        return true;
+}
+
+static bool test_del_driver_unused_files(struct torture_context *tctx,
+                                         struct dcerpc_pipe *p)
+{
+        struct torture_driver_context *d1;
+        struct torture_driver_context *d2;
+        uint32_t add_flags = APD_COPY_NEW_FILES;
+        struct dcerpc_binding_handle *b = p->binding_handle;
+        const char *server_name_slash = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
+
+        d1 = talloc_zero(tctx, struct torture_driver_context);
+        d1->ex                          = true;
+        d1->info8.version               = SPOOLSS_DRIVER_VERSION_200X;
+        d1->info8.driver_name           = TORTURE_DRIVER_DELETER;
+        d1->info8.architecture          = NULL;
+        d1->info8.driver_path           = talloc_strdup(d1, "pscript5.dll");
+        d1->info8.data_file             = talloc_strdup(d1, "cups6.ppd");
+        d1->info8.config_file           = talloc_strdup(d1, "cupsui6.dll");
+        d1->info8.help_file             = talloc_strdup(d1, "pscript.hlp");
+        d1->local.environment           = talloc_strdup(d1, SPOOLSS_ARCHITECTURE_x64);
+        d1->local.driver_directory      = talloc_strdup(d1, "/usr/share/cups/drivers/x64");
+        d1->info8.architecture          = d1->local.environment;
+
+        d2 = talloc_zero(tctx, struct torture_driver_context);
+        d2->ex                          = true;
+        d2->info8.version               = SPOOLSS_DRIVER_VERSION_200X;
+        d2->info8.driver_name           = TORTURE_DRIVER_DELETERIN;
+        d2->info8.architecture          = NULL;
+        d2->info8.driver_path           = talloc_strdup(d2, "pscript5.dll");    /* overlapping */
+        d2->info8.data_file             = talloc_strdup(d2, "cupsps6.dll");
+        d2->info8.config_file           = talloc_strdup(d2, "cups6.ini");
+        d2->info8.help_file             = talloc_strdup(d2, "pscript.hlp");     /* overlapping */
+        d2->local.environment           = talloc_strdup(d2, SPOOLSS_ARCHITECTURE_x64);
+        d2->local.driver_directory      = talloc_strdup(d2, "/usr/share/cups/drivers/x64");
+        d2->info8.architecture          = d2->local.environment;
+
+        torture_assert(tctx,
+                fillup_printserver_info(tctx, p, d1),
+                "failed to fillup printserver info");
+        torture_assert(tctx,
+                fillup_printserver_info(tctx, p, d2),
+                "failed to fillup printserver info");
+
+        if (!directory_exist(d1->local.driver_directory)) {
+                torture_skip(tctx, "Skipping Printer Driver test as no local driver is available");
+        }
+
+        torture_assert(tctx,
+                upload_printer_driver(tctx, dcerpc_server_name(p), d1),
+                "failed to upload printer driver");
+        torture_assert(tctx,
+                test_AddPrinterDriver_args_level_3(tctx, b, server_name_slash, &d1->info8, add_flags, true, NULL),
+                "failed to add driver");
+
+        torture_assert(tctx,
+                upload_printer_driver(tctx, dcerpc_server_name(p), d2),
+                "failed to upload printer driver");
+        torture_assert(tctx,
+                test_AddPrinterDriver_args_level_3(tctx, b, server_name_slash, &d2->info8, add_flags, true, NULL),
+                "failed to add driver");
+
+        /* some files are in use by a separate driver, should fail */
+        torture_assert(tctx,
+                test_DeletePrinterDriverEx_exp(tctx, b, server_name_slash,
+                                               d1->info8.driver_name,
+                                               d1->local.environment,
+                                               DPD_DELETE_ALL_FILES,
+                                               d1->info8.version,
+                                               WERR_PRINTER_DRIVER_IN_USE),
+                "invalid delete driver response");
+
+        /* should only delete files not in use by other driver */
+        torture_assert(tctx,
+                test_DeletePrinterDriverEx_exp(tctx, b, server_name_slash,
+                                               d1->info8.driver_name,
+                                               d1->local.environment,
+                                               DPD_DELETE_UNUSED_FILES,
+                                               d1->info8.version,
+                                               WERR_OK),
+                "failed to delete driver (unused files)");
+
+        /* check non-overlapping were deleted */
+        d1->info8.driver_path = NULL;
+        d1->info8.help_file = NULL;
+        torture_assert(tctx,
+                check_printer_driver_files(tctx, dcerpc_server_name(p), d1, false),
+                "printer driver file check failed");
+        /* d2 files should be uneffected */
+        torture_assert(tctx,
+                check_printer_driver_files(tctx, dcerpc_server_name(p), d2, true),
+                "printer driver file check failed");
+
+        torture_assert(tctx,
+                test_DeletePrinterDriverEx_exp(tctx, b, server_name_slash,
+                                               d2->info8.driver_name,
+                                               d2->local.environment,
+                                               DPD_DELETE_ALL_FILES,
+                                               d2->info8.version,
+                                               WERR_OK),
+                "failed to delete driver");
+
+        torture_assert(tctx,
+                check_printer_driver_files(tctx, dcerpc_server_name(p), d2, false),
+                "printer driver file check failed");
+
+        talloc_free(d1);
+        talloc_free(d2);
+        return true;
+}
+
 struct torture_suite *torture_rpc_spoolss_driver(TALLOC_CTX *mem_ctx)
 {
@@ -9392 +9729 @@
         torture_rpc_tcase_add_test(tcase, "multiple_drivers", test_multiple_drivers);
 
+        torture_rpc_tcase_add_test(tcase, "del_driver_all_files", test_del_driver_all_files);
+
+        torture_rpc_tcase_add_test(tcase, "del_driver_unused_files", test_del_driver_unused_files);
+
         return suite;
 }