The branch, master has been updated
via bb05595... s4-smbtorture: more work on SD tests for RPC-SPOOLSS.
via 71cfcee... s4-smbtorture: add rather simple spoolss device mode
test.
via a6192d7... s4-smbtorture: use test_SetPrinter call in spoolss
security descriptor tests.
via cdf2f6b... s4-smbtorture: w2k8r2 allows to add printers w/o
defining printprocessor.
from 1988f42... testprogs: fix EnumJobs debug output in spoolss test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bb05595b0af6939ddcad138e006b9c463cf33992
Author: Günther Deschner <g...@samba.org>
Date: Mon Feb 15 22:06:42 2010 +0100
s4-smbtorture: more work on SD tests for RPC-SPOOLSS.
Guenther
commit 71cfcee6ba1d0d96def2b44cbac0757d6fe98995
Author: Günther Deschner <g...@samba.org>
Date: Mon Feb 15 22:16:25 2010 +0100
s4-smbtorture: add rather simple spoolss device mode test.
Guenther
commit a6192d766fad88cf1425d77c303d977e08fba208
Author: Günther Deschner <g...@samba.org>
Date: Mon Feb 15 21:55:06 2010 +0100
s4-smbtorture: use test_SetPrinter call in spoolss security descriptor
tests.
Guenther
commit cdf2f6b672a17c34e7c16cc22c179e01d8281bcf
Author: Günther Deschner <g...@samba.org>
Date: Mon Feb 15 19:23:35 2010 +0100
s4-smbtorture: w2k8r2 allows to add printers w/o defining printprocessor.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/spoolss.c | 217 +++++++++++++++++++++++++++++++++--------
1 files changed, 177 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index e233a27..05eee62 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -951,7 +951,7 @@ static bool test_SetPrinter(struct torture_context *tctx,
r.in.secdesc_ctr = secdesc_ctr;
r.in.command = command;
- torture_comment(tctx, "Testing SetPrinter Level %d\n",
r.in.info_ctr->level);
+ torture_comment(tctx, "Testing SetPrinter level %d\n",
r.in.info_ctr->level);
torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetPrinter(p, tctx, &r),
"failed to call SetPrinter");
@@ -1578,7 +1578,6 @@ static bool test_sd_set_level(struct torture_context
*tctx,
uint32_t level,
struct security_descriptor *sd)
{
- struct spoolss_SetPrinter r;
struct spoolss_SetPrinterInfoCtr info_ctr;
struct spoolss_DevmodeContainer devmode_ctr;
struct sec_desc_buf secdesc_ctr;
@@ -1635,14 +1634,8 @@ static bool test_sd_set_level(struct torture_context
*tctx,
secdesc_ctr.sd = sd;
- r.in.handle = handle;
- r.in.info_ctr = &info_ctr;
- r.in.devmode_ctr = &devmode_ctr;
- r.in.secdesc_ctr = &secdesc_ctr;
- r.in.command = 0;
-
- torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetPrinter(p, tctx,
&r), "SetPrinter failed");
- torture_assert_werr_ok(tctx, r.out.result, "SetPrinter failed");
+ torture_assert(tctx,
+ test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr,
&secdesc_ctr, 0), "");
return true;
}
@@ -1652,32 +1645,53 @@ static bool test_PrinterInfo_SDs(struct torture_context
*tctx,
struct policy_handle *handle)
{
union spoolss_PrinterInfo info;
- union spoolss_PrinterInfo info_2;
struct security_descriptor *sd1, *sd2;
int i;
- /* level 2 */
+ /* just compare level 2 and level 3 */
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info),
"");
+
+ sd1 = info.info2.secdesc;
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 3, &info),
"");
+
+ sd2 = info.info3.secdesc;
+
+ torture_assert(tctx, test_security_descriptor_equal(tctx, sd1, sd2),
"");
+
+
+ /* query level 2, set level 2, query level 2 */
torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info),
"");
- sd1 = security_descriptor_copy(tctx, info.info2.secdesc);
+ sd1 = info.info2.secdesc;
torture_assert(tctx, test_sd_set_level(tctx, p, handle, 2, sd1), "");
- torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2,
&info_2), "");
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info),
"");
- sd2 = security_descriptor_copy(tctx, info_2.info2.secdesc);
+ sd2 = info.info2.secdesc;
- if (sd1->type & SEC_DESC_DACL_DEFAULTED) {
- torture_comment(tctx, "removing SEC_DESC_DACL_DEFAULTED from
1st for comparison\n");
- sd1->type &= ~SEC_DESC_DACL_DEFAULTED;
- }
+ torture_assert(tctx, test_security_descriptor_equal(tctx, sd1, sd2),
"");
+
+
+ /* query level 2, set level 3, query level 2 */
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info),
"");
+
+ sd1 = info.info2.secdesc;
+
+ torture_assert(tctx, test_sd_set_level(tctx, p, handle, 3, sd1), "");
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info),
"");
+
+ sd2 = info.info2.secdesc;
torture_assert(tctx, test_security_descriptor_equal(tctx, sd1, sd2),
"");
- /* level 3 */
- sd1 = sd2;
+ /* set modified sd level 3, query level 2 */
for (i=0; i < 93; i++) {
struct security_ace a;
@@ -1692,8 +1706,13 @@ static bool test_PrinterInfo_SDs(struct torture_context
*tctx,
torture_assert(tctx, test_sd_set_level(tctx, p, handle, 3, sd1), "");
- torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2,
&info_2), "");
- sd2 = security_descriptor_copy(tctx, info_2.info2.secdesc);
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info),
"");
+ sd2 = info.info2.secdesc;
+
+ if (sd1->type & SEC_DESC_DACL_DEFAULTED) {
+ torture_comment(tctx, "removing SEC_DESC_DACL_DEFAULTED\n");
+ sd1->type &= ~SEC_DESC_DACL_DEFAULTED;
+ }
torture_assert(tctx, test_security_descriptor_equal(tctx, sd1, sd2),
"");
@@ -1709,7 +1728,6 @@ static bool test_PrinterInfo_SD(struct torture_context
*tctx,
struct policy_handle *handle)
{
union spoolss_PrinterInfo info;
- struct spoolss_SetPrinter r;
struct spoolss_SetPrinterInfo3 info3;
struct spoolss_SetPrinterInfoCtr info_ctr;
struct spoolss_DevmodeContainer devmode_ctr;
@@ -1739,14 +1757,124 @@ static bool test_PrinterInfo_SD(struct torture_context
*tctx,
secdesc_ctr.sd = sd;
- r.in.handle = handle;
- r.in.info_ctr = &info_ctr;
- r.in.devmode_ctr = &devmode_ctr;
- r.in.secdesc_ctr = &secdesc_ctr;
- r.in.command = 0;
+ torture_assert(tctx,
+ test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr,
&secdesc_ctr, 0), "");
- torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_SetPrinter(p, tctx,
&r), "SetPrinter failed");
- torture_assert_werr_ok(tctx, r.out.result, "SetPrinter failed");
+ return ret;
+}
+
+static bool test_devicemode_equal(struct torture_context *tctx,
+ const struct spoolss_DeviceMode *d1,
+ const struct spoolss_DeviceMode *d2)
+{
+ if (d1 == d2) {
+ return true;
+ }
+
+ if (!d1 || !d2) {
+ torture_comment(tctx, "%s\n", __location__);
+ return false;
+ }
+ torture_assert_str_equal(tctx, d1->devicename, d2->devicename,
"devicename mismatch");
+ torture_assert_int_equal(tctx, d1->specversion, d2->specversion,
"specversion mismatch");
+ torture_assert_int_equal(tctx, d1->driverversion, d2->driverversion,
"driverversion mismatch");
+ torture_assert_int_equal(tctx, d1->size, d2->size, "size mismatch");
+ torture_assert_int_equal(tctx, d1->__driverextra_length,
d2->__driverextra_length, "__driverextra_length mismatch");
+ torture_assert_int_equal(tctx, d1->fields, d2->fields, "fields
mismatch");
+ torture_assert_int_equal(tctx, d1->orientation, d2->orientation,
"orientation mismatch");
+ torture_assert_int_equal(tctx, d1->papersize, d2->papersize, "papersize
mismatch");
+ torture_assert_int_equal(tctx, d1->paperlength, d2->paperlength,
"paperlength mismatch");
+ torture_assert_int_equal(tctx, d1->paperwidth, d2->paperwidth,
"paperwidth mismatch");
+ torture_assert_int_equal(tctx, d1->scale, d2->scale, "scale mismatch");
+ torture_assert_int_equal(tctx, d1->copies, d2->copies, "copies
mismatch");
+ torture_assert_int_equal(tctx, d1->defaultsource, d2->defaultsource,
"defaultsource mismatch");
+ torture_assert_int_equal(tctx, d1->printquality, d2->printquality,
"printquality mismatch");
+ torture_assert_int_equal(tctx, d1->color, d2->color, "color mismatch");
+ torture_assert_int_equal(tctx, d1->duplex, d2->duplex, "duplex
mismatch");
+ torture_assert_int_equal(tctx, d1->yresolution, d2->yresolution,
"yresolution mismatch");
+ torture_assert_int_equal(tctx, d1->ttoption, d2->ttoption, "ttoption
mismatch");
+ torture_assert_int_equal(tctx, d1->collate, d2->collate, "collate
mismatch");
+ torture_assert_str_equal(tctx, d1->formname, d2->formname, "formname
mismatch");
+ torture_assert_int_equal(tctx, d1->logpixels, d2->logpixels, "logpixels
mismatch");
+ torture_assert_int_equal(tctx, d1->bitsperpel, d2->bitsperpel,
"bitsperpel mismatch");
+ torture_assert_int_equal(tctx, d1->pelswidth, d2->pelswidth, "pelswidth
mismatch");
+ torture_assert_int_equal(tctx, d1->pelsheight, d2->pelsheight,
"pelsheight mismatch");
+ torture_assert_int_equal(tctx, d1->displayflags, d2->displayflags,
"displayflags mismatch");
+ torture_assert_int_equal(tctx, d1->displayfrequency,
d2->displayfrequency, "displayfrequency mismatch");
+ torture_assert_int_equal(tctx, d1->icmmethod, d2->icmmethod, "icmmethod
mismatch");
+ torture_assert_int_equal(tctx, d1->icmintent, d2->icmintent, "icmintent
mismatch");
+ torture_assert_int_equal(tctx, d1->mediatype, d2->mediatype, "mediatype
mismatch");
+ torture_assert_int_equal(tctx, d1->dithertype, d2->dithertype,
"dithertype mismatch");
+ torture_assert_int_equal(tctx, d1->reserved1, d2->reserved1, "reserved1
mismatch");
+ torture_assert_int_equal(tctx, d1->reserved2, d2->reserved2, "reserved2
mismatch");
+ torture_assert_int_equal(tctx, d1->panningwidth, d2->panningwidth,
"panningwidth mismatch");
+ torture_assert_int_equal(tctx, d1->panningheight, d2->panningheight,
"panningheight mismatch");
+ torture_assert_data_blob_equal(tctx, d1->driverextra_data,
d2->driverextra_data, "driverextra_data mismatch");
+
+ return true;
+}
+
+static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle)
+{
+ union spoolss_PrinterInfo info;
+ struct spoolss_DeviceMode *devmode;
+ struct spoolss_DeviceMode *devmode2;
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 8, &info),
"");
+
+ devmode = info.info8.devmode;
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 2, &info),
"");
+
+ devmode2 = info.info2.devmode;
+
+ torture_assert(tctx, test_devicemode_equal(tctx, devmode, devmode2),
"");
+
+ return true;
+}
+
+/*
+ * wrapper call that saves original devmode, runs tests, and restores devmode
+ */
+
+static bool test_PrinterInfo_DevMode(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle)
+{
+ union spoolss_PrinterInfo info;
+ struct spoolss_SetPrinterInfo8 info8;
+ struct spoolss_SetPrinterInfoCtr info_ctr;
+ struct spoolss_DevmodeContainer devmode_ctr;
+ struct sec_desc_buf secdesc_ctr;
+ struct spoolss_DeviceMode *devmode;
+ bool ret = true;
+
+ /* save original devmode */
+
+ torture_assert(tctx, test_GetPrinter_level(tctx, p, handle, 8, &info),
"");
+
+ devmode = info.info8.devmode;
+
+ /* run tests */
+
+ ret = test_PrinterInfo_DevModes(tctx, p, handle);
+
+ /* restore original devmode */
+
+ ZERO_STRUCT(devmode_ctr);
+ ZERO_STRUCT(secdesc_ctr);
+
+ info8.devmode_ptr = 0;
+
+ info_ctr.level = 8;
+ info_ctr.info.info8 = &info8;
+
+ devmode_ctr.devmode = devmode;
+
+ torture_assert(tctx,
+ test_SetPrinter(tctx, p, handle, &info_ctr, &devmode_ctr,
&secdesc_ctr, 0), "");
return ret;
}
@@ -3815,17 +3943,22 @@ static bool test_AddPrinter_normal(struct
torture_context *tctx,
dcerpc_spoolss_AddPrinter(p,
tctx, &r),
"failed to add printer");
result = ex ? rex.out.result : r.out.result;
- torture_assert_werr_equal(tctx, result, WERR_UNKNOWN_PRINTPROCESSOR,
- "unexpected result code");
- info2.printprocessor = "winprint";
+ /* w2k8r2 allows to add printer w/o defining printprocessor */
- torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p,
tctx, &rex) :
- dcerpc_spoolss_AddPrinter(p,
tctx, &r),
- "failed to add printer");
- result = ex ? rex.out.result : r.out.result;
- torture_assert_werr_ok(tctx, result,
- "failed to add printer");
+ if (!W_ERROR_IS_OK(result)) {
+ torture_assert_werr_equal(tctx, result,
WERR_UNKNOWN_PRINTPROCESSOR,
+ "unexpected result code");
+
+ info2.printprocessor = "winprint";
+
+ torture_assert_ntstatus_ok(tctx, ex ?
dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+
dcerpc_spoolss_AddPrinter(p, tctx, &r),
+ "failed to add printer");
+ result = ex ? rex.out.result : r.out.result;
+ torture_assert_werr_ok(tctx, result,
+ "failed to add printer");
+ }
*handle_p = handle;
@@ -4047,6 +4180,10 @@ static bool test_printer(struct torture_context *tctx,
ret = false;
}
+ if (!test_PrinterInfo_DevMode(tctx, p, &handle[0])) {
+ ret = false;
+ }
+
if (!test_printer_keys(tctx, p, &handle[0])) {
ret = false;
}
--
Samba Shared Repository
