#include "torture/torture.h"
#include "torture/rpc/rpc.h"
#include "librpc/gen_ndr/ndr_misc.h"
+#include "librpc/gen_ndr/ndr_spoolss.h"
#include "librpc/gen_ndr/ndr_spoolss_c.h"
#include "param/param.h"
union spoolss_PortInfo *ports[3];
/* for EnumPrinterDrivers */
- uint32_t driver_count[7];
- union spoolss_DriverInfo *drivers[7];
+ uint32_t driver_count[8];
+ union spoolss_DriverInfo *drivers[8];
/* for EnumMonitors */
uint32_t monitor_count[3];
torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \
} while(0)
-#define COMPARE_STRING_ARRAY(tctx, c,r,e)
+#define COMPARE_UINT64(tctx, c, r, e) do {\
+ _CHECK_FIELD_SIZE(c, r, e, uint64_t); \
+ torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \
+} while(0)
+
+
+#define COMPARE_NTTIME(tctx, c, r, e) do {\
+ _CHECK_FIELD_SIZE(c, r, e, NTTIME); \
+ torture_assert_int_equal(tctx, c.e, r.e, "invalid value"); \
+} while(0)
+
+#define COMPARE_STRING_ARRAY(tctx, c,r,e) do {\
+ int __i; \
+ if (!c.e && !r.e) { \
+ break; \
+ } \
+ if (c.e && !r.e) { \
+ torture_fail(tctx, #r "." #e " field is NULL and " #c "." #e " is not\n"); \
+ } \
+ if (!c.e && r.e) { \
+ torture_fail(tctx, #c "." #e " field is NULL and " #r "." #e " is not\n"); \
+ } \
+ for (__i=0;c.e[__i] != NULL; __i++) { \
+ torture_assert_str_equal(tctx, c.e[__i], r.e[__i], "invalid value"); \
+ } \
+} while(0)
+
+#define CHECK_ALIGN(size, n) do {\
+ if (size % n) {\
+ torture_warning(tctx, "%d is *NOT* %d byte aligned, should be %d",\
+ size, n, size + n - (size % n));\
+ }\
+} while(0)
+
+#define DO_ROUND(size, n) (((size)+((n)-1)) & ~((n)-1))
+
+#define CHECK_NEEDED_SIZE_ENUM_LEVEL(fn, info, level, count, ic, needed, align) do { \
+ uint32_t size = ndr_size_##fn##_info(tctx, ic, level, count, info);\
+ uint32_t round_size = DO_ROUND(size, align);\
+ if (round_size != needed) {\
+ torture_warning(tctx, __location__": "#fn" level %d (count: %d) got unexpected needed size: %d, we calculated: %d", level, count, needed, round_size);\
+ CHECK_ALIGN(size, align);\
+ }\
+} while(0)
+
+#define CHECK_NEEDED_SIZE_ENUM(fn, info, count, ic, needed, align) do { \
+ uint32_t size = ndr_size_##fn##_info(tctx, ic, count, info);\
+ uint32_t round_size = DO_ROUND(size, align);\
+ if (round_size != needed) {\
+ torture_warning(tctx, __location__": "#fn" (count: %d) got unexpected needed size: %d, we calculated: %d", count, needed, round_size);\
+ CHECK_ALIGN(size, align);\
+ }\
+} while(0)
+
+#define CHECK_NEEDED_SIZE_LEVEL(fn, info, level, ic, needed, align) do { \
+ uint32_t size = ndr_size_##fn(info, level, ic, 0);\
+ uint32_t round_size = DO_ROUND(size, align);\
+ if (round_size != needed) {\
+ torture_warning(tctx, __location__": "#fn" level %d got unexpected needed size: %d, we calculated: %d", level, needed, round_size);\
+ CHECK_ALIGN(size, align);\
+ }\
+} while(0)
static bool test_OpenPrinter_server(struct torture_context *tctx,
struct dcerpc_pipe *p,
torture_assert(tctx, info, "EnumPorts returned no info");
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPorts, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
ctx->port_count[level] = count;
ctx->ports[level] = info;
}
torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_GetPrintProcessorDirectory failed");
torture_assert_werr_ok(tctx, r.out.result, "GetPrintProcessorDirectory failed");
+
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_PrintProcessorDirectoryInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 2);
}
return true;
torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_GetPrinterDriverDirectory failed");
torture_assert_werr_ok(tctx, r.out.result, "GetPrinterDriverDirectory failed");
+
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverDirectoryInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 2);
}
return true;
{
NTSTATUS status;
struct spoolss_EnumPrinterDrivers r;
- uint16_t levels[] = { 1, 2, 3, 4, 5, 6 };
+ uint16_t levels[] = { 1, 2, 3, 4, 5, 6, 8 };
int i, j;
for (i=0;i<ARRAY_SIZE(levels);i++) {
torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDrivers failed");
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinterDrivers, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
ctx->driver_count[level] = count;
ctx->drivers[level] = info;
}
for (j=0;j<ctx->driver_count[level];j++) {
union spoolss_DriverInfo *cur = &ctx->drivers[level][j];
- union spoolss_DriverInfo *ref = &ctx->drivers[6][j];
+ union spoolss_DriverInfo *ref = &ctx->drivers[8][j];
+
switch (level) {
case 1:
- COMPARE_STRING(tctx, cur->info1, ref->info6, driver_name);
+ COMPARE_STRING(tctx, cur->info1, ref->info8, driver_name);
break;
case 2:
- COMPARE_UINT32(tctx, cur->info2, ref->info6, version);
- COMPARE_STRING(tctx, cur->info2, ref->info6, driver_name);
- COMPARE_STRING(tctx, cur->info2, ref->info6, architecture);
- COMPARE_STRING(tctx, cur->info2, ref->info6, driver_path);
- COMPARE_STRING(tctx, cur->info2, ref->info6, data_file);
- COMPARE_STRING(tctx, cur->info2, ref->info6, config_file);
+ COMPARE_UINT32(tctx, cur->info2, ref->info8, version);
+ COMPARE_STRING(tctx, cur->info2, ref->info8, driver_name);
+ COMPARE_STRING(tctx, cur->info2, ref->info8, architecture);
+ COMPARE_STRING(tctx, cur->info2, ref->info8, driver_path);
+ COMPARE_STRING(tctx, cur->info2, ref->info8, data_file);
+ COMPARE_STRING(tctx, cur->info2, ref->info8, config_file);
break;
case 3:
- COMPARE_UINT32(tctx, cur->info3, ref->info6, version);
- COMPARE_STRING(tctx, cur->info3, ref->info6, driver_name);
- COMPARE_STRING(tctx, cur->info3, ref->info6, architecture);
- COMPARE_STRING(tctx, cur->info3, ref->info6, driver_path);
- COMPARE_STRING(tctx, cur->info3, ref->info6, data_file);
- COMPARE_STRING(tctx, cur->info3, ref->info6, config_file);
- COMPARE_STRING(tctx, cur->info3, ref->info6, help_file);
- COMPARE_STRING_ARRAY(tctx, cur->info3, ref->info6, dependent_files);
- COMPARE_STRING(tctx, cur->info3, ref->info6, monitor_name);
- COMPARE_STRING(tctx, cur->info3, ref->info6, default_datatype);
+ COMPARE_UINT32(tctx, cur->info3, ref->info8, version);
+ COMPARE_STRING(tctx, cur->info3, ref->info8, driver_name);
+ COMPARE_STRING(tctx, cur->info3, ref->info8, architecture);
+ COMPARE_STRING(tctx, cur->info3, ref->info8, driver_path);
+ COMPARE_STRING(tctx, cur->info3, ref->info8, data_file);
+ COMPARE_STRING(tctx, cur->info3, ref->info8, config_file);
+ COMPARE_STRING(tctx, cur->info3, ref->info8, help_file);
+ COMPARE_STRING_ARRAY(tctx, cur->info3, ref->info8, dependent_files);
+ COMPARE_STRING(tctx, cur->info3, ref->info8, monitor_name);
+ COMPARE_STRING(tctx, cur->info3, ref->info8, default_datatype);
break;
case 4:
- COMPARE_UINT32(tctx, cur->info4, ref->info6, version);
- COMPARE_STRING(tctx, cur->info4, ref->info6, driver_name);
- COMPARE_STRING(tctx, cur->info4, ref->info6, architecture);
- COMPARE_STRING(tctx, cur->info4, ref->info6, driver_path);
- COMPARE_STRING(tctx, cur->info4, ref->info6, data_file);
- COMPARE_STRING(tctx, cur->info4, ref->info6, config_file);
- COMPARE_STRING(tctx, cur->info4, ref->info6, help_file);
- COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info6, dependent_files);
- COMPARE_STRING(tctx, cur->info4, ref->info6, monitor_name);
- COMPARE_STRING(tctx, cur->info4, ref->info6, default_datatype);
- COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info6, previous_names);
+ COMPARE_UINT32(tctx, cur->info4, ref->info8, version);
+ COMPARE_STRING(tctx, cur->info4, ref->info8, driver_name);
+ COMPARE_STRING(tctx, cur->info4, ref->info8, architecture);
+ COMPARE_STRING(tctx, cur->info4, ref->info8, driver_path);
+ COMPARE_STRING(tctx, cur->info4, ref->info8, data_file);
+ COMPARE_STRING(tctx, cur->info4, ref->info8, config_file);
+ COMPARE_STRING(tctx, cur->info4, ref->info8, help_file);
+ COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info8, dependent_files);
+ COMPARE_STRING(tctx, cur->info4, ref->info8, monitor_name);
+ COMPARE_STRING(tctx, cur->info4, ref->info8, default_datatype);
+ COMPARE_STRING_ARRAY(tctx, cur->info4, ref->info8, previous_names);
break;
case 5:
- COMPARE_UINT32(tctx, cur->info5, ref->info6, version);
- COMPARE_STRING(tctx, cur->info5, ref->info6, driver_name);
- COMPARE_STRING(tctx, cur->info5, ref->info6, architecture);
- COMPARE_STRING(tctx, cur->info5, ref->info6, driver_path);
- COMPARE_STRING(tctx, cur->info5, ref->info6, data_file);
- COMPARE_STRING(tctx, cur->info5, ref->info6, config_file);
- /*COMPARE_UINT32(tctx, cur->info5, ref->info6, driver_attributes);*/
- /*COMPARE_UINT32(tctx, cur->info5, ref->info6, config_version);*/
- /*TODO: ! COMPARE_UINT32(tctx, cur->info5, ref->info6, driver_version); */
+ COMPARE_UINT32(tctx, cur->info5, ref->info8, version);
+ COMPARE_STRING(tctx, cur->info5, ref->info8, driver_name);
+ COMPARE_STRING(tctx, cur->info5, ref->info8, architecture);
+ COMPARE_STRING(tctx, cur->info5, ref->info8, driver_path);
+ COMPARE_STRING(tctx, cur->info5, ref->info8, data_file);
+ COMPARE_STRING(tctx, cur->info5, ref->info8, config_file);
+ /*COMPARE_UINT32(tctx, cur->info5, ref->info8, driver_attributes);*/
+ /*COMPARE_UINT32(tctx, cur->info5, ref->info8, config_version);*/
+ /*TODO: ! COMPARE_UINT32(tctx, cur->info5, ref->info8, driver_version); */
break;
case 6:
- /* level 6 is our reference, and it makes no sense to compare it to itself */
+ COMPARE_UINT32(tctx, cur->info6, ref->info8, version);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, driver_name);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, architecture);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, driver_path);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, data_file);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, config_file);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, help_file);
+ COMPARE_STRING_ARRAY(tctx, cur->info6, ref->info8, dependent_files);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, monitor_name);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, default_datatype);
+ COMPARE_STRING_ARRAY(tctx, cur->info6, ref->info8, previous_names);
+ COMPARE_NTTIME(tctx, cur->info6, ref->info8, driver_date);
+ COMPARE_UINT64(tctx, cur->info6, ref->info8, driver_version);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, manufacturer_name);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, manufacturer_url);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, hardware_id);
+ COMPARE_STRING(tctx, cur->info6, ref->info8, provider);
+ break;
+ case 8:
+ /* level 8 is our reference, and it makes no sense to compare it to itself */
break;
}
}
torture_assert_werr_ok(tctx, r.out.result, "EnumMonitors failed");
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumMonitors, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
ctx->monitor_count[level] = count;
ctx->monitors[level] = info;
}
torture_assert_werr_ok(tctx, r.out.result, "EnumPrintProcessors failed");
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcessors, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
ctx->print_processor_count[level] = count;
ctx->print_processors[level] = info;
}
torture_assert_ntstatus_ok(tctx, status, "dcerpc_spoolss_EnumPrintProcDataTypes failed");
torture_assert_werr_ok(tctx, r.out.result, "EnumPrintProcDataTypes failed");
+
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrintProcDataTypes, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
}
return true;
torture_assert_werr_ok(tctx, r.out.result, "EnumPrinters failed");
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinters, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
ctx->printer_count[level] = count;
ctx->printers[level] = info;
}
return true;
}
+static bool test_GetPrinterDriver2(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle,
+ const char *driver_name);
+
static bool test_GetPrinter(struct torture_context *tctx,
struct dcerpc_pipe *p,
struct policy_handle *handle)
torture_assert_ntstatus_ok(tctx, status, "GetPrinter failed");
torture_assert_werr_ok(tctx, r.out.result, "GetPrinter failed");
+
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
+ if ((r.in.level == 2) && r.out.info->info2.drivername && strlen(r.out.info->info2.drivername)) {
+ torture_assert(tctx,
+ test_GetPrinterDriver2(tctx, p, handle, r.out.info->info2.drivername),
+ "failed to call test_GetPrinterDriver2");
+ }
}
return true;
struct spoolss_SetPrinterInfo5 info5;
struct spoolss_SetPrinterInfo6 info6;
struct spoolss_SetPrinterInfo7 info7;
- struct spoolss_DeviceModeInfo info8;
- struct spoolss_DeviceModeInfo info9;
+ struct spoolss_SetPrinterInfo8 info8;
+ struct spoolss_SetPrinterInfo9 info9;
info_ctr.level = levels[i];
static void clear_info2(struct spoolss_SetPrinterInfoCtr *r)
{
if ((r->level == 2) && (r->info.info2)) {
- r->info.info2->secdesc = NULL;
- r->info.info2->devmode = NULL;
+ r->info.info2->secdesc_ptr = 0;
+ r->info.info2->devmode_ptr = 0;
}
}
torture_assert_werr_ok(tctx, r.out.result, "GetForm failed");
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_FormInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
return true;
}
torture_assert_ntstatus_ok(tctx, status, "EnumForms failed");
torture_assert_werr_ok(tctx, r.out.result, "EnumForms failed");
+
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumForms, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
}
return true;
torture_assert_werr_ok(tctx, r.out.result, "EnumPorts failed");
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPorts, info, 2, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
return true;
}
}
torture_assert(tctx, r.out.info, "No job info returned");
torture_assert_werr_ok(tctx, r.out.result, "GetJob failed");
+
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_JobInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
}
return true;
torture_assert_werr_ok(tctx, r.out.result, "EnumJobs failed");
torture_assert(tctx, info, "No jobs returned");
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumJobs, *r.out.info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
for (j = 0; j < count; j++) {
torture_assert(tctx, test_GetJob(tctx, p, handle, info[j].info1.job_id),
static bool test_GetPrinterData(struct torture_context *tctx,
struct dcerpc_pipe *p,
struct policy_handle *handle,
- const char *value_name)
+ const char *value_name,
+ enum winreg_Type *type_p,
+ union spoolss_PrinterData *data_p)
{
NTSTATUS status;
struct spoolss_GetPrinterData r;
r.out.type = &type;
r.out.data = &data;
- torture_comment(tctx, "Testing GetPrinterData\n");
+ torture_comment(tctx, "Testing GetPrinterData(%s)\n", r.in.value_name);
status = dcerpc_spoolss_GetPrinterData(p, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "GetPrinterData failed");
status = dcerpc_spoolss_GetPrinterData(p, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "GetPrinterData failed");
+ }
+
+ torture_assert_werr_ok(tctx, r.out.result,
+ talloc_asprintf(tctx, "GetPrinterData(%s) failed", r.in.value_name));
+
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterData, &data, type, lp_iconv_convenience(tctx->lp_ctx), needed, 1);
+
+ if (type_p) {
+ *type_p = type;
+ }
- torture_assert_werr_ok(tctx, r.out.result, "GetPrinterData failed");
+ if (data_p) {
+ *data_p = data;
}
return true;
struct dcerpc_pipe *p,
struct policy_handle *handle,
const char *key_name,
- const char *value_name)
+ const char *value_name,
+ enum winreg_Type *type_p,
+ union spoolss_PrinterData *data_p)
{
NTSTATUS status;
struct spoolss_GetPrinterDataEx r;
enum winreg_Type type;
uint32_t needed;
+ union spoolss_PrinterData data;
r.in.handle = handle;
r.in.key_name = key_name;
r.in.offered = 0;
r.out.type = &type;
r.out.needed = &needed;
- r.out.buffer = NULL;
+ r.out.data = &data;
- torture_comment(tctx, "Testing GetPrinterDataEx\n");
+ torture_comment(tctx, "Testing GetPrinterDataEx(%s - %s)\n",
+ r.in.key_name, r.in.value_name);
status = dcerpc_spoolss_GetPrinterDataEx(p, tctx, &r);
if (!NT_STATUS_IS_OK(status)) {
if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
r.in.offered = needed;
- r.out.buffer = talloc_array(tctx, uint8_t, needed);
-
status = dcerpc_spoolss_GetPrinterDataEx(p, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "GetPrinterDataEx failed");
+ }
+
+ torture_assert_werr_ok(tctx, r.out.result,
+ talloc_asprintf(tctx, "GetPrinterDataEx(%s - %s) failed", r.in.key_name, r.in.value_name));
+
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterData, &data, type, lp_iconv_convenience(tctx->lp_ctx), needed, 1);
+
+ if (type_p) {
+ *type_p = type;
+ }
+
+ if (data_p) {
+ *data_p = data;
+ }
+
+ return true;
+}
+
+static bool test_GetPrinterData_list(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle)
+{
+ const char *list[] = {
+ "W3SvcInstalled",
+ "BeepEnabled",
+ "EventLog",
+ /* "NetPopup", not on w2k8 */
+ /* "NetPopupToComputer", not on w2k8 */
+ "MajorVersion",
+ "MinorVersion",
+ "DefaultSpoolDirectory",
+ "Architecture",
+ "DsPresent",
+ "OSVersion",
+ /* "OSVersionEx", not on s3 */
+ "DNSMachineName"
+ };
+ int i;
- torture_assert_werr_ok(tctx, r.out.result, "GetPrinterDataEx failed");
+ for (i=0; i < ARRAY_SIZE(list); i++) {
+ enum winreg_Type type, type_ex;
+ union spoolss_PrinterData data, data_ex;
+
+ torture_assert(tctx, test_GetPrinterData(tctx, p, handle, list[i], &type, &data),
+ talloc_asprintf(tctx, "GetPrinterData failed on %s\n", list[i]));
+ torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle, "random_string", list[i], &type_ex, &data_ex),
+ talloc_asprintf(tctx, "GetPrinterDataEx failed on %s\n", list[i]));
+ torture_assert_int_equal(tctx, type, type_ex, "type mismatch");
+ switch (type) {
+ case REG_SZ:
+ torture_assert_str_equal(tctx, data.string, data_ex.string, "REG_SZ mismatch");
+ break;
+ case REG_DWORD:
+ torture_assert_int_equal(tctx, data.value, data_ex.value, "REG_DWORD mismatch");
+ break;
+ case REG_BINARY:
+ torture_assert_data_blob_equal(tctx, data.binary, data_ex.binary, "REG_BINARY mismatch");
+ break;
+ default:
+ break;
+ }
}
return true;
torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterData failed");
- torture_assert(tctx, test_GetPrinterData(tctx, p, handle, r.out.value_name),
+ torture_assert(tctx, test_GetPrinterData(tctx, p, handle, r.out.value_name, NULL, NULL),
talloc_asprintf(tctx, "failed to call GetPrinterData for %s\n", r.out.value_name));
- torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", r.out.value_name),
+ torture_assert(tctx, test_GetPrinterDataEx(tctx, p, handle, "PrinterDriverData", r.out.value_name, NULL, NULL),
talloc_asprintf(tctx, "failed to call GetPrinterDataEx on PrinterDriverData for %s\n", r.out.value_name));
r.in.enum_index++;
struct policy_handle *handle,
const char *key_name)
{
- NTSTATUS status;
struct spoolss_EnumPrinterDataEx r;
struct spoolss_PrinterEnumValues *info;
uint32_t needed;
torture_assert_werr_ok(tctx, r.out.result, "EnumPrinterDataEx failed");
+ CHECK_NEEDED_SIZE_ENUM(spoolss_EnumPrinterDataEx, info, count, lp_iconv_convenience(tctx->lp_ctx), needed, 1);
+
return true;
}
r.in.handle = handle;
r.in.value_name = value_name;
- torture_comment(tctx, "Testing DeletePrinterData\n");
+ torture_comment(tctx, "Testing DeletePrinterData(%s)\n",
+ r.in.value_name);
status = dcerpc_spoolss_DeletePrinterData(p, tctx, &r);
return true;
}
+static bool test_DeletePrinterDataEx(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle,
+ const char *key_name,
+ const char *value_name)
+{
+ struct spoolss_DeletePrinterDataEx r;
+
+ r.in.handle = handle;
+ r.in.key_name = key_name;
+ r.in.value_name = value_name;
+
+ torture_comment(tctx, "Testing DeletePrinterDataEx(%s - %s)\n",
+ r.in.key_name, r.in.value_name);
+
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_spoolss_DeletePrinterDataEx(p, tctx, &r),
+ "DeletePrinterDataEx failed");
+ torture_assert_werr_ok(tctx, r.out.result,
+ "DeletePrinterDataEx failed");
+
+ return true;
+}
+
+static bool test_DeletePrinterKey(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle,
+ const char *key_name)
+{
+ struct spoolss_DeletePrinterKey r;
+
+ r.in.handle = handle;
+ r.in.key_name = key_name;
+
+ torture_comment(tctx, "Testing DeletePrinterKey(%s)\n", r.in.key_name);
+
+ if (strequal(key_name, "") && !torture_setting_bool(tctx, "dangerous", false)) {
+ torture_skip(tctx, "not wiping out printer registry - enable dangerous tests to use\n");
+ return true;
+ }
+
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_spoolss_DeletePrinterKey(p, tctx, &r),
+ "DeletePrinterKey failed");
+ torture_assert_werr_ok(tctx, r.out.result,
+ "DeletePrinterKey failed");
+
+ return true;
+}
+
static bool test_SetPrinterData(struct torture_context *tctx,
struct dcerpc_pipe *p,
struct policy_handle *handle)
{
NTSTATUS status;
struct spoolss_SetPrinterData r;
- const char *value_name = "spottyfoot";
+ const char *values[] = {
+ "spootyfoot",
+ "spooty\\foot",
+#if 0
+ /* FIXME: not working with s3 atm. */
+ "spooty,foot",
+ "spooty,fo,ot",
+#endif
+ "spooty foot",
+#if 0
+ /* FIXME: not working with s3 atm. */
+ "spooty\\fo,ot",
+ "spooty,fo\\ot"
+#endif
+ };
+ int i;
- r.in.handle = handle;
- r.in.value_name = value_name;
- r.in.type = REG_SZ;
- r.in.data.string = "dog";
+ for (i=0; i < ARRAY_SIZE(values); i++) {
- torture_comment(tctx, "Testing SetPrinterData(%s)\n", value_name);
+ enum winreg_Type type;
+ union spoolss_PrinterData data;
- status = dcerpc_spoolss_SetPrinterData(p, tctx, &r);
+ r.in.handle = handle;
+ r.in.value_name = values[i];
+ r.in.type = REG_SZ;
+ r.in.data.string = "dog";
- torture_assert_ntstatus_ok(tctx, status, "SetPrinterData failed");
- torture_assert_werr_ok(tctx, r.out.result, "SetPrinterData failed");
+ torture_comment(tctx, "Testing SetPrinterData(%s)\n",
+ r.in.value_name);
- if (!test_GetPrinterData(tctx, p, handle, value_name)) {
- return false;
+ status = dcerpc_spoolss_SetPrinterData(p, tctx, &r);
+
+ torture_assert_ntstatus_ok(tctx, status, "SetPrinterData failed");
+ torture_assert_werr_ok(tctx, r.out.result, "SetPrinterData failed");
+
+ if (!test_GetPrinterData(tctx, p, handle, r.in.value_name, &type, &data)) {
+ return false;
+ }
+
+ torture_assert_int_equal(tctx, r.in.type, type, "type mismatch");
+ torture_assert_str_equal(tctx, r.in.data.string, data.string, "data mismatch");
+
+ if (!test_DeletePrinterData(tctx, p, handle, r.in.value_name)) {
+ return false;
+ }
}
- if (!test_DeletePrinterData(tctx, p, handle, value_name)) {
- return false;
+ return true;
+}
+
+static bool test_EnumPrinterKey(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle,
+ const char *key_name,
+ const char ***array);
+
+static bool test_SetPrinterDataEx(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle)
+{
+ NTSTATUS status;
+ struct spoolss_SetPrinterDataEx r;
+ const char *value_name = "dog";
+ const char *keys[] = {
+ "torturedataex",
+ "torture data ex",
+#if 0
+ /* FIXME: not working with s3 atm. */
+ "torturedataex_with_subkey\\subkey",
+ "torturedataex_with_subkey\\subkey:0",
+ "torturedataex_with_subkey\\subkey:1",
+ "torturedataex_with_subkey\\subkey\\subsubkey",
+ "torturedataex_with_subkey\\subkey\\subsubkey:0",
+ "torturedataex_with_subkey\\subkey\\subsubkey:1",
+#endif
+ "torture,data",
+#if 0
+ /* FIXME: not working with s3 atm. */
+
+ "torture,data,ex",
+ "torture,data\\ex",
+ "torture\\data,ex"
+#endif
+ };
+ int i;
+ DATA_BLOB blob = data_blob_string_const("catfoobar");
+
+
+ for (i=0; i < ARRAY_SIZE(keys); i++) {
+
+ char *c;
+ const char *key;
+ enum winreg_Type type;
+ const char **subkeys;
+ union spoolss_PrinterData data;
+
+ r.in.handle = handle;
+ r.in.key_name = keys[i];
+ r.in.value_name = value_name;
+ r.in.type = REG_BINARY;
+ r.in.data.binary = blob;
+
+ torture_comment(tctx, "Testing SetPrinterDataEx(%s - %s)\n", r.in.key_name, value_name);
+
+ status = dcerpc_spoolss_SetPrinterDataEx(p, tctx, &r);
+
+ torture_assert_ntstatus_ok(tctx, status, "SetPrinterDataEx failed");
+ torture_assert_werr_ok(tctx, r.out.result, "SetPrinterDataEx failed");
+
+ key = talloc_strdup(tctx, r.in.key_name);
+
+ if (!test_GetPrinterDataEx(tctx, p, handle, r.in.key_name, value_name, &type, &data)) {
+ return false;
+ }
+
+ torture_assert_int_equal(tctx, r.in.type, type, "type mismatch");
+ torture_assert_data_blob_equal(tctx, blob, data.binary, "data mismatch");
+
+ if (!test_EnumPrinterDataEx(tctx, p, handle, r.in.key_name)) {
+ return false;
+ }
+
+ if (!test_DeletePrinterDataEx(tctx, p, handle, r.in.key_name, value_name)) {
+ return false;
+ }
+
+ c = strchr(key, '\\');
+ if (c) {
+ int i;
+
+ /* we have subkeys */
+
+ *c = 0;
+
+ if (!test_EnumPrinterKey(tctx, p, handle, key, &subkeys)) {
+ return false;
+ }
+
+ for (i=0; subkeys && subkeys[i]; i++) {
+
+ const char *current_key = talloc_asprintf(tctx, "%s\\%s", key, subkeys[i]);
+
+ if (!test_DeletePrinterKey(tctx, p, handle, current_key)) {
+ return false;
+ }
+ }
+
+ if (!test_DeletePrinterKey(tctx, p, handle, key)) {
+ return false;
+ }
+
+ } else {
+ if (!test_DeletePrinterKey(tctx, p, handle, key)) {
+ return false;
+ }
+ }
}
return true;
}
+
static bool test_SecondaryClosePrinter(struct torture_context *tctx,
struct dcerpc_pipe *p,
struct policy_handle *handle)
ret = false;
}
+ if (!test_SetPrinterDataEx(tctx, p, &handle)) {
+ ret = false;
+ }
+
if (!torture_setting_bool(tctx, "samba3", false)) {
if (!test_SecondaryClosePrinter(tctx, p, &handle)) {
ret = false;
torture_assert_werr_ok(tctx, r.out.result, "EnumPrinters failed");
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinters, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
if (!info) {
torture_comment(tctx, "No printers returned\n");
return true;
torture_assert_werr_ok(tctx, r.out.result,
"failed to call GetPrinterDriver");
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
return true;
}
const char *driver_name)
{
struct spoolss_GetPrinterDriver2 r;
+ uint16_t levels[] = {1, 2, 3, 4, 5, 6, 8, 101 };
uint32_t needed;
uint32_t server_major_version;
uint32_t server_minor_version;
+ int i;
r.in.handle = handle;
- r.in.architecture = "W32X86";
- r.in.level = 1;
- r.in.buffer = NULL;
- r.in.offered = 0;
- r.in.client_major_version = 0;
+ r.in.architecture = SPOOLSS_ARCHITECTURE_NT_X86;
+ r.in.client_major_version = 3;
r.in.client_minor_version = 0;
r.out.needed = &needed;
r.out.server_major_version = &server_major_version;
r.out.server_minor_version = &server_minor_version;
- torture_comment(tctx, "Testing GetPrinterDriver2 level %d\n", r.in.level);
+ for (i=0;i<ARRAY_SIZE(levels);i++) {
+
+ r.in.buffer = NULL;
+ r.in.offered = 0;
+ r.in.level = levels[i];
+
+ torture_comment(tctx, "Testing GetPrinterDriver2(%s) level %d\n",
+ driver_name, r.in.level);
- torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r),
- "failed to call GetPrinterDriver2");
- if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
- DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
- data_blob_clear(&blob);
- r.in.buffer = &blob;
- r.in.offered = needed;
torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r),
"failed to call GetPrinterDriver2");
- }
+ if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+ DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+ data_blob_clear(&blob);
+ r.in.buffer = &blob;
+ r.in.offered = needed;
+ torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver2(p, tctx, &r),
+ "failed to call GetPrinterDriver2");
+ }
- torture_assert_werr_ok(tctx, r.out.result,
- "failed to call GetPrinterDriver2");
+ if (W_ERROR_EQUAL(r.out.result, WERR_INVALID_LEVEL)) {
+ switch (r.in.level) {
+ case 101:
+ case 8:
+ continue;
+ default:
+ break;
+ }
+ }
+
+ torture_assert_werr_ok(tctx, r.out.result,
+ "failed to call GetPrinterDriver2");
+
+ CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+ }
return true;
}
torture_comment(tctx, "No printer drivers returned\n");
break;
}
+
+ CHECK_NEEDED_SIZE_ENUM_LEVEL(spoolss_EnumPrinterDrivers, info, r.in.level, count, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
}
return true;
return ret;
}
-bool test_printer_keys(struct torture_context *tctx,
- struct dcerpc_pipe *p,
- struct policy_handle *handle)
+static bool test_EnumPrinterKey(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle,
+ const char *key_name,
+ const char ***array)
{
- const char **key_array = NULL;
+ struct spoolss_EnumPrinterKey r;
+ uint32_t needed = 0;
+ union spoolss_KeyNames key_buffer;
+ int32_t offered[] = { 0, 1, 2, 3, 4, 5, -1, -2, -3, -4, -5, 256, 512, 1024, 2048 };
+ uint32_t _ndr_size;
int i;
- {
- struct spoolss_EnumPrinterKey r;
- uint32_t needed;
- struct spoolss_StringArray2 key_buffer;
+ r.in.handle = handle;
+ r.in.key_name = key_name;
+ r.out.key_buffer = &key_buffer;
+ r.out.needed = &needed;
+ r.out._ndr_size = &_ndr_size;
- r.in.handle = handle;
- r.in.key_name = "";
- r.in.offered = 0;
- r.out.key_buffer = &key_buffer;
- r.out.needed = &needed;
+ for (i=0; i < ARRAY_SIZE(offered); i++) {
+
+ if (offered[i] < 0 && needed) {
+ if (needed <= 4) {
+ continue;
+ }
+ r.in.offered = needed + offered[i];
+ } else {
+ r.in.offered = offered[i];
+ }
+
+ ZERO_STRUCT(key_buffer);
+
+ torture_comment(tctx, "Testing EnumPrinterKey(%s) with %d offered\n", r.in.key_name, r.in.offered);
torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey(p, tctx, &r),
"failed to call EnumPrinterKey");
if (W_ERROR_EQUAL(r.out.result, WERR_MORE_DATA)) {
- torture_assert(tctx, (key_buffer._ndr_size == 0),
- talloc_asprintf(tctx, "EnumPrinterKey did not return 0 _ndr_size (but %d), windows clients would abort here!", key_buffer._ndr_size));
+
+ torture_assert(tctx, (_ndr_size == r.in.offered/2),
+ talloc_asprintf(tctx, "EnumPrinterKey size mismatch, _ndr_size %d (expected %d)",
+ _ndr_size, r.in.offered/2));
r.in.offered = needed;
torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_EnumPrinterKey(p, tctx, &r),
"failed to call EnumPrinterKey");
}
- torture_assert_werr_ok(tctx, r.out.result,
- "failed to call EnumPrinterKey");
- torture_assert(tctx, (key_buffer._ndr_size * 2 == needed),
+ if (offered[i] > 0) {
+ torture_assert_werr_ok(tctx, r.out.result,
+ "failed to call EnumPrinterKey");
+ }
+
+ torture_assert(tctx, (_ndr_size == r.in.offered/2),
talloc_asprintf(tctx, "EnumPrinterKey size mismatch, _ndr_size %d (expected %d)",
- key_buffer._ndr_size, needed/2));
+ _ndr_size, r.in.offered/2));
+
+ torture_assert(tctx, (*r.out.needed <= r.in.offered),
+ talloc_asprintf(tctx, "EnumPrinterKey size mismatch: needed %d is not <= offered %d", *r.out.needed, r.in.offered));
+
+ torture_assert(tctx, (*r.out.needed <= _ndr_size * 2),
+ talloc_asprintf(tctx, "EnumPrinterKey size mismatch: needed %d is not <= _ndr_size %d * 2", *r.out.needed, _ndr_size));
+
+ if (key_buffer.string_array) {
+ uint32_t calc_needed = 0;
+ int s;
+ for (s=0; key_buffer.string_array[s]; s++) {
+ calc_needed += strlen_m_term(key_buffer.string_array[s])*2;
+ }
+ if (!key_buffer.string_array[0]) {
+ calc_needed += 2;
+ }
+ calc_needed += 2;
+
+ torture_assert_int_equal(tctx, *r.out.needed, calc_needed,
+ "EnumPrinterKey unexpected size");
+ }
+ }
- key_array = key_buffer.string;
+ if (array) {
+ *array = key_buffer.string_array;
}
+ return true;
+}
+
+bool test_printer_keys(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle)
+{
+ const char **key_array = NULL;
+ int i;
+
+ torture_assert(tctx, test_EnumPrinterKey(tctx, p, handle, "", &key_array),
+ "failed to call test_EnumPrinterKey");
+
+ for (i=0; key_array && key_array[i]; i++) {
+ torture_assert(tctx, test_EnumPrinterKey(tctx, p, handle, key_array[i], NULL),
+ "failed to call test_EnumPrinterKey");
+ }
for (i=0; key_array && key_array[i]; i++) {
torture_assert(tctx, test_EnumPrinterDataEx(tctx, p, handle, key_array[i]),
"failed to call test_EnumPrinterDataEx");
ctx = talloc_zero(torture, struct test_spoolss_context);
ret &= test_OpenPrinter_server(torture, p, &ctx->server_handle);
-
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "W3SvcInstalled");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "BeepEnabled");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "EventLog");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "NetPopup");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "NetPopupToComputer");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "MajorVersion");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "MinorVersion");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "DefaultSpoolDirectory");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "Architecture");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "DsPresent");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "OSVersion");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "OSVersionEx");
- ret &= test_GetPrinterData(torture, p, &ctx->server_handle, "DNSMachineName");
+ ret &= test_GetPrinterData_list(torture, p, &ctx->server_handle);
ret &= test_EnumForms(torture, p, &ctx->server_handle, true);
ret &= test_AddForm(torture, p, &ctx->server_handle, true);
ret &= test_EnumPorts(torture, p, ctx);
git.samba.org / ira / wip.git / blobdiff