diff options
| -rw-r--r-- | selftest/knownfail.d/dfs_paths | 1 | ||||
| -rwxr-xr-x | selftest/target/Samba3.pm | 7 | ||||
| -rwxr-xr-x | source3/selftest/tests.py | 18 | ||||
| -rw-r--r-- | source3/torture/proto.h | 1 | ||||
| -rw-r--r-- | source3/torture/test_smb2.c | 162 | ||||
| -rw-r--r-- | source3/torture/torture.c | 4 |
6 files changed, 193 insertions, 0 deletions
diff --git a/selftest/knownfail.d/dfs_paths b/selftest/knownfail.d/dfs_paths index ed86a438736..330c17d02a0 100644 --- a/selftest/knownfail.d/dfs_paths +++ b/selftest/knownfail.d/dfs_paths @@ -1,3 +1,4 @@ ^samba3.smbtorture_s3.smb2.SMB2-DFS-PATHS.smbtorture\(fileserver\) +^samba3.smbtorture_s3.smb2.SMB2-NON-DFS-SHARE.smbtorture\(fileserver\) ^samba3.smbtorture_s3.smb1.SMB1-DFS-PATHS.smbtorture\(fileserver\) ^samba3.smbtorture_s3.smb1.SMB1-DFS-SEARCH-PATHS.smbtorture\(fileserver\) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 7c7735f6f4d..800df1f81bd 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -2537,6 +2537,9 @@ sub provision($$) my $msdfs_pathname_share="$shrdir/msdfs_pathname_share"; push(@dirs,$msdfs_pathname_share); + my $non_msdfs_pathname_share="$shrdir/non_msdfs_pathname_share"; + push(@dirs,$non_msdfs_pathname_share); + my $msdfs_deeppath="$msdfs_shrdir/deeppath"; push(@dirs,$msdfs_deeppath); @@ -2968,6 +2971,10 @@ sub provision($$) path = $msdfs_pathname_share msdfs root = yes guest ok = yes +[non-msdfs-pathname-share] + path = $non_msdfs_pathname_share + msdfs root = no + guest ok = yes [hideunread] copy = tmp hide unreadable = yes diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 4b192cf4ad5..b11fedd6c4f 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -247,6 +247,24 @@ plantestsuite("samba3.smbtorture_s3.smb2.SMB2-DFS-PATHS", "-mSMB2"]) # +# SMB2-NON-DFS-SHARE needs to run against a special share non-msdfs-pathname-share +# This is an empty non-DFS share with no links, used merely to test +# incoming DFS pathnames and how they map to local paths. We are testing +# what happens if we set the FLAGS2_DFS_PATHNAMES and send DFS paths +# on a non-DFS share. +# +plantestsuite("samba3.smbtorture_s3.smb2.SMB2-NON-DFS-SHARE", + "fileserver", + [os.path.join(samba3srcdir, + "script/tests/test_smbtorture_s3.sh"), + 'SMB2-NON-DFS-SHARE', + '//$SERVER_IP/non-msdfs-pathname-share', + '$USERNAME', + '$PASSWORD', + smbtorture3, + "-mSMB2"]) + +# # SMB1-DFS-PATHS needs to run against a special share msdfs-pathname-share # This is an empty DFS share with no links, used merely to test # incoming DFS pathnames and how they map to local paths. diff --git a/source3/torture/proto.h b/source3/torture/proto.h index 873543d748c..d5e404eaefa 100644 --- a/source3/torture/proto.h +++ b/source3/torture/proto.h @@ -121,6 +121,7 @@ bool run_smb2_sacl(int dummy); bool run_smb2_quota1(int dummy); bool run_smb2_stream_acl(int dummy); bool run_smb2_dfs_paths(int dummy); +bool run_smb2_non_dfs_share(int dummy); bool run_smb1_dfs_paths(int dummy); bool run_smb1_dfs_search_paths(int dummy); bool run_list_dir_async_test(int dummy); diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c index cdd66d4f449..f6206ce5ffe 100644 --- a/source3/torture/test_smb2.c +++ b/source3/torture/test_smb2.c @@ -4335,3 +4335,165 @@ bool run_smb2_dfs_paths(int dummy) (void)smb2_dfs_delete(cli, "BAD\\BAD\\hlink"); return retval; } + +/* + * Add a test that sends DFS paths and sets the + * SMB2 flag FLAGS2_DFS_PATHNAMES, but to a non-DFS + * share. Windows passes this (it just treats the + * pathnames as non-DFS and ignores the FLAGS2_DFS_PATHNAMES + * bit). + */ + +bool run_smb2_non_dfs_share(int dummy) +{ + struct cli_state *cli = NULL; + NTSTATUS status; + bool dfs_supported = false; + uint64_t fid_persistent = 0; + uint64_t fid_volatile = 0; + bool retval = false; + char *dfs_filename = NULL; + + printf("Starting SMB2-DFS-NON-DFS-SHARE\n"); + + if (!torture_init_connection(&cli)) { + return false; + } + + status = smbXcli_negprot(cli->conn, + cli->timeout, + PROTOCOL_SMB2_02, + PROTOCOL_SMB3_11); + if (!NT_STATUS_IS_OK(status)) { + printf("smbXcli_negprot returned %s\n", nt_errstr(status)); + return false; + } + + status = cli_session_setup_creds(cli, torture_creds); + if (!NT_STATUS_IS_OK(status)) { + printf("cli_session_setup returned %s\n", nt_errstr(status)); + return false; + } + + status = cli_tree_connect(cli, share, "?????", NULL); + if (!NT_STATUS_IS_OK(status)) { + printf("cli_tree_connect returned %s\n", nt_errstr(status)); + return false; + } + + dfs_supported = smbXcli_conn_dfs_supported(cli->conn); + if (!dfs_supported) { + printf("Server %s does not support DFS\n", + smbXcli_conn_remote_name(cli->conn)); + return false; + } + /* Ensure this is *NOT* a DFS share. */ + dfs_supported = smbXcli_tcon_is_dfs_share(cli->smb2.tcon); + if (dfs_supported) { + printf("Share %s is a DFS share.\n", + cli->share); + return false; + } + /* + * Force the share to be DFS, as far as the client + * is concerned. + */ + smb2cli_tcon_set_values(cli->smb2.tcon, + cli->smb2.session, + smb2cli_tcon_current_id(cli->smb2.tcon), + 0, + smb2cli_tcon_flags(cli->smb2.tcon), + smb2cli_tcon_capabilities(cli->smb2.tcon) | + SMB2_SHARE_CAP_DFS, + 0); + + /* Come up with a "valid" SMB2 DFS name. */ + dfs_filename = talloc_asprintf(talloc_tos(), + "%s\\%s\\file", + smbXcli_conn_remote_name(cli->conn), + cli->share); + if (dfs_filename == NULL) { + printf("Out of memory\n"); + return false; + } + + /* Now try create dfs_filename. */ + status = smb2cli_create(cli->conn, + cli->timeout, + cli->smb2.session, + cli->smb2.tcon, + dfs_filename, + SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */ + SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */ + SEC_STD_SYNCHRONIZE| + SEC_STD_DELETE | + SEC_FILE_READ_DATA| + SEC_FILE_READ_ATTRIBUTE, /* desired_access, */ + FILE_ATTRIBUTE_NORMAL, /* file_attributes, */ + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */ + FILE_CREATE, /* create_disposition, */ + 0, /* create_options, */ + NULL, /* smb2_create_blobs *blobs */ + &fid_persistent, + &fid_volatile, + NULL, /* struct smb_create_returns * */ + talloc_tos(), /* mem_ctx. */ + NULL); /* struct smb2_create_blobs * */ + /* + * Should fail with NT_STATUS_OBJECT_PATH_NOT_FOUND, as + * even though we set the FLAGS2_DFS_PATHNAMES the server + * knows this isn't a DFS share and so treats BAD\\BAD as + * part of the filename. + */ + if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_PATH_NOT_FOUND)) { + printf("%s:%d create of %s should fail " + "with NT_STATUS_OBJECT_PATH_NOT_FOUND. Got %s\n", + __FILE__, + __LINE__, + dfs_filename, + nt_errstr(status)); + goto err; + } + /* + * Prove we can still use non-DFS pathnames, even though + * we are setting the FLAGS2_DFS_PATHNAMES in the SMB2 + * request. + */ + status = smb2cli_create(cli->conn, + cli->timeout, + cli->smb2.session, + cli->smb2.tcon, + "file", + SMB2_OPLOCK_LEVEL_NONE, /* oplock_level, */ + SMB2_IMPERSONATION_IMPERSONATION, /* impersonation_level, */ + SEC_STD_SYNCHRONIZE| + SEC_STD_DELETE | + SEC_FILE_READ_DATA| + SEC_FILE_READ_ATTRIBUTE, /* desired_access, */ + FILE_ATTRIBUTE_NORMAL, /* file_attributes, */ + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access, */ + FILE_CREATE, /* create_disposition, */ + 0, /* create_options, */ + NULL, /* smb2_create_blobs *blobs */ + &fid_persistent, + &fid_volatile, + NULL, /* struct smb_create_returns * */ + talloc_tos(), /* mem_ctx. */ + NULL); /* struct smb2_create_blobs * */ + if (!NT_STATUS_IS_OK(status)) { + printf("%s:%d smb2cli_create on %s returned %s\n", + __FILE__, + __LINE__, + "file", + nt_errstr(status)); + return false; + } + + retval = true; + + err: + + (void)smb2_dfs_delete(cli, dfs_filename); + (void)smb2_dfs_delete(cli, "file"); + return retval; +} diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 8e496320dda..75d0248d773 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -15364,6 +15364,10 @@ static struct { .fn = run_smb2_dfs_paths, }, { + .name = "SMB2-NON-DFS-SHARE", + .fn = run_smb2_non_dfs_share, + }, + { .name = "SMB1-DFS-PATHS", .fn = run_smb1_dfs_paths, }, |