X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/16edf86595a5a990a942fa045dfb523dae1fe6cb..8e41b68e8f975c02a5d9281be780ba5d1a385107:/xattrs.c diff --git a/xattrs.c b/xattrs.c index 793ebbfc..595ec422 100644 --- a/xattrs.c +++ b/xattrs.c @@ -6,8 +6,9 @@ * Copyright (C) 2006, 2007 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,8 +16,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ #include "rsync.h" @@ -30,6 +30,7 @@ extern int am_sender; extern int am_generator; extern int read_only; extern int list_only; +extern int preserve_xattrs; extern int checksum_seed; #define RSYNC_XAL_INITIAL 5 @@ -53,11 +54,15 @@ extern int checksum_seed; #define SPRE_LEN ((int)sizeof SYSTEM_PREFIX - 1) #ifdef HAVE_LINUX_XATTRS -#define RPRE_LEN 0 +#define MIGHT_NEED_RPRE (am_root < 0) +#define RSYNC_PREFIX USER_PREFIX "rsync." #else +#define MIGHT_NEED_RPRE am_root #define RSYNC_PREFIX "rsync." -#define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1) #endif +#define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1) + +#define XSTAT_ATTR RSYNC_PREFIX "%stat" typedef struct { char *datum, *name; @@ -218,6 +223,11 @@ static int rsync_xal_get(const char *fname, item_list *xalp) continue; #endif + /* No rsync.%FOO attributes are copied w/o 2 -X options. */ + if (preserve_xattrs < 2 && name_len > RPRE_LEN + && name[RPRE_LEN] == '%' && HAS_PREFIX(name, RSYNC_PREFIX)) + continue; + datum_len = name_len; /* Pass extra size to get_xattr_data() */ if (!(ptr = get_xattr_data(fname, name, &datum_len, 0))) return -1; @@ -236,6 +246,14 @@ static int rsync_xal_get(const char *fname, item_list *xalp) } else name_offset = datum_len; +#ifdef HAVE_LINUX_XATTRS + if (am_root < 0 && name_len > RPRE_LEN + && HAS_PREFIX(name, RSYNC_PREFIX)) { + name += RPRE_LEN; + name_len -= RPRE_LEN; + } +#endif + rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL); rxas->name = ptr + name_offset; memcpy(rxas->name, name, name_len); @@ -316,28 +334,28 @@ int send_xattr(statx *sxp, int f) int ndx = find_matching_xattr(sxp->xattr); /* Send 0 (-1 + 1) to indicate that literal xattr data follows. */ - write_abbrevint(f, ndx + 1); + write_varint(f, ndx + 1); if (ndx < 0) { rsync_xa *rxa; int count = sxp->xattr->count; - write_abbrevint(f, count); + write_varint(f, count); for (rxa = sxp->xattr->items; count--; rxa++) { #ifdef HAVE_LINUX_XATTRS - write_abbrevint(f, rxa->name_len); - write_abbrevint(f, rxa->datum_len); + write_varint(f, rxa->name_len); + write_varint(f, rxa->datum_len); write_buf(f, rxa->name, rxa->name_len); #else /* We strip the rsync prefix from disguised namespaces * and put everything else in the user namespace. */ if (HAS_PREFIX(rxa->name, RSYNC_PREFIX) && rxa->name[RPRE_LEN] != '%') { - write_abbrevint(f, rxa->name_len - RPRE_LEN); - write_abbrevint(f, rxa->datum_len); + write_varint(f, rxa->name_len - RPRE_LEN); + write_varint(f, rxa->datum_len); write_buf(f, rxa->name + RPRE_LEN, rxa->name_len - RPRE_LEN); } else { - write_abbrevint(f, rxa->name_len + UPRE_LEN); - write_abbrevint(f, rxa->datum_len); + write_varint(f, rxa->name_len + UPRE_LEN); + write_varint(f, rxa->datum_len); write_buf(f, USER_PREFIX, UPRE_LEN); write_buf(f, rxa->name, rxa->name_len); } @@ -454,7 +472,7 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out) /* Flag that we handled this abbreviated item. */ rxa->datum[0] = XSTATE_DONE; - write_abbrevint(f_out, j - prior_req); + write_varint(f_out, j - prior_req); prior_req = j; if (fname) { @@ -465,7 +483,7 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out) if (!(ptr = get_xattr_data(fname, rxa->name, &len, 0))) continue; - write_abbrevint(f_out, len); /* length might have changed! */ + write_varint(f_out, len); /* length might have changed! */ write_buf(f_out, ptr, len); free(ptr); } @@ -515,7 +533,7 @@ void recv_xattr_request(struct file_struct *file, int f_in) cnt = lst->count; rxa = lst->items; rxa -= 1; - while ((rel_pos = read_abbrevint(f_in)) != 0) { + while ((rel_pos = read_varint(f_in)) != 0) { rxa += rel_pos; cnt -= rel_pos; if (cnt < 0 || rxa->datum_len <= MAX_FULL_DATUM @@ -530,7 +548,7 @@ void recv_xattr_request(struct file_struct *file, int f_in) } old_datum = rxa->datum; - rxa->datum_len = read_abbrevint(f_in); + rxa->datum_len = read_varint(f_in); if (rxa->name_len + rxa->datum_len < rxa->name_len) out_of_memory("recv_xattr_request"); /* overflow */ @@ -552,7 +570,7 @@ void receive_xattr(struct file_struct *file, int f) { static item_list temp_xattr = EMPTY_ITEM_LIST; int count; - int ndx = read_abbrevint(f); + int ndx = read_varint(f); if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) { rprintf(FERROR, "receive_xattr: xa index %d out of" @@ -565,7 +583,7 @@ void receive_xattr(struct file_struct *file, int f) return; } - if ((count = read_abbrevint(f)) != 0) { + if ((count = read_varint(f)) != 0) { (void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count); temp_xattr.count = 0; } @@ -573,16 +591,12 @@ void receive_xattr(struct file_struct *file, int f) while (count--) { char *ptr, *name; rsync_xa *rxa; - size_t name_len = read_abbrevint(f); - size_t datum_len = read_abbrevint(f); + size_t name_len = read_varint(f); + size_t datum_len = read_varint(f); size_t dget_len = datum_len > MAX_FULL_DATUM ? 1 + MAX_DIGEST_LEN : datum_len; -#ifdef HAVE_LINUX_XATTRS - size_t extra_len = 0; -#else - size_t extra_len = am_root ? RPRE_LEN : 0; + size_t extra_len = MIGHT_NEED_RPRE ? RPRE_LEN : 0; if (dget_len + extra_len < dget_len) out_of_memory("receive_xattr"); /* overflow */ -#endif if (dget_len + extra_len + name_len < dget_len) out_of_memory("receive_xattr"); /* overflow */ ptr = new_array(char, dget_len + extra_len + name_len); @@ -598,9 +612,14 @@ void receive_xattr(struct file_struct *file, int f) } #ifdef HAVE_LINUX_XATTRS /* Non-root can only save the user namespace. */ - if (!am_root && !HAS_PREFIX(name, USER_PREFIX)) { - free(ptr); - continue; + if (am_root <= 0 && !HAS_PREFIX(name, USER_PREFIX)) { + if (!am_root) { + free(ptr); + continue; + } + name -= RPRE_LEN; + name_len += RPRE_LEN; + memcpy(name, RSYNC_PREFIX, RPRE_LEN); } #else /* This OS only has a user namespace, so we either @@ -618,6 +637,12 @@ void receive_xattr(struct file_struct *file, int f) continue; } #endif + /* No rsync.%FOO attributes are copied w/o 2 -X options. */ + if (preserve_xattrs < 2 && name_len > RPRE_LEN + && name[RPRE_LEN] == '%' && HAS_PREFIX(name, RSYNC_PREFIX)) { + free(ptr); + continue; + } rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, 1); rxa->name = name; rxa->datum = ptr; @@ -772,4 +797,150 @@ int set_xattr(const char *fname, const struct file_struct *file, return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp); } +int get_stat_xattr(const char *fname, int fd, STRUCT_STAT *fst, STRUCT_STAT *xst) +{ + int mode, rdev_major, rdev_minor, uid, gid, len; + char buf[256]; + + if (am_root >= 0 || IS_DEVICE(fst->st_mode) || IS_SPECIAL(fst->st_mode)) + return -1; + + if (xst) + *xst = *fst; + else + xst = fst; + if (fname) { + fd = -1; + len = sys_lgetxattr(fname, XSTAT_ATTR, buf, sizeof buf - 1); + } else { + fname = "fd"; + len = sys_fgetxattr(fd, XSTAT_ATTR, buf, sizeof buf - 1); + } + if (len >= (int)sizeof buf) { + len = -1; + errno = ERANGE; + } + if (len < 0) { + if (errno == ENOTSUP || errno == ENOATTR) + return -1; + if (errno == EPERM && S_ISLNK(fst->st_mode)) { + xst->st_uid = 0; + xst->st_gid = 0; + return 0; + } + rsyserr(FERROR, errno, "failed to read xattr %s for %s", + XSTAT_ATTR, full_fname(fname)); + return -1; + } + buf[len] = '\0'; + + if (sscanf(buf, "%o %d,%d %d:%d", + &mode, &rdev_major, &rdev_minor, &uid, &gid) != 5) { + rprintf(FERROR, "Corrupt %s xattr attached to %s: \"%s\"\n", + XSTAT_ATTR, full_fname(fname), buf); + exit_cleanup(RERR_FILEIO); + } + + xst->st_mode = from_wire_mode(mode); + xst->st_rdev = MAKEDEV(rdev_major, rdev_minor); + xst->st_uid = uid; + xst->st_gid = gid; + + return 0; +} + +int set_stat_xattr(const char *fname, struct file_struct *file) +{ + STRUCT_STAT fst, xst; + dev_t rdev; + mode_t mode, fmode; + + if (dry_run) + return 0; + + if (read_only || list_only) { + rsyserr(FERROR, EROFS, "failed to write xattr %s for %s", + XSTAT_ATTR, full_fname(fname)); + return -1; + } + + if (x_lstat(fname, &fst, &xst) < 0) { + rsyserr(FERROR, errno, "failed to re-stat %s", + full_fname(fname)); + return -1; + } + + fst.st_mode &= (_S_IFMT | CHMOD_BITS); + fmode = file->mode & (_S_IFMT | CHMOD_BITS); + + if (IS_DEVICE(fmode) || IS_SPECIAL(fmode)) { + uint32 *devp = F_RDEV_P(file); + rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)); + } else + rdev = 0; + + /* Dump the special permissions and enable full owner access. */ + mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS) + | (S_ISDIR(fst.st_mode) ? 0700 : 0600); + if (fst.st_mode != mode) + do_chmod(fname, mode); + if (!IS_DEVICE(fst.st_mode) && !IS_SPECIAL(fst.st_mode)) + fst.st_rdev = 0; /* just in case */ + + if (mode == fmode && fst.st_rdev == rdev + && fst.st_uid == F_OWNER(file) && fst.st_gid == F_GROUP(file)) { + /* xst.st_mode will be 0 if there's no current stat xattr */ + if (xst.st_mode && sys_lremovexattr(fname, XSTAT_ATTR) < 0) { + rsyserr(FERROR, errno, + "delete of stat xattr failed for %s", + full_fname(fname)); + return -1; + } + return 0; + } + + if (xst.st_mode != fmode || xst.st_rdev != rdev + || xst.st_uid != F_OWNER(file) || xst.st_gid != F_GROUP(file)) { + char buf[256]; + int len = snprintf(buf, sizeof buf, "%o %u,%u %u:%u", + to_wire_mode(fmode), + (int)major(rdev), (int)minor(rdev), + F_OWNER(file), F_GROUP(file)); + if (sys_lsetxattr(fname, XSTAT_ATTR, buf, len) < 0) { + if (errno == EPERM && S_ISLNK(fst.st_mode)) + return 0; + rsyserr(FERROR, errno, + "failed to write xattr %s for %s", + XSTAT_ATTR, full_fname(fname)); + return -1; + } + } + + return 0; +} + +int x_stat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst) +{ + int ret = do_stat(fname, fst); + if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst) + xst->st_mode = 0; + return ret; +} + +int x_lstat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst) +{ + int ret = do_lstat(fname, fst); + if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst) + xst->st_mode = 0; + return ret; +} + +int x_fstat(int fd, STRUCT_STAT *fst, STRUCT_STAT *xst) +{ + int ret = do_fstat(fd, fst); + if ((ret < 0 || get_stat_xattr(NULL, fd, fst, xst) < 0) && xst) + xst->st_mode = 0; + return ret; +} + #endif /* SUPPORT_XATTRS */