X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=fuse_xattrs.c;h=94126dc3fe0158e4c1f0885c256740d1f7afc3da;hb=642d7b81a1afa3f4eb607600c89f923823a03b07;hp=b94182ef836136d65e15259a3a7b8bf5db817189;hpb=3f472567bdd9bc3fbfd99b342ee29b25d5b553be;p=rrq%2Ffuse_xattrs.git diff --git a/fuse_xattrs.c b/fuse_xattrs.c index b94182e..94126dc 100644 --- a/fuse_xattrs.c +++ b/fuse_xattrs.c @@ -1,7 +1,7 @@ /* fuse_xattrs - Add xattrs support using sidecar files - Copyright (C) 2016 Felipe Barriga Richards + Copyright (C) 2016-2017 Felipe Barriga Richards Based on passthrough.c (libfuse example) @@ -17,19 +17,36 @@ #include #include #include +#include +#include +#include + +#ifdef __APPLE__ + #include +#else + #include +#endif -#include #include +#include +#include "fuse_xattrs_config.h" + +#include "xattrs_config.h" #include "utils.h" #include "passthrough.h" - +#include "stringmem.h" #include "binary_storage.h" -#include "const.h" + +struct xattrs_config xattrs_config; static int xmp_setxattr(const char *path, const char *name, const char *value, size_t size, int flags) { - if (get_namespace(name) != USER) { + if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1) { + return -ENOENT; + } + + if (xattrs_config.enable_namespaces == 1 && get_namespace(name) != USER) { debug_print("Only user namespace is supported. name=%s\n", name); return -ENOTSUP; } @@ -42,19 +59,29 @@ static int xmp_setxattr(const char *path, const char *name, const char *value, s return -ENOSPC; } + char *_path = prepend_source_directory(path); + #ifdef DEBUG char *sanitized_value = sanitize_value(value, size); debug_print("path=%s name=%s value=%s size=%zu XATTR_CREATE=%d XATTR_REPLACE=%d\n", - path, name, sanitized_value, size, flags & XATTR_CREATE, flags & XATTR_REPLACE); + _path, name, sanitized_value, size, flags & XATTR_CREATE, flags & XATTR_REPLACE); - free(sanitized_value); + strfree(sanitized_value); #endif - return binary_storage_write_key(path, name, value, size, flags); + + int rtval = binary_storage_write_key(_path, name, value, size, flags); + strfree(_path); + + return rtval; } static int xmp_getxattr(const char *path, const char *name, char *value, size_t size) { - if (get_namespace(name) != USER) { + if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1) { + return -ENOENT; + } + + if (xattrs_config.enable_namespaces == 1 && get_namespace(name) != USER) { debug_print("Only user namespace is supported. name=%s\n", name); return -ENOTSUP; } @@ -63,24 +90,52 @@ static int xmp_getxattr(const char *path, const char *name, char *value, size_t return -ERANGE; } - debug_print("path=%s name=%s size=%zu\n", path, name, size); - return binary_storage_read_key(path, name, value, size); + char *_path = prepend_source_directory(path); + debug_print("path=%s name=%s size=%zu\n", _path, name, size); + int rtval = binary_storage_read_key(_path, name, value, size); + strfree(_path); + + return rtval; } +#ifdef __APPLE__ + static int xmp_setxattr_apple(const char *path, const char *name, const char *value, size_t size, int flags, u_int32_t position) { + assert(position == 0); + return xmp_setxattr(path, name, value, size, flags); + } + + static int xmp_getxattr_apple(const char *path, const char *name, char *value, size_t size, u_int32_t position) { + assert(position == 0); + return xmp_getxattr(path, name, value, size); + } +#endif + static int xmp_listxattr(const char *path, char *list, size_t size) { + if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1) { + return -ENOENT; + } + if (size > XATTR_LIST_MAX) { debug_print("The size of the list of attribute names for this file exceeds the system-imposed limit.\n"); return -E2BIG; } - debug_print("path=%s size=%zu\n", path, size); - return binary_storage_list_keys(path, list, size); + char *_path = prepend_source_directory(path); + debug_print("path=%s size=%zu\n", _path, size); + int rtval = binary_storage_list_keys(_path, list, size); + strfree(_path); + + return rtval; } static int xmp_removexattr(const char *path, const char *name) { - if (get_namespace(name) != USER) { + if (xattrs_config.show_sidecar == 0 && filename_is_sidecar(path) == 1) { + return -ENOENT; + } + + if (xattrs_config.enable_namespaces == 1 && get_namespace(name) != USER) { debug_print("Only user namespace is supported. name=%s\n", name); return -ENOTSUP; } @@ -89,10 +144,16 @@ static int xmp_removexattr(const char *path, const char *name) return -ERANGE; } - debug_print("path=%s name=%s\n", path, name); - return binary_storage_remove_key(path, name); + char *_path = prepend_source_directory(path); + debug_print("path=%s name=%s\n", _path, name); + int rtval = binary_storage_remove_key(_path, name); + strfree(_path); + + return rtval; } +extern int xmp_utimens(const char *path, const struct timespec ts[2]); + static struct fuse_operations xmp_oper = { .getattr = xmp_getattr, .access = xmp_access, @@ -120,15 +181,116 @@ static struct fuse_operations xmp_oper = { #ifdef HAVE_POSIX_FALLOCATE .fallocate = xmp_fallocate, #endif +#ifdef __APPLE__ + .setxattr = xmp_setxattr_apple, + .getxattr = xmp_getxattr_apple, +#else .setxattr = xmp_setxattr, .getxattr = xmp_getxattr, +#endif .listxattr = xmp_listxattr, .removexattr = xmp_removexattr, }; -int main(int argc, char *argv[]) -{ - // TODO: parse options... +/** + * Check if the path is valid. If it's a relative path, + * prepend the working path. Ensure it ends with / + * @param path relative or absolute path to eval. + * @return new string with absolute path + */ +const char *sanitized_source_directory(const char *path) { + char *absolute_path = stralloc( PATH_MAX ); + if ( ( strlen( path ) == 0 ) || + ( realpath( path, absolute_path ) == 0 ) || + ( is_directory( absolute_path ) == -1 ) ) { + return NULL; // Path badness + } + + // Append "/" and allocate new memory for the string + return strdup( strcat( absolute_path, "/" ) ); +} + +enum { + KEY_HELP, + KEY_VERSION, +}; + +#define FUSE_XATTRS_OPT(t, p, v) { t, offsetof(struct xattrs_config, p), v } + +static struct fuse_opt xattrs_opts[] = { + FUSE_XATTRS_OPT("show_sidecar", show_sidecar, 1), + FUSE_XATTRS_OPT("enable_namespaces", enable_namespaces, 1), + FUSE_XATTRS_OPT("sroot=%s", sidecar_dir, 0 ), + + FUSE_OPT_KEY("-V", KEY_VERSION), + FUSE_OPT_KEY("--version", KEY_VERSION), + FUSE_OPT_KEY("-h", KEY_HELP), + FUSE_OPT_KEY("--help", KEY_HELP), + FUSE_OPT_END +}; + +static int xattrs_opt_proc(void *data, const char *arg, int key, + struct fuse_args *outargs) { + (void) data; + switch (key) { + case FUSE_OPT_KEY_NONOPT: + if (!xattrs_config.source_dir) { + xattrs_config.source_dir = sanitized_source_directory(arg); + xattrs_config.source_dir_size = strlen(xattrs_config.source_dir); + return 0; + } + break; + + case KEY_HELP: + fprintf(stderr, + "usage: %s source_dir mountpoint [options]\n" + "\n" + "general options:\n" + " -o opt,[opt...] mount options\n" + " -h --help print help\n" + " -V --version print version\n" + "\n" + "FUSE XATTRS options:\n" + " -o show_sidecar don't hide sidecar files\n" + " -o enable_namespaces enable namespaces checks\n" + " -o sroot=path use other sidecar root path\n" + "\n", outargs->argv[0]); + + fuse_opt_add_arg(outargs, "-ho"); + fuse_main(outargs->argc, outargs->argv, &xmp_oper, NULL); + exit(1); + + case KEY_VERSION: + printf("FUSE_XATTRS version %d.%d\n", FUSE_XATTRS_VERSION_MAJOR, FUSE_XATTRS_VERSION_MINOR); + fuse_opt_add_arg(outargs, "--version"); + fuse_main(outargs->argc, outargs->argv, &xmp_oper, NULL); + exit(0); + } + return 1; +} + + + +int main(int argc, char *argv[]) { + struct fuse_args args = FUSE_ARGS_INIT(argc, argv); + if (fuse_opt_parse(&args, &xattrs_config, xattrs_opts, xattrs_opt_proc) == -1) { + exit(1); + } + + if ( xattrs_config.sidecar_dir ) { + xattrs_config.sidecar_dir = + sanitized_source_directory( xattrs_config.sidecar_dir ); + } + + if (!xattrs_config.source_dir) { + fprintf(stderr, "missing source directory\n"); + fprintf(stderr, "see `%s -h' for usage\n", argv[0]); + exit(1); + } + umask(0); - return fuse_main(argc, argv, &xmp_oper, NULL); + + // disable multi-threading + fuse_opt_add_arg(&args, "-s"); + return fuse_main(args.argc, args.argv, &xmp_oper, NULL); }