Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs_shell: Added missing new permission check function.

Browse Source 
* Fixes the build.
This commit is contained in:
Axel Dörfler 2014-10-25 19:31:15 +02:00
parent 5a95af70a2
commit 50d274f7f9
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/private/fs_shell/fssh_api_wrapper.h
View File

@ -938,6 +938,7 @@
#define unremove_vnode fssh_unremove_vnode #define unremove_vnode fssh_unremove_vnode
#define get_vnode_removed fssh_get_vnode_removed #define get_vnode_removed fssh_get_vnode_removed
#define volume_for_vnode fssh_volume_for_vnode #define volume_for_vnode fssh_volume_for_vnode
#define check_access_permissions fssh_check_access_permissions
#define read_pages fssh_read_pages #define read_pages fssh_read_pages
#define write_pages fssh_write_pages #define write_pages fssh_write_pages
#define read_file_io_vec_pages fssh_read_file_io_vec_pages #define read_file_io_vec_pages fssh_read_file_io_vec_pages

4
headers/private/fs_shell/fssh_fs_interface.h
View File

@ -361,7 +361,9 @@ extern fssh_status_t fssh_unremove_vnode(fssh_fs_volume *volume,
extern fssh_status_t fssh_get_vnode_removed(fssh_fs_volume *volume, extern fssh_status_t fssh_get_vnode_removed(fssh_fs_volume *volume,
fssh_vnode_id vnodeID, bool* removed); fssh_vnode_id vnodeID, bool* removed);
extern fssh_fs_volume* fssh_volume_for_vnode(fssh_fs_vnode *vnode); extern fssh_fs_volume* fssh_volume_for_vnode(fssh_fs_vnode *vnode);
extern fssh_status_t fssh_check_access_permissions(int accessMode,
fssh_mode_t mode, fssh_gid_t nodeGroupID,
fssh_uid_t nodeUserID);
extern fssh_status_t fssh_read_pages(int fd, fssh_off_t pos, extern fssh_status_t fssh_read_pages(int fd, fssh_off_t pos,
const struct fssh_iovec *vecs, fssh_size_t count, const struct fssh_iovec *vecs, fssh_size_t count,

36
src/tools/fs_shell/vfs.cpp
View File

@ -2128,6 +2128,42 @@ fssh_volume_for_vnode(fssh_fs_vnode *_vnode)
} }
extern "C" fssh_status_t
fssh_check_access_permissions(int accessMode, fssh_mode_t mode,
fssh_gid_t nodeGroupID, fssh_uid_t nodeUserID)
{
// get node permissions
int userPermissions = (mode & FSSH_S_IRWXU) >> 6;
int groupPermissions = (mode & FSSH_S_IRWXG) >> 3;
int otherPermissions = mode & FSSH_S_IRWXO;
// get the node permissions for this uid/gid
int permissions = 0;
fssh_uid_t uid = fssh_geteuid();
if (uid == 0) {
// user is root
// root has always read/write permission, but at least one of the
// X bits must be set for execute permission
permissions = userPermissions | groupPermissions | otherPermissions
| FSSH_S_IROTH | FSSH_S_IWOTH;
if (FSSH_S_ISDIR(mode))
permissions |= FSSH_S_IXOTH;
} else if (uid == nodeUserID) {
// user is node owner
permissions = userPermissions;
} else if (fssh_getegid() == nodeGroupID) {
// user is in owning group
permissions = groupPermissions;
} else {
// user is one of the others
permissions = otherPermissions;
}
return (accessMode & ~permissions) == 0 ? FSSH_B_OK : FSSH_B_NOT_ALLOWED;
}
//! Works directly on the host's file system //! Works directly on the host's file system
extern "C" fssh_status_t extern "C" fssh_status_t
fssh_read_pages(int fd, fssh_off_t pos, const fssh_iovec *vecs, fssh_read_pages(int fd, fssh_off_t pos, const fssh_iovec *vecs,