TheCloud/fuse-overlayfs
1
0
Fork 0
mirror of https://github.com/containers/fuse-overlayfs.git synced 2025-08-04 02:15:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

main: add squash_to_uid and squash_to_gid

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2020-12-22 15:57:23 +01:00
parent bccc81eb8e
commit e5d35c9a01
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuse-overlayfs.h
View File

@ -97,6 +97,8 @@ struct ovl_data
int disable_xattrs; int disable_xattrs;
int xattr_permissions; int xattr_permissions;
int squash_to_root; int squash_to_root;
int squash_to_uid;
int squash_to_gid;
/* current uid/gid*/ /* current uid/gid*/
uid_t uid; uid_t uid;

16
main.c
View File

@ -221,6 +221,10 @@ static const struct fuse_opt ovl_opts[] = {
offsetof (struct ovl_data, xattr_permissions), 0}, offsetof (struct ovl_data, xattr_permissions), 0},
{"squash_to_root", {"squash_to_root",
offsetof (struct ovl_data, squash_to_root), 1}, offsetof (struct ovl_data, squash_to_root), 1},
{"squash_to_uid=%d",
offsetof (struct ovl_data, squash_to_uid), 1},
{"squash_to_gid=%d",
offsetof (struct ovl_data, squash_to_gid), 1},
{"volatile", /* native overlay supports "volatile" to mean fsync=0. */ {"volatile", /* native overlay supports "volatile" to mean fsync=0. */
offsetof (struct ovl_data, fsync), 0}, offsetof (struct ovl_data, fsync), 0},
FUSE_OPT_END FUSE_OPT_END
@ -535,7 +539,7 @@ do_fchown (struct ovl_data *lo, int fd, uid_t uid, gid_t gid, mode_t mode)
ret = write_permission_xattr (lo, fd, NULL, uid, gid, mode); ret = write_permission_xattr (lo, fd, NULL, uid, gid, mode);
else else
ret = fchown (fd, uid, gid); ret = fchown (fd, uid, gid);
return (lo->squash_to_root ? 0 : ret); return (lo->squash_to_root || lo->squash_to_uid != -1 || lo->squash_to_gid != -1) ? 0 : ret;
} }
/* Make sure it is not used anymore. */ /* Make sure it is not used anymore. */
#define fchown ERROR #define fchown ERROR
@ -548,7 +552,7 @@ do_chown (struct ovl_data *lo, const char *path, uid_t uid, gid_t gid, mode_t mo
ret = write_permission_xattr (lo, -1, path, uid, gid, mode); ret = write_permission_xattr (lo, -1, path, uid, gid, mode);
else else
ret = chown (path, uid, gid); ret = chown (path, uid, gid);
return (lo->squash_to_root ? 0 : ret); return (lo->squash_to_root || lo->squash_to_uid != -1 || lo->squash_to_gid != -1) ? 0 : ret;
} }
/* Make sure it is not used anymore. */ /* Make sure it is not used anymore. */
#define chown ERROR #define chown ERROR
@ -569,7 +573,7 @@ do_fchownat (struct ovl_data *lo, int dfd, const char *path, uid_t uid, gid_t gi
} }
else else
ret = fchownat (dfd, path, uid, gid, flags); ret = fchownat (dfd, path, uid, gid, flags);
return (lo->squash_to_root ? 0 : ret); return (lo->squash_to_root || lo->squash_to_uid != -1 || lo->squash_to_gid != -1) ? 0 : ret;
} }
/* Make sure it is not used anymore. */ /* Make sure it is not used anymore. */
#define fchownat ERROR #define fchownat ERROR
@ -812,6 +816,10 @@ find_mapping (unsigned int id, const struct ovl_data *data,
const struct ovl_mapping *mapping = (uid ? data->uid_mappings const struct ovl_mapping *mapping = (uid ? data->uid_mappings
: data->gid_mappings); : data->gid_mappings);
if (direct && uid && data->squash_to_uid != -1)
return data->squash_to_uid;
if (direct && !uid && data->squash_to_gid != -1)
return data->squash_to_gid;
if (direct && data->squash_to_root) if (direct && data->squash_to_root)
return 0; return 0;
@ -5424,6 +5432,8 @@ main (int argc, char *argv[])
.redirect_dir = NULL, .redirect_dir = NULL,
.mountpoint = NULL, .mountpoint = NULL,
.fsync = 1, .fsync = 1,
.squash_to_uid = -1,
.squash_to_gid = -1,
.xattr_permissions = 0, .xattr_permissions = 0,
.timeout = 1000000000.0, .timeout = 1000000000.0,
.timeout_str = NULL, .timeout_str = NULL,