sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code
126,446 Commits 60 Branches 1,146 Tags
Commit Graph

57543 Commits

Author SHA1 Message Date
Jeremy Allison
2cff96d9bd s3: VFS: afsacl: Remove afsacl_get_nt_acl_at(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
7da81bfbe5 s3: VFS: shadow_copy2: Remove shadow_copy2_get_nt_acl_at(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
ca5d2c35bc s3 VFS: glusterfs: Remove get_nt_acl_at_fn(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
6ef5ed2309 s3: smbd: open_directory(). Pass down the real parent_dir->fsp to smbd_check_access_rights_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
63fb55cd6c s3: smbd: open_file(). Pass down the real parent_dir->fsp to smbd_check_access_rights_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
699356a245 s3: smbd: smbd_check_access_rights_fsp(). Add dirfsp parameter. 
Pass down to smbd_check_access_rights_sd().

Always pass conn->cwd_fsp for now.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
88881510c7 s3: smbd: smbd_check_access_rights_sd(). Add dirfsp parameter. 
Pass down to parent_override_delete().

Always pass fsp->conn->cwd_fsp for now.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
3b1d2ddc79 s3: smbd: parent_override_delete(). Add dirfsp parameter. 
Pass down to can_delete_file_in_directory().

Always pass conn->cwd_fsp for now.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
7d4f4c8326 s3: smbd: open_directory(). Start passing a real parent dirfsp to smbd_calculate_access_mask_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
eea3a3c156 s3: smbd: open_file_ntcreate(). Start passing a real parent dirfsp to smbd_calculate_access_mask_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
492d105b44 s3: smbd: smbd_calculate_access_mask_fsp(). Add dirfsp parameter. 
Pass this down into smbd_calculate_maximum_allowed_access_fsp().

Currently pass fsp->conn->cwd_fsp everywhere.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
6503bb48ca s3: smbd: smbd_calculate_maximum_allowed_access_fsp(), add parent dirfsp parameter and pass to can_delete_file_in_directory(). 
Pass the same fsp->conn->cwd_fsp parameter to can_delete_file_in_directory()
dirfsp for now.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
eaff826aed s3: smbd: Remove smbd_check_access_rights(). No longer used. 
There are now no more callers of SMB_VFS_GET_NT_ACL_AT().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
dd7c489cd3 s3: smbd: can_delete_file_in_directory(), smbd_check_access_rights() -> smbd_check_access_rights_fsp(). 
Last user of smbd_check_access_rights().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
120ce4f56f s3: smbd: can_delete_file_in_directory(), we no longer need to do the SMB_VFS_STAT() call. 
All code paths must have a valid stat here.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
5e268266f8 s3: smbd: In can_delete_file_in_directory(), get a real parent pathref. 
Not yet used but we will use this to get the parent ACL via handle.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
e370c08269 s3: smbd: In can_delete_file_in_directory(), remove the assertion that dirfsp == conn->cwd_fsp. 
Allow a real parent directory fsp to be passed in. We're not doing this
yet but this will allow more efficient calling from the open code
where we have the parent directory fsp available.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
7e4a9a1e5f s3: smbd: In can_delete_file_in_directory(), move a fast-path exit to before any pathname manipulation. 
If we're root we always return true on a writable share.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
1e90d91b03 s3: smbd: Remove smbd_calculate_maximum_allowed_access(). No longer used. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
f700460c07 s3: smbd: Remove smbd_calculate_access_mask(). No longer used. 
Comment out smbd_calculate_maximum_allowed_access() as it is
a static function and we just removed the only caller.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
99ed769363 s3: smbd: open_fake_file(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
1146fb3826 s3: smbd: open_fake_file(). Move the smbd_calculate_access_mask() check until after we've initialized the file handle. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
18d9282c1e s3: smbd: open_directory(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
5abb0409ff s3: smbd: open_file_ntcreate(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
3293cc8d75 s3: VFS: fruit: fruit_freaddir_attr(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
7c80e0856a s3: smbd: smbd_smb2_create_after_exec(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
07a81f6982 s3: smbd: Change check_base_file_access() to take an fsp as the first argument. 
Internally, change check_base_file_access(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:31 +00:00
Jeremy Allison
03352e981b s3: smbd: Add smbd_calculate_access_mask_fsp(). 
Not yet used but this now uses smbd_calculate_maximum_allowed_access_fsp(),
so uncomment it.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
2c32cb18fc s3: smbd: Add new smbd_calculate_access_mask_fsp() function. 
Commented out as not yet used.

Signed-off-by: Noel Power <noel.power@suse.com>
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
845aaadccd s3: smbd: open_directory(). Cleanup debug message to refer to correct function. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
bed09bc2d6 s3: smbd: open_file(). Cleanup debug message to refer to correct function. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
b8d43466e1 s3: smbd: open_file(). Cleanup debug message to refer to correct function. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
3f61369d15 s3: smbd: open_file(), smbd_check_access_rights() -> smbd_check_access_rights_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
af291abefa s3: smbd: open_directory(), smbd_check_access_rights() -> smbd_check_access_rights_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
11910757c6 s3: smbd: check_base_file_access(), smbd_check_access_rights() -> smbd_check_access_rights_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
26dc10bdb2 s3: smbd: open_file(), smbd_check_access_rights() -> smbd_check_access_rights_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
e5c9cfb042 s3: smbd: In notify, user_can_stat_name_under_fsp(), smbd_check_access_rights -> smbd_check_access_rights_fsp 
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
ff8a41a1c5 s3: VFS: ceph_snapshots: In ceph_snap_gmt_convert_dir(), re-use the directory handle for checking SEC_DIR_LIST permission. 
Similar change to the one that went into shadow_copy2.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
4d0bda46ce s3: VFS: ceph_snapshots: In ceph_snap_enum_snapdir(), re-use the directory handle for checking SEC_DIR_LIST permission. 
Similar change to the one that went into shadow_copy2.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
b3d54e20da s3: VFS: vfs_shadow_copy2: Remove check_access_snapdir(). 
No longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
342a0c92c9 s3: VFS: shadow_copy2: In shadow_copy2_get_shadow_copy_data(), check for DIR_LIST access once we already have a handle on the snap directory. 
There's no sense in opening a synthetic pathref first in
order to check for DIR_LIST access, then open again to
do the SMB_VFS_NEXT_FDOPENDIR() for listing.

Just open once, and check for DIR_LIST access on the
open handle before calling SMB_VFS_NEXT_FDOPENDIR() for listing.

We no longer need check_access_snapdir(), which is
static, so comment it out. Removal next.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
b56fc4b0d8 s3: smbd: Remove can_write_to_file(). Pathname call no longer used. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
0c8f928198 s3: smbd: Remove user_can_write_file(). 
No longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
b5e12fed54 s3: smbd: Remove user_can_read_file(). 
No longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
b98cf3a12d s3: smbd: Remove is_visible_file(). 
No longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
a9be0e26b5 s3: smbd: Remove dptr_normal_ReadDirName(). 
No longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
f47f555012 s3: smbd: Now smbd_dirptr_get_entry() is doing the filtering, dptr_normal_ReadDirName() is an unneeded wrapper for ReadDirName(). 
Just call ReadDirName() directly.

This also means:

is_visible_file()
user_can_read_file()
user_can_write_file()

are no longer used, so commen them out for subsequent removal.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
9f2f4affa0 s3: smbd: Now all callers of is_visible_fsp() pass 'false' for the use_veto parameter, remove it. 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
75f7c11bb3 s3: smbd: Remove is_visible_file() from dptr_ReadDirName(). 
dptr_ReadDirName() is only called from smbd_dirptr_get_entry(),
which is now doing it's own call to is_visible_fsp().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00
Jeremy Allison
a66b7de76a s3: smbd: In smbd_dirptr_get_entry() add a call to is_visible_fsp(). 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
 2021-06-09 13:14:30 +00:00