[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Tue Feb 28 23:24:04 MST 2012


The branch, master has been updated
       via  65d42ab s3:torture/test_smb2: test path based calls during reauth in SMB2-MULTI-CHANNEL
       via  300ab04 s3:torture/test_smb2: test handle based calls during reauth in SMB2-MULTI-CHANNEL
       via  2fced53 s3:torture/test_smb2: do a reauth over multiple channels in SMB2-MULTI-CHANNEL
       via  670ea3e s3:torture/test_smb2: add a 3rd channel to SMB2-MULTI-CHANNEL
       via  c0dac92 s3:torture/test_smb2: expect FILE_CLOSED on invalid handles in SMB2-MULTI-CHANNEL
       via  51a15e9 s4:torture/smb2: remove unused var
      from  c9219fe libcli/smb/smbXcli: use smb2_key_deviration() to setup SMB 2.24 keys

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 65d42ab727d4a335ef4265030d16d31aae015371
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Feb 27 13:27:38 2012 +0100

    s3:torture/test_smb2: test path based calls during reauth in SMB2-MULTI-CHANNEL
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Feb 29 07:23:14 CET 2012 on sn-devel-104

commit 300ab04a07b1de2674528474dba55726c3a3bef1
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Feb 27 13:27:38 2012 +0100

    s3:torture/test_smb2: test handle based calls during reauth in SMB2-MULTI-CHANNEL
    
    metze

commit 2fced53cfe768b15791208331dea5a9e91ac9567
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Feb 27 11:19:22 2012 +0100

    s3:torture/test_smb2: do a reauth over multiple channels in SMB2-MULTI-CHANNEL
    
    metze

commit 670ea3e3a35e97ce34f60b6a1f0aff8bfede5353
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Feb 27 11:50:40 2012 +0100

    s3:torture/test_smb2: add a 3rd channel to SMB2-MULTI-CHANNEL
    
    metze

commit c0dac92b429b014c4c3d0778800d2baaf2610892
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Feb 29 03:57:34 2012 +0100

    s3:torture/test_smb2: expect FILE_CLOSED on invalid handles in SMB2-MULTI-CHANNEL
    
    metze

commit 51a15e9d312f7e73b708f6e63452809c100fbd7a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Feb 29 03:42:52 2012 +0100

    s4:torture/smb2: remove unused var
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/torture/test_smb2.c    |  327 +++++++++++++++++++++++++++++++++++++++-
 source4/torture/smb2/session.c |    1 -
 2 files changed, 324 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index 83d59ff..7ad8f96 100644
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -767,6 +767,7 @@ bool run_smb2_multi_channel(int dummy)
 {
 	struct cli_state *cli1;
 	struct cli_state *cli2;
+	struct cli_state *cli3;
 	NTSTATUS status;
 	bool ok;
 	uint64_t fid_persistent, fid_volatile;
@@ -793,6 +794,11 @@ bool run_smb2_multi_channel(int dummy)
 	}
 	cli2->smb2.pid = 0xFEFF;
 
+	if (!torture_init_connection(&cli3)) {
+		return false;
+	}
+	cli3->smb2.pid = 0xFEFF;
+
 	status = smbXcli_negprot(cli1->conn, cli1->timeout,
 				 PROTOCOL_SMB2_22, PROTOCOL_SMB2_24);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -807,6 +813,13 @@ bool run_smb2_multi_channel(int dummy)
 		return false;
 	}
 
