mirror of
https://github.com/samba-team/samba.git
synced 2025-01-13 13:18:06 +03:00
RAW-OPLOCK: add BATCH23 and test with a connection with no CAP_LEVEL_II_OPLOCKS
metze
This commit is contained in:
parent
0905f3ebd1
commit
2192d6d2bd
@ -24,6 +24,9 @@
|
||||
#include "libcli/libcli.h"
|
||||
#include "torture/util.h"
|
||||
#include "lib/events/events.h"
|
||||
#include "param/param.h"
|
||||
#include "lib/cmdline/popt_common.h"
|
||||
#include "libcli/resolve/resolve.h"
|
||||
|
||||
#define CHECK_VAL(v, correct) do { \
|
||||
if ((v) != (correct)) { \
|
||||
@ -153,6 +156,32 @@ static bool oplock_handler_close(struct smbcli_transport *transport, uint16_t ti
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool open_connection_no_level2_oplocks(struct torture_context *tctx,
|
||||
struct smbcli_state **c)
|
||||
{
|
||||
NTSTATUS status;
|
||||
|
||||
struct smbcli_options options;
|
||||
|
||||
lp_smbcli_options(tctx->lp_ctx, &options);
|
||||
|
||||
options.use_level2_oplocks = false;
|
||||
|
||||
status = smbcli_full_connection(tctx, c,
|
||||
torture_setting_string(tctx, "host", NULL),
|
||||
lp_smb_ports(tctx->lp_ctx),
|
||||
torture_setting_string(tctx, "share", NULL),
|
||||
NULL, cmdline_credentials,
|
||||
lp_resolve_context(tctx->lp_ctx),
|
||||
tctx->ev, &options);
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
printf("Failed to open connection - %s\n", nt_errstr(status));
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool test_raw_oplock_exclusive1(struct torture_context *tctx, struct smbcli_state *cli1, struct smbcli_state *cli2)
|
||||
{
|
||||
const char *fname = BASEDIR "\\test_exclusive1.dat";
|
||||
@ -2387,6 +2416,97 @@ done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static bool test_raw_oplock_batch23(struct torture_context *tctx, struct smbcli_state *cli1, struct smbcli_state *cli2)
|
||||
{
|
||||
const char *fname = BASEDIR "\\test_batch23.dat";
|
||||
NTSTATUS status;
|
||||
bool ret = true;
|
||||
union smb_open io;
|
||||
uint16_t fnum=0, fnum2=0,fnum3=0;
|
||||
struct smbcli_state *cli3 = NULL;
|
||||
|
||||
if (torture_setting_bool(tctx, "samba3", false)) {
|
||||
torture_skip(tctx, "BACHT23 disabled against samba3\n");
|
||||
}
|
||||
|
||||
if (!torture_setup_dir(cli1, BASEDIR)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* cleanup */
|
||||
smbcli_unlink(cli1->tree, fname);
|
||||
|
||||
smbcli_oplock_handler(cli1->transport, oplock_handler_ack_to_levelII, cli1->tree);
|
||||
|
||||
ret = open_connection_no_level2_oplocks(tctx, &cli3);
|
||||
CHECK_VAL(ret, true);
|
||||
|
||||
/*
|
||||
base ntcreatex parms
|
||||
*/
|
||||
io.generic.level = RAW_OPEN_NTCREATEX;
|
||||
io.ntcreatex.in.root_fid = 0;
|
||||
io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
|
||||
io.ntcreatex.in.alloc_size = 0;
|
||||
io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
|
||||
io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
|
||||
io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
|
||||
io.ntcreatex.in.create_options = 0;
|
||||
io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
|
||||
io.ntcreatex.in.security_flags = 0;
|
||||
io.ntcreatex.in.fname = fname;
|
||||
|
||||
torture_comment(tctx, "a open and ask for a batch oplock\n");
|
||||
ZERO_STRUCT(break_info);
|
||||
smbcli_oplock_handler(cli1->transport, oplock_handler_ack_to_levelII, cli1->tree);
|
||||
smbcli_oplock_handler(cli2->transport, oplock_handler_ack_to_levelII, cli2->tree);
|
||||
smbcli_oplock_handler(cli3->transport, oplock_handler_ack_to_levelII, cli3->tree);
|
||||
|
||||
io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_READ | SEC_RIGHTS_FILE_WRITE;
|
||||
io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE;
|
||||
io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED |
|
||||
NTCREATEX_FLAGS_REQUEST_OPLOCK |
|
||||
NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK;
|
||||
status = smb_raw_open(cli1->tree, tctx, &io);
|
||||
CHECK_STATUS(tctx, status, NT_STATUS_OK);
|
||||
fnum = io.ntcreatex.out.file.fnum;
|
||||
CHECK_VAL(io.ntcreatex.out.oplock_level, BATCH_OPLOCK_RETURN);
|
||||
|
||||
ZERO_STRUCT(break_info);
|
||||
|
||||
torture_comment(tctx, "a 2nd open without level2 oplock support should generate a break to level2\n");
|
||||
status = smb_raw_open(cli3->tree, tctx, &io);
|
||||
CHECK_STATUS(tctx, status, NT_STATUS_OK);
|
||||
fnum3 = io.ntcreatex.out.file.fnum;
|
||||
CHECK_VAL(io.ntcreatex.out.oplock_level, NO_OPLOCK_RETURN);
|
||||
|
||||
CHECK_VAL(break_info.count, 1);
|
||||
CHECK_VAL(break_info.fnum, fnum);
|
||||
CHECK_VAL(break_info.level, OPLOCK_BREAK_TO_LEVEL_II);
|
||||
CHECK_VAL(break_info.failures, 0);
|
||||
|
||||
ZERO_STRUCT(break_info);
|
||||
|
||||
torture_comment(tctx, "a 3rd open with level2 oplock support should not generate a break\n");
|
||||
status = smb_raw_open(cli2->tree, tctx, &io);
|
||||
CHECK_STATUS(tctx, status, NT_STATUS_OK);
|
||||
fnum2 = io.ntcreatex.out.file.fnum;
|
||||
CHECK_VAL(io.ntcreatex.out.oplock_level, LEVEL_II_OPLOCK_RETURN);
|
||||
|
||||
CHECK_VAL(break_info.count, 0);
|
||||
|
||||
smbcli_close(cli1->tree, fnum);
|
||||
smbcli_close(cli2->tree, fnum2);
|
||||
smbcli_close(cli3->tree, fnum3);
|
||||
|
||||
done:
|
||||
smb_raw_exit(cli1->session);
|
||||
smb_raw_exit(cli2->session);
|
||||
smb_raw_exit(cli3->session);
|
||||
smbcli_deltree(cli1->tree, BASEDIR);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
basic testing of oplocks
|
||||
*/
|
||||
@ -2422,6 +2542,7 @@ struct torture_suite *torture_raw_oplock(TALLOC_CTX *mem_ctx)
|
||||
torture_suite_add_2smb_test(suite, "BATCH20", test_raw_oplock_batch20);
|
||||
torture_suite_add_2smb_test(suite, "BATCH21", test_raw_oplock_batch21);
|
||||
torture_suite_add_2smb_test(suite, "BATCH22", test_raw_oplock_batch22);
|
||||
torture_suite_add_2smb_test(suite, "BATCH23", test_raw_oplock_batch23);
|
||||
|
||||
return suite;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user