X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/16edf86595a5a990a942fa045dfb523dae1fe6cb..e9489cd6cb380b30727bd3d074eacc59abca080e:/rsync.c diff --git a/rsync.c b/rsync.c index 7e97a930..9921da04 100644 --- a/rsync.c +++ b/rsync.c @@ -3,11 +3,12 @@ * * Copyright (C) 1996 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras - * Copyright (C) 2003-2007 Wayne Davison + * Copyright (C) 2003-2008 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,14 +16,11 @@ * 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" -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H -#include -#endif +#include "ifuncs.h" #if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET #include #elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO @@ -36,7 +34,6 @@ extern int preserve_xattrs; extern int preserve_perms; extern int preserve_executability; extern int preserve_times; -extern int omit_dir_times; extern int am_root; extern int am_server; extern int am_sender; @@ -44,8 +41,8 @@ extern int am_generator; extern int am_starting_up; extern int allow_8bit_chars; extern int protocol_version; -extern int preserve_uid; -extern int preserve_gid; +extern int uid_ndx; +extern int gid_ndx; extern int inc_recurse; extern int inplace; extern int flist_eof; @@ -53,25 +50,36 @@ extern int keep_dirlinks; extern int make_backups; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct chmod_mode_struct *daemon_chmod_modes; +#ifdef ICONV_OPTION +extern char *iconv_opt; +#endif -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#ifdef ICONV_CONST iconv_t ic_chck = (iconv_t)-1; +# ifdef ICONV_OPTION +iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1; +# endif static const char *default_charset(void) { -#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET +# if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET return locale_charset(); -#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO +# elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO return nl_langinfo(CODESET); -#else +# else return ""; /* Works with (at the very least) gnu iconv... */ -#endif +# endif } -void setup_iconv() +void setup_iconv(void) { + const char *defset = default_charset(); +# ifdef ICONV_OPTION + const char *charset; + char *cp; +# endif + if (!am_server && !allow_8bit_chars) { - const char *defset = default_charset(); /* It's OK if this fails... */ ic_chck = iconv_open(defset, defset); @@ -89,16 +97,157 @@ void setup_iconv() } } } + +# ifdef ICONV_OPTION + if (!iconv_opt) + return; + + if ((cp = strchr(iconv_opt, ',')) != NULL) { + if (am_server) /* A local transfer needs this. */ + iconv_opt = cp + 1; + else + *cp = '\0'; + } + + if (!*iconv_opt || (*iconv_opt == '.' && iconv_opt[1] == '\0')) + charset = defset; + else + charset = iconv_opt; + + if ((ic_send = iconv_open(UTF8_CHARSET, charset)) == (iconv_t)-1) { + rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n", + UTF8_CHARSET, charset); + exit_cleanup(RERR_UNSUPPORTED); + } + + if ((ic_recv = iconv_open(charset, UTF8_CHARSET)) == (iconv_t)-1) { + rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n", + charset, UTF8_CHARSET); + exit_cleanup(RERR_UNSUPPORTED); + } + + if (verbose > 1) { + rprintf(FINFO, "%s charset: %s\n", + am_server ? "server" : "client", + *charset ? charset : "[LOCALE]"); + } +# endif +} + +/* This function converts the characters in the "in" xbuf into characters + * in the "out" xbuf. The "len" of the "in" xbuf is used starting from its + * "pos". The "size" of the "out" xbuf restricts how many characters can be + * stored, starting at its "pos+len" position. Note that the last byte of + * the buffer is never used, which reserves space for a terminating '\0'. + * We return a 0 on success or a -1 on error. An error also sets errno to + * E2BIG, EILSEQ, or EINVAL (see below); otherwise errno will be set to 0. + * The "in" xbuf is altered to update "pos" and "len". The "out" xbuf has + * data appended, and its "len" incremented. If ICB_EXPAND_OUT is set in + * "flags", the "out" xbuf will also be allocated if empty, and expanded if + * too small (so E2BIG will not be returned). If ICB_INCLUDE_BAD is set in + * "flags", any badly-encoded chars are included verbatim in the "out" xbuf, + * so EILSEQ will not be returned. Likewise for ICB_INCLUDE_INCOMPLETE with + * respect to an incomplete multi-byte char at the end, which ensures that + * EINVAL is not returned. Anytime "in.pos" is 0 we will reset the iconv() + * state prior to processing the characters. */ +int iconvbufs(iconv_t ic, xbuf *in, xbuf *out, int flags) +{ + ICONV_CONST char *ibuf; + size_t icnt, ocnt; + char *obuf; + + if (!out->size && flags & ICB_EXPAND_OUT) + alloc_xbuf(out, 1024); + + if (!in->pos) + iconv(ic, NULL, 0, NULL, 0); + + ibuf = in->buf + in->pos; + icnt = in->len; + + obuf = out->buf + (out->pos + out->len); + ocnt = out->size - (out->pos + out->len) - 1; + + while (icnt) { + while (iconv(ic, &ibuf, &icnt, &obuf, &ocnt) == (size_t)-1) { + if (errno == EINTR) + continue; + if (errno == EINVAL) { + if (!(flags & ICB_INCLUDE_INCOMPLETE)) + goto finish; + } else if (errno == EILSEQ) { + if (!(flags & ICB_INCLUDE_BAD)) + goto finish; + } else { + size_t opos = obuf - out->buf; + if (!(flags & ICB_EXPAND_OUT)) { + errno = E2BIG; + goto finish; + } + realloc_xbuf(out, out->size + 1024); + obuf = out->buf + opos; + ocnt += 1024; + continue; + } + *obuf++ = *ibuf++; + ocnt--, icnt--; + } + } + + errno = 0; + + finish: + in->len = icnt; + in->pos = ibuf - in->buf; + out->len = obuf - out->buf - out->pos; + + return errno ? -1 : 0; } #endif +void send_protected_args(int fd, char *args[]) +{ + int i; +#ifdef ICONV_OPTION + int convert = ic_send != (iconv_t)-1; + xbuf outbuf, inbuf; + + if (convert) + alloc_xbuf(&outbuf, 1024); +#endif + + for (i = 0; args[i]; i++) {} /* find first NULL */ + args[i] = "rsync"; /* set a new arg0 */ + if (verbose > 1) + print_child_argv("protected args:", args + i + 1); + do { +#ifdef ICONV_OPTION + if (convert) { + INIT_XBUF_STRLEN(inbuf, args[i]); + iconvbufs(ic_send, &inbuf, &outbuf, + ICB_EXPAND_OUT | ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE); + outbuf.buf[outbuf.len] = '\0'; + write_buf(fd, outbuf.buf, outbuf.len + 1); + outbuf.len = 0; + } else +#endif + write_buf(fd, args[i], strlen(args[i]) + 1); + } while (args[++i]); + write_byte(fd, 0); + +#ifdef ICONV_OPTION + if (convert) + free(outbuf.buf); +#endif +} + int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr, char *buf, int *len_ptr) { int len, iflags = 0; struct file_list *flist; uchar fnamecmp_type = FNAMECMP_FNAME; - int verbose_save, ndx; + int ndx, save_verbose = verbose; read_loop: while (1) { @@ -112,29 +261,31 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr, goto invalid_ndx; if (ndx == NDX_FLIST_EOF) { flist_eof = 1; - send_msg(MSG_FLIST_EOF, "", 0); + send_msg(MSG_FLIST_EOF, "", 0, 0); continue; } ndx = NDX_FLIST_OFFSET - ndx; - if (ndx < 0 || ndx >= dir_flist->count) { + if (ndx < 0 || ndx >= dir_flist->used) { ndx = NDX_FLIST_OFFSET - ndx; rprintf(FERROR, - "Invalid dir index: %d (%d - %d)\n", - ndx, NDX_FLIST_OFFSET, - NDX_FLIST_OFFSET - dir_flist->count); + "[%s] Invalid dir index: %d (%d - %d)\n", + who_am_i(), ndx, NDX_FLIST_OFFSET, + NDX_FLIST_OFFSET - dir_flist->used + 1); exit_cleanup(RERR_PROTOCOL); } - verbose_save = verbose; - verbose = 0; /* TODO allow verbose messages? */ /* Send everything read from f_in to msg_fd_out. */ + if (verbose > 3) { + rprintf(FINFO, "[%s] receiving flist for dir %d\n", + who_am_i(), ndx); + } + verbose = 0; send_msg_int(MSG_FLIST, ndx); start_flist_forward(f_in); flist = recv_file_list(f_in); flist->parent_ndx = ndx; stop_flist_forward(); - - verbose = verbose_save; + verbose = save_verbose; } iflags = protocol_version >= 29 ? read_shortint(f_in) @@ -142,19 +293,20 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr, /* Honor the old-style keep-alive indicator. */ if (protocol_version < 30 - && ndx == cur_flist->count && iflags == ITEM_IS_NEW) { + && ndx == cur_flist->used && iflags == ITEM_IS_NEW) { if (am_sender) maybe_send_keepalive(); goto read_loop; } if (!(flist = flist_for_ndx(ndx))) { + int start, used; invalid_ndx: + start = first_flist ? first_flist->ndx_start : 0; + used = first_flist ? first_flist->used : 0; rprintf(FERROR, "Invalid file index: %d (%d - %d) with iflags %x [%s]\n", - ndx, first_flist->ndx_start + first_flist->ndx_start, - first_flist->prev->ndx_start + first_flist->ndx_start - + first_flist->prev->count - 1, iflags, who_am_i()); + ndx, start - 1, start + used -1, iflags, who_am_i()); exit_cleanup(RERR_PROTOCOL); } cur_flist = flist; @@ -174,7 +326,7 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr, if (iflags & ITEM_TRANSFER) { int i = ndx - cur_flist->ndx_start; - if (!S_ISREG(cur_flist->files[i]->mode)) { + if (i < 0 || !S_ISREG(cur_flist->files[i]->mode)) { rprintf(FERROR, "received request to transfer non-regular file: %d [%s]\n", ndx, who_am_i()); @@ -222,19 +374,20 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, return new_mode; } -int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp, +int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, const char *fnamecmp, int flags) { int updated = 0; - statx sx2; + stat_x sx2; int change_uid, change_gid; mode_t new_mode = file->mode; + int inherit; if (!sxp) { if (dry_run) return 1; if (link_stat(fname, &sx2.st, 0) < 0) { - rsyserr(FERROR, errno, "stat %s failed", + rsyserr(FERROR_XFER, errno, "stat %s failed", full_fname(fname)); return 0; } @@ -244,85 +397,91 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp, #ifdef SUPPORT_XATTRS sx2.xattr = NULL; #endif - if (!preserve_perms && S_ISDIR(new_mode) - && sx2.st.st_mode & S_ISGID) { - /* We just created this directory and its setgid - * bit is on, so make sure it stays on. */ - new_mode |= S_ISGID; - } sxp = &sx2; + inherit = !preserve_perms; + } else + inherit = !preserve_perms && file->flags & FLAG_DIR_CREATED; + + if (inherit && S_ISDIR(new_mode) && sxp->st.st_mode & S_ISGID) { + /* We just created this directory and its setgid + * bit is on, so make sure it stays on. */ + new_mode |= S_ISGID; } + if (daemon_chmod_modes && !S_ISLNK(new_mode)) + new_mode = tweak_mode(new_mode, daemon_chmod_modes); + #ifdef SUPPORT_ACLS if (preserve_acls && !S_ISLNK(file->mode) && !ACL_READY(*sxp)) get_acl(fname, sxp); #endif #ifdef SUPPORT_XATTRS + if (am_root < 0) + set_stat_xattr(fname, file, new_mode); if (preserve_xattrs && fnamecmp) set_xattr(fname, file, fnamecmp, sxp); #endif - if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times)) + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1)) flags |= ATTRS_SKIP_MTIME; if (!(flags & ATTRS_SKIP_MTIME) && cmp_time(sxp->st.st_mtime, file->modtime) != 0) { int ret = set_modtime(fname, file->modtime, sxp->st.st_mode); if (ret < 0) { - rsyserr(FERROR, errno, "failed to set times on %s", + rsyserr(FERROR_XFER, errno, "failed to set times on %s", full_fname(fname)); goto cleanup; } if (ret == 0) /* ret == 1 if symlink could not be set */ updated = 1; + else + file->flags |= FLAG_TIME_FAILED; } - change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file); - change_gid = preserve_gid && F_GID(file) != GID_NONE - && sxp->st.st_gid != F_GID(file); + change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file); + change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP) + && sxp->st.st_gid != (gid_t)F_GROUP(file); #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK - if (S_ISLNK(sxp->st.st_mode)) + if (S_ISLNK(sxp->st.st_mode)) { ; - else + } else #endif if (change_uid || change_gid) { if (verbose > 2) { if (change_uid) { rprintf(FINFO, - "set uid of %s from %ld to %ld\n", - fname, - (long)sxp->st.st_uid, (long)F_UID(file)); + "set uid of %s from %u to %u\n", + fname, (unsigned)sxp->st.st_uid, F_OWNER(file)); } if (change_gid) { rprintf(FINFO, - "set gid of %s from %ld to %ld\n", - fname, - (long)sxp->st.st_gid, (long)F_GID(file)); + "set gid of %s from %u to %u\n", + fname, (unsigned)sxp->st.st_gid, F_GROUP(file)); } } - if (do_lchown(fname, - change_uid ? F_UID(file) : sxp->st.st_uid, - change_gid ? F_GID(file) : sxp->st.st_gid) != 0) { - /* shouldn't have attempted to change uid or gid - * unless have the privilege */ - rsyserr(FERROR, errno, "%s %s failed", - change_uid ? "chown" : "chgrp", - full_fname(fname)); - goto cleanup; - } - /* a lchown had been done - we have to re-stat if the - * destination had the setuid or setgid bits set due - * to the side effect of the chown call */ - if (sxp->st.st_mode & (S_ISUID | S_ISGID)) { - link_stat(fname, &sxp->st, - keep_dirlinks && S_ISDIR(sxp->st.st_mode)); + if (am_root >= 0) { + if (do_lchown(fname, + change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid, + change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid) != 0) { + /* We shouldn't have attempted to change uid + * or gid unless have the privilege. */ + rsyserr(FERROR_XFER, errno, "%s %s failed", + change_uid ? "chown" : "chgrp", + full_fname(fname)); + goto cleanup; + } + /* A lchown had been done, so we need to re-stat if + * the destination had the setuid or setgid bits set + * (due to the side effect of the chown call). */ + if (sxp->st.st_mode & (S_ISUID | S_ISGID)) { + link_stat(fname, &sxp->st, + keep_dirlinks && S_ISDIR(sxp->st.st_mode)); + } } updated = 1; } - if (daemon_chmod_modes && !S_ISLNK(new_mode)) - new_mode = tweak_mode(new_mode, daemon_chmod_modes); - #ifdef SUPPORT_ACLS /* It's OK to call set_acl() now, even for a dir, as the generator * will enable owner-writability using chmod, if necessary. @@ -336,9 +495,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp, #ifdef HAVE_CHMOD if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) { - int ret = do_chmod(fname, new_mode); + int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode); if (ret < 0) { - rsyserr(FERROR, errno, + rsyserr(FERROR_XFER, errno, "failed to set permissions on %s", full_fname(fname)); goto cleanup; @@ -383,15 +542,17 @@ RETSIGTYPE sig_int(UNUSED(int val)) } /* Finish off a file transfer: renaming the file and setting the file's - * attributes (e.g. permissions, ownership, etc.). If partialptr is not - * NULL and the robust_rename() call is forced to copy the temp file, we - * stage the file into the partial-dir and then rename it into place. */ -void finish_transfer(const char *fname, const char *fnametmp, - const char *fnamecmp, const char *partialptr, - struct file_struct *file, int ok_to_set_time, - int overwriting_basis) + * attributes (e.g. permissions, ownership, etc.). If the robust_rename() + * call is forced to copy the temp file and partialptr is both non-NULL and + * not an absolute path, we stage the file into the partial-dir and then + * rename it into place. This returns 1 on succcess or 0 on failure. */ +int finish_transfer(const char *fname, const char *fnametmp, + const char *fnamecmp, const char *partialptr, + struct file_struct *file, int ok_to_set_time, + int overwriting_basis) { int ret; + const char *temp_copy_name = partialptr && *partialptr != '/' ? partialptr : NULL; if (inplace) { if (verbose > 2) @@ -400,8 +561,11 @@ void finish_transfer(const char *fname, const char *fnametmp, goto do_set_file_attrs; } - if (make_backups > 0 && overwriting_basis && !make_backup(fname)) - return; + if (make_backups > 0 && overwriting_basis) { + if (!make_backup(fname)) + return 1; + fnamecmp = get_backup_name(fname); + } /* Change permissions before putting the file into place. */ set_file_attrs(fnametmp, file, NULL, fnamecmp, @@ -410,34 +574,39 @@ void finish_transfer(const char *fname, const char *fnametmp, /* move tmp file over real file */ if (verbose > 2) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); - ret = robust_rename(fnametmp, fname, partialptr, + ret = robust_rename(fnametmp, fname, temp_copy_name, file->mode & INITACCESSPERMS); if (ret < 0) { - rsyserr(FERROR, errno, "%s %s -> \"%s\"", + rsyserr(FERROR_XFER, errno, "%s %s -> \"%s\"", ret == -2 ? "copy" : "rename", full_fname(fnametmp), fname); - do_unlink(fnametmp); - return; + if (!partialptr || (ret == -2 && temp_copy_name) + || robust_rename(fnametmp, partialptr, NULL, + file->mode & INITACCESSPERMS) < 0) + do_unlink(fnametmp); + return 0; } if (ret == 0) { /* The file was moved into place (not copied), so it's done. */ - return; + return 1; } /* The file was copied, so tweak the perms of the copied file. If it * was copied to partialptr, move it into its final destination. */ - fnametmp = partialptr ? partialptr : fname; + fnametmp = temp_copy_name ? temp_copy_name : fname; do_set_file_attrs: set_file_attrs(fnametmp, file, NULL, fnamecmp, ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); - if (partialptr) { + if (temp_copy_name) { if (do_rename(fnametmp, fname) < 0) { - rsyserr(FERROR, errno, "rename %s -> \"%s\"", + rsyserr(FERROR_XFER, errno, "rename %s -> \"%s\"", full_fname(fnametmp), fname); - } else - handle_partial_dir(partialptr, PDIR_DELETE); + return 0; + } + handle_partial_dir(temp_copy_name, PDIR_DELETE); } + return 1; } struct file_list *flist_for_ndx(int ndx) @@ -447,12 +616,12 @@ struct file_list *flist_for_ndx(int ndx) if (!flist && !(flist = first_flist)) return NULL; - while (ndx < flist->ndx_start) { + while (ndx < flist->ndx_start-1) { if (flist == first_flist) return NULL; flist = flist->prev; } - while (ndx >= flist->ndx_start + flist->count) { + while (ndx >= flist->ndx_start + flist->used) { if (!(flist = flist->next)) return NULL; }