+	status = smbXcli_negprot(cli3->conn, cli3->timeout,
+				 PROTOCOL_SMB2_22, PROTOCOL_SMB2_24);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("smbXcli_negprot returned %s\n", nt_errstr(status));
+		return false;
+	}
+
 	status = cli_session_setup(cli1, username,
 				   password, strlen(password),
 				   password, strlen(password),
@@ -956,6 +969,134 @@ bool run_smb2_multi_channel(int dummy)
 
 	cli2->smb2.tid = cli1->smb2.tid;
 
+	status = smb2cli_session_create_channel(cli3,
+						cli2->smb2.session,
+						cli3->conn,
+						&cli3->smb2.session);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("smb2cli_session_create_channel returned %s\n",
+			nt_errstr(status));
+		return false;
+	}
+
+	status = auth_generic_client_prepare(talloc_tos(), &auth_generic_state);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_client_prepare returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	gensec_want_feature(auth_generic_state->gensec_security,
+			    GENSEC_FEATURE_SESSION_KEY);
+	status = auth_generic_set_username(auth_generic_state, username);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_set_username returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = auth_generic_set_domain(auth_generic_state, workgroup);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_set_domain returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = auth_generic_set_password(auth_generic_state, password);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_set_password returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = auth_generic_client_start(auth_generic_state, GENSEC_OID_NTLMSSP);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_client_start returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, data_blob_null, &in_blob);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+		printf("gensec_update returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	subreq = smb2cli_session_setup_send(talloc_tos(), ev,
+					    cli3->conn,
+					    cli3->timeout,
+					    cli3->smb2.session,
+					    0x01, /* in_flags */
+					    SMB2_CAP_DFS, /* in_capabilities */
+					    0, /* in_channel */
+					    0, /* in_previous_session_id */
+					    &in_blob); /* in_security_buffer */
+	if (subreq == NULL) {
+		printf("smb2cli_session_setup_send() returned NULL\n");
+		return false;
+	}
+
+	ok = tevent_req_poll(subreq, ev);
+	if (!ok) {
+		printf("tevent_req_poll() returned false\n");
+		return false;
+	}
+
+	status = smb2cli_session_setup_recv(subreq, talloc_tos(),
+					    NULL, &out_blob);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+		printf("smb2cli_session_setup_recv returned %s\n",
+			nt_errstr(status));
+		return false;
+	}
+
+	status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, out_blob, &in_blob);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_update returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	subreq = smb2cli_session_setup_send(talloc_tos(), ev,
+					    cli3->conn,
+					    cli3->timeout,
+					    cli3->smb2.session,
+					    0x01, /* in_flags */
+					    SMB2_CAP_DFS, /* in_capabilities */
+					    0, /* in_channel */
+					    0, /* in_previous_session_id */
+					    &in_blob); /* in_security_buffer */
+	if (subreq == NULL) {
+		printf("smb2cli_session_setup_send() returned NULL\n");
+		return false;
+	}
+
+	ok = tevent_req_poll(subreq, ev);
+	if (!ok) {
+		printf("tevent_req_poll() returned false\n");
+		return false;
+	}
+
+	status = smb2cli_session_setup_recv(subreq, talloc_tos(),
+					    &recv_iov, &out_blob);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("smb2cli_session_setup_recv returned %s\n",
+			nt_errstr(status));
+		return false;
+	}
+
+	status = gensec_session_key(auth_generic_state->gensec_security, talloc_tos(),
+				    &channel_session_key);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("gensec_session_key returned %s\n",
+			nt_errstr(status));
+		return false;
+	}
+
+	status = smb2cli_session_set_channel_key(cli3->smb2.session,
+						 channel_session_key,
+						 recv_iov);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("smb2cli_session_set_channel_key %s\n", nt_errstr(status));
+		return false;
+	}
+
+	cli3->smb2.tid = cli2->smb2.tid;
+
 	status = smb2cli_create(cli2, "multi-channel.txt",
 			SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
 			SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
@@ -991,6 +1132,12 @@ bool run_smb2_multi_channel(int dummy)
 		return false;
 	}
 
+	status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("smb2cli_flush returned %s\n", nt_errstr(status));
+		return false;
+	}
+
 	status = smb2cli_read(cli2, 0x10000, 0, fid_persistent,
 			       fid_volatile, 2, 0,
 			       talloc_tos(), &result, &nread);
@@ -1011,20 +1158,194 @@ bool run_smb2_multi_channel(int dummy)
 		return false;
 	}
 
-	status = smb2cli_close(cli1, 0, fid_persistent, fid_volatile);
+	status = auth_generic_client_prepare(talloc_tos(), &auth_generic_state);
 	if (!NT_STATUS_IS_OK(status)) {
-		printf("smb2cli_close returned %s\n", nt_errstr(status));
+		printf("auth_generic_client_prepare returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	gensec_want_feature(auth_generic_state->gensec_security,
+			    GENSEC_FEATURE_SESSION_KEY);
+	status = auth_generic_set_username(auth_generic_state, username);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_set_username returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = auth_generic_set_domain(auth_generic_state, workgroup);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_set_domain returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = auth_generic_set_password(auth_generic_state, password);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_set_password returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = auth_generic_client_start(auth_generic_state, GENSEC_OID_NTLMSSP);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_client_start returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, data_blob_null, &in_blob);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+		printf("gensec_update returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	subreq = smb2cli_session_setup_send(talloc_tos(), ev,
+					    cli3->conn,
+					    cli3->timeout,
+					    cli3->smb2.session,
+					    0x0, /* in_flags */
+					    SMB2_CAP_DFS, /* in_capabilities */
+					    0, /* in_channel */
+					    0, /* in_previous_session_id */
+					    &in_blob); /* in_security_buffer */
+	if (subreq == NULL) {
+		printf("smb2cli_session_setup_send() returned NULL\n");
+		return false;
+	}
+
+	ok = tevent_req_poll(subreq, ev);
+	if (!ok) {
+		printf("tevent_req_poll() returned false\n");
+		return false;
+	}
+
+	status = smb2cli_session_setup_recv(subreq, talloc_tos(),
+					    NULL, &out_blob);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+		printf("smb2cli_session_setup_recv returned %s\n",
+			nt_errstr(status));
+		return false;
+	}
+
+	status = gensec_update(auth_generic_state->gensec_security, talloc_tos(), ev, out_blob, &in_blob);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("auth_generic_update returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("smb2cli_flush returned %s\n", nt_errstr(status));
 		return false;
 	}
 
 	status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("smb2cli_flush returned %s\n", nt_errstr(status));
+		return false;
 	}
 
-	status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+	status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("smb2cli_flush returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = smb2cli_create(cli1, "multi-channel-invalid.txt",
+			SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+			SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+			SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
+			FILE_ATTRIBUTE_NORMAL, /* file_attributes, */
+			FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+			FILE_CREATE, /* create_disposition, */
+			FILE_DELETE_ON_CLOSE, /* create_options, */
+			NULL, /* smb2_create_blobs *blobs */
+			&fid_persistent,
+			&fid_volatile);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+		printf("smb2cli_create %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = smb2cli_create(cli2, "multi-channel-invalid.txt",
+			SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+			SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+			SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
+			FILE_ATTRIBUTE_NORMAL, /* file_attributes, */
+			FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+			FILE_CREATE, /* create_disposition, */
+			FILE_DELETE_ON_CLOSE, /* create_options, */
+			NULL, /* smb2_create_blobs *blobs */
+			&fid_persistent,
+			&fid_volatile);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+		printf("smb2cli_create %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = smb2cli_create(cli3, "multi-channel-invalid.txt",
+			SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */
+			SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */
+			SEC_STD_ALL | SEC_FILE_ALL, /* desired_access, */
+			FILE_ATTRIBUTE_NORMAL, /* file_attributes, */
+			FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */
+			FILE_CREATE, /* create_disposition, */
+			FILE_DELETE_ON_CLOSE, /* create_options, */
+			NULL, /* smb2_create_blobs *blobs */
+			&fid_persistent,
+			&fid_volatile);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_HANDLE)) {
+		printf("smb2cli_create %s\n", nt_errstr(status));
+		return false;
+	}
+
+	subreq = smb2cli_session_setup_send(talloc_tos(), ev,
+					    cli2->conn,
+					    cli2->timeout,
+					    cli2->smb2.session,
+					    0x0, /* in_flags */
+					    SMB2_CAP_DFS, /* in_capabilities */
+					    0, /* in_channel */
+					    0, /* in_previous_session_id */
+					    &in_blob); /* in_security_buffer */
+	if (subreq == NULL) {
+		printf("smb2cli_session_setup_send() returned NULL\n");
+		return false;
+	}
+
+	ok = tevent_req_poll(subreq, ev);
+	if (!ok) {
+		printf("tevent_req_poll() returned false\n");
+		return false;
+	}
+
+	status = smb2cli_session_setup_recv(subreq, talloc_tos(),
+					    &recv_iov, &out_blob);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("smb2cli_session_setup_recv returned %s\n",
+			nt_errstr(status));
+		return false;
+	}
+
+	status = smb2cli_close(cli3, 0, fid_persistent, fid_volatile);
 	if (!NT_STATUS_IS_OK(status)) {
+		printf("smb2cli_close returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = smb2cli_flush(cli3, fid_persistent, fid_volatile);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+		printf("smb2cli_flush returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = smb2cli_flush(cli2, fid_persistent, fid_volatile);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
 		printf("smb2cli_flush returned %s\n", nt_errstr(status));
+		return false;
+	}
+
+	status = smb2cli_flush(cli1, fid_persistent, fid_volatile);
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_CLOSED)) {
+		printf("smb2cli_flush returned %s\n", nt_errstr(status));
+		return false;
 	}
 
 	return true;
diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c
index 11a5a5d..814d017 100644
--- a/source4/torture/smb2/session.c
+++ b/source4/torture/smb2/session.c
@@ -68,7 +68,6 @@ bool test_session_reconnect(struct torture_context *tctx, struct smb2_tree *tree
 	bool ret = true;
 	struct smb2_tree *tree2;
 	union smb_fileinfo qfinfo;
-	uint64_t pos;
 
 	/* Add some random component to the file name. */
 	snprintf(fname, 256, "session_reconnect_%s.dat",


-- 
Samba Shared Repository


More information about the samba-cvs mailing list