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

bfs_fuse: Allow non-root to mount BFS partitions.

Browse Source 
* Most FUSE options are only allowed for root, so don't add these options
  when user is not root.
* Fixes ticket #8254.

Signed-off-by: Augustin Cavalier <waddlesplash@gmail.com>
Coding style looks OK to me and there are multiple comments that
it works, so just merging it.
This commit is contained in:
Jeroen Oortwijn 2012-03-31 21:14:19 +02:00 committed by Augustin Cavalier
parent 73e180c9b9
commit ef9b129675
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/tools/fs_shell/fuse.cpp
View File

@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <syslog.h>
#include <unistd.h>
#include "fssh.h"
@ -479,40 +480,48 @@ fssh_fuse_session(const char* device, const char* mntPoint, const char* fsName,
if (ret != 0)
return ret;
char* fuseOptions = NULL;
if (getuid() == 0 && geteuid() == 0 && getgid() == 0 && getegid() == 0) {
// only add FUSE options when user is root
// default FUSE options
char* fsNameOption = NULL;
if (fuse_opt_add_opt(&fuseOptions, "allow_other") < 0
|| asprintf(&fsNameOption, "fsname=%s", device) < 0
|| fuse_opt_add_opt(&fuseOptions, fsNameOption) < 0) {
unmount_volume(device, mntPoint);
return 1;
}
char* fuseOptions = NULL;
struct stat sbuf;
if ((stat(device, &sbuf) == 0) && S_ISBLK(sbuf.st_mode)) {
int blkSize = 512;
fssh_dev_t volumeID = get_volume_id();
if (volumeID >= 0) {
fssh_fs_info info;
if (_kern_read_fs_info(volumeID, &info) == FSSH_B_OK)
blkSize = info.block_size;
// default FUSE options
char* fsNameOption = NULL;
if (fuse_opt_add_opt(&fuseOptions, "allow_other") < 0
|| asprintf(&fsNameOption, "fsname=%s", device) < 0
|| fuse_opt_add_opt(&fuseOptions, fsNameOption) < 0) {
unmount_volume(device, mntPoint);
return 1;
}
char* blkSizeOption = NULL;
if (fuse_opt_add_opt(&fuseOptions, "blkdev") < 0
|| asprintf(&blkSizeOption, "blksize=%i", blkSize) < 0
|| fuse_opt_add_opt(&fuseOptions, blkSizeOption) < 0) {
struct stat sbuf;
if ((stat(device, &sbuf) == 0) && S_ISBLK(sbuf.st_mode)) {
int blkSize = 512;
fssh_dev_t volumeID = get_volume_id();
if (volumeID >= 0) {
fssh_fs_info info;
if (_kern_read_fs_info(volumeID, &info) == FSSH_B_OK)
blkSize = info.block_size;
}
char* blkSizeOption = NULL;
if (fuse_opt_add_opt(&fuseOptions, "blkdev") < 0
|| asprintf(&blkSizeOption, "blksize=%i", blkSize) < 0
|| fuse_opt_add_opt(&fuseOptions, blkSizeOption) < 0) {
unmount_volume(device, mntPoint);
return 1;
}
}
if (fuse_opt_add_arg(&fuseArgs, "-o") < 0
|| fuse_opt_add_arg(&fuseArgs, fuseOptions) < 0) {
unmount_volume(device, mntPoint);
return 1;
}
}
// Run the fuse_main() loop.
if (fuse_opt_add_arg(&fuseArgs, "-s") < 0
|| fuse_opt_add_arg(&fuseArgs, "-o") < 0
|| fuse_opt_add_arg(&fuseArgs, fuseOptions) < 0) {
if (fuse_opt_add_arg(&fuseArgs, "-s") < 0) {
unmount_volume(device, mntPoint);
return 1;
}