X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/82ad07c4182f744c07b96a15df4572e559ed7dc8..bd685982389b78a158921b7839bdeca501338d19:/uidlist.c

diff --git a/uidlist.c b/uidlist.c
index 8104eca7..f5b74817 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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,
@@ -16,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.
  */
 
 /* If the source username/group does not exist on the target then use
@@ -25,6 +24,18 @@
  * are special. */
 
 #include "rsync.h"
+#include "ifuncs.h"
+#include "itypes.h"
+#include "io.h"
+
+extern int am_root;
+extern int preserve_uid;
+extern int preserve_gid;
+extern int preserve_acls;
+extern int numeric_ids;
+extern gid_t our_gid;
+extern char *usermap;
+extern char *groupmap;
 
 #ifdef HAVE_GETGROUPS
 # ifndef GETGROUPS_T
@@ -32,37 +43,61 @@
 # endif
 #endif
 
-extern int verbose;
-extern int preserve_uid;
-extern int preserve_gid;
-extern int numeric_ids;
-extern int am_root;
+#define NFLAGS_WILD_NAME_MATCH (1<<0)
+#define NFLAGS_NAME_MATCH (1<<1)
+
+union name_or_id {
+    const char *name;
+    id_t max_id;
+};
 
 struct idlist {
 	struct idlist *next;
-	int id, id2;
-	char *name;
+	union name_or_id u;
+	id_t id, id2;
+	uint16 flags;
 };
 
-static struct idlist *uidlist;
-static struct idlist *gidlist;
+static struct idlist *uidlist, *uidmap;
+static struct idlist *gidlist, *gidmap;
 
-static struct idlist *add_to_list(struct idlist **root, int id, char *name,
-				  int id2)
+static id_t id_parse(const char *num_str)
+{
+	id_t tmp, num = 0;
+	const char *cp = num_str;
+
+	while (*cp) {
+		if (!isDigit(cp)) {
+		  invalid_num:
+			rprintf(FERROR, "Invalid ID number: %s\n", num_str);
+			exit_cleanup(RERR_SYNTAX);
+		}
+		tmp = num * 10 + *cp++ - '0';
+		if (tmp < num)
+			goto invalid_num;
+		num = tmp;
+	}
+
+	return num;
+}
+
+static struct idlist *add_to_list(struct idlist **root, id_t id, union name_or_id noiu,
+				  id_t id2, uint16 flags)
 {
 	struct idlist *node = new(struct idlist);
 	if (!node)
 		out_of_memory("add_to_list");
 	node->next = *root;
-	node->name = name;
+	node->u = noiu;
 	node->id = id;
 	node->id2 = id2;
+	node->flags = flags;
 	*root = node;
 	return node;
 }
 
 /* turn a uid into a user name */
-static char *uid_to_name(uid_t uid)
+char *uid_to_user(uid_t uid)
 {
 	struct passwd *pass = getpwuid(uid);
 	if (pass)
@@ -71,7 +106,7 @@ static char *uid_to_name(uid_t uid)
 }
 
 /* turn a gid into a group name */
-static char *gid_to_name(gid_t gid)
+char *gid_to_group(gid_t gid)
 {
 	struct group *grp = getgrgid(gid);
 	if (grp)
@@ -79,34 +114,49 @@ static char *gid_to_name(gid_t gid)
 	return NULL;
 }
 
-static int map_uid(int id, char *name)
+/* Parse a user name or (optionally) a number into a uid */
+int user_to_uid(const char *name, uid_t *uid_p, BOOL num_ok)
 {
-	uid_t uid;
-	if (id != 0 && name_to_uid(name, &uid))
-		return uid;
-	return id;
+	struct passwd *pass;
+	if (!name || !*name)
+		return 0;
+	if (num_ok && name[strspn(name, "0123456789")] == '\0') {
+		*uid_p = id_parse(name);
+		return 1;
+	}
+	if (!(pass = getpwnam(name)))
+		return 0;
+	*uid_p = pass->pw_uid;
+	return 1;
 }
 
-static int map_gid(int id, char *name)
+/* Parse a group name or (optionally) a number into a gid */
+int group_to_gid(const char *name, gid_t *gid_p, BOOL num_ok)
 {
-	gid_t gid;
-	if (id != 0 && name_to_gid(name, &gid))
-		return gid;
-	return id;
+	struct group *grp;
+	if (!name || !*name)
+		return 0;
+	if (num_ok && name[strspn(name, "0123456789")] == '\0') {
+		*gid_p = id_parse(name);
+		return 1;
+	}
+	if (!(grp = getgrnam(name)))
+		return 0;
+	*gid_p = grp->gr_gid;
+	return 1;
 }
 
 static int is_in_group(gid_t gid)
 {
 #ifdef HAVE_GETGROUPS
-	static gid_t last_in = GID_NONE, last_out;
-	static int ngroups = -2;
+	static gid_t last_in;
+	static int ngroups = -2, last_out = -1;
 	static GETGROUPS_T *gidset;
 	int n;
 
-	if (gid == last_in)
+	if (gid == last_in && last_out >= 0)
 		return last_out;
 	if (ngroups < -1) {
-		gid_t mygid = MY_GID();
 		if ((ngroups = getgroups(0, NULL)) < 0)
 			ngroups = 0;
 		gidset = new_array(GETGROUPS_T, ngroups+1);
@@ -116,12 +166,12 @@ static int is_in_group(gid_t gid)
 			ngroups = getgroups(ngroups, gidset);
 		/* The default gid might not be in the list on some systems. */
 		for (n = 0; n < ngroups; n++) {
-			if (gidset[n] == mygid)
+			if (gidset[n] == our_gid)
 				break;
 		}
 		if (n == ngroups)
-			gidset[ngroups++] = mygid;
-		if (verbose > 3) {
+			gidset[ngroups++] = our_gid;
+		if (DEBUG_GTE(OWN, 2)) {
 			int pos;
 			char *gidbuf = new_array(char, ngroups*21+32);
 			if (!gidbuf)
@@ -144,201 +194,353 @@ static int is_in_group(gid_t gid)
 	return last_out = 0;
 
 #else
-	static gid_t mygid = GID_NONE;
-	if (mygid == GID_NONE) {
-		mygid = MY_GID();
-		if (verbose > 3)
-			rprintf(FINFO, "process has gid %d\n", (int)mygid);
-	}
-	return gid == mygid;
+	return gid == our_gid;
 #endif
 }
 
-/* Add a uid to the list of uids.  Only called on receiving side. */
-static struct idlist *recv_add_uid(int id, char *name)
+/* Add a uid/gid to its list of ids.  Only called on receiving side. */
+static struct idlist *recv_add_id(struct idlist **idlist_ptr, struct idlist *idmap,
+				  id_t id, const char *name)
 {
-	int id2 = name ? map_uid(id, name) : id;
 	struct idlist *node;
+	union name_or_id noiu;
+	int flag;
+	id_t id2;
 
-	node = add_to_list(&uidlist, id, name, id2);
+	noiu.name = name; /* ensure that add_to_list() gets the raw value. */
+	if (!name)
+		name = "";
 
-	if (verbose > 3) {
-		rprintf(FINFO, "uid %d(%s) maps to %d\n",
-		    id, name ? name : "", id2);
+	for (node = idmap; node; node = node->next) {
+		if (node->flags & NFLAGS_WILD_NAME_MATCH) {
+			if (!wildmatch(node->u.name, name))
+				continue;
+		} else if (node->flags & NFLAGS_NAME_MATCH) {
+			if (strcmp(node->u.name, name) != 0)
+				continue;
+		} else if (node->u.max_id) {
+			if (id < node->id || id > node->u.max_id)
+				continue;
+		} else {
+			if (node->id != id)
+				continue;
+		}
+		break;
 	}
+	if (node)
+		id2 = node->id2;
+	else if (*name && id) {
+		if (idlist_ptr == &uidlist) {
+			uid_t uid;
+			id2 = user_to_uid(name, &uid, False) ? uid : id;
+		} else {
+			gid_t gid;
+			id2 = group_to_gid(name, &gid, False) ? gid : id;
+		}
+	} else
+		id2 = id;
 
-	return node;
-}
-
-/* Add a gid to the list of gids.  Only called on receiving side. */
-static struct idlist *recv_add_gid(int id, char *name)
-{
-	int id2 = name ? map_gid(id, name) : id;
-	struct idlist *node;
-
-	if (!am_root && !is_in_group(id2))
-		id2 = GID_NONE;
-	node = add_to_list(&gidlist, id, name, id2);
+	flag = idlist_ptr == &gidlist && !am_root && !is_in_group(id2) ? FLAG_SKIP_GROUP : 0;
+	node = add_to_list(idlist_ptr, id, noiu, id2, flag);
 
-	if (verbose > 3) {
-		rprintf(FINFO, "gid %d(%s) maps to %d\n",
-		    id, name ? name : "", id2);
+	if (DEBUG_GTE(OWN, 2)) {
+		rprintf(FINFO, "%sid %u(%s) maps to %u\n",
+			idlist_ptr == &uidlist ? "u" : "g",
+			(unsigned)id, name, (unsigned)id2);
 	}
 
 	return node;
 }
 
 /* this function is a definate candidate for a faster algorithm */
-static uid_t match_uid(uid_t uid)
+uid_t match_uid(uid_t uid)
 {
-	static uid_t last_in, last_out;
+	static struct idlist *last = NULL;
 	struct idlist *list;
 
-	if (uid == 0)
-		return 0;
-
-	if (uid == last_in)
-		return last_out;
-
-	last_in = uid;
+	if (last && uid == last->id)
+		return last->id2;
 
 	for (list = uidlist; list; list = list->next) {
-		if (list->id == (int)uid)
-			return last_out = (uid_t)list->id2;
+		if (list->id == uid)
+			break;
 	}
 
-	return last_out = uid;
+	if (!list)
+		list = recv_add_id(&uidlist, uidmap, uid, NULL);
+	last = list;
+
+	return list->id2;
 }
 
-static gid_t match_gid(gid_t gid)
+gid_t match_gid(gid_t gid, uint16 *flags_ptr)
 {
-	static gid_t last_in = GID_NONE, last_out = GID_NONE;
+	static struct idlist *last = NULL;
 	struct idlist *list;
 
-	if (gid == GID_NONE)
-		return GID_NONE;
-
-	if (gid == last_in)
-		return last_out;
-
-	last_in = gid;
-
-	for (list = gidlist; list; list = list->next) {
-		if (list->id == (int)gid)
-			return last_out = (gid_t)list->id2;
+	if (last && gid == last->id)
+		list = last;
+	else {
+		for (list = gidlist; list; list = list->next) {
+			if (list->id == gid)
+				break;
+		}
+		if (!list)
+			list = recv_add_id(&gidlist, gidmap, gid, NULL);
+		last = list;
 	}
 
-	list = recv_add_gid(gid, NULL);
-	return last_out = list->id2;
+	if (flags_ptr && list->flags & FLAG_SKIP_GROUP)
+		*flags_ptr |= FLAG_SKIP_GROUP;
+	return list->id2;
 }
 
 /* Add a uid to the list of uids.  Only called on sending side. */
-void add_uid(uid_t uid)
+const char *add_uid(uid_t uid)
 {
 	struct idlist *list;
+	struct idlist *node;
+	union name_or_id noiu;
 
 	if (uid == 0)	/* don't map root */
-		return;
+		return NULL;
 
 	for (list = uidlist; list; list = list->next) {
-		if (list->id == (int)uid)
-			return;
+		if (list->id == uid)
+			return NULL;
 	}
 
-	add_to_list(&uidlist, (int)uid, uid_to_name(uid), 0);
+	noiu.name = uid_to_user(uid);
+	node = add_to_list(&uidlist, uid, noiu, 0, 0);
+	return node->u.name;
 }
 
 /* Add a gid to the list of gids.  Only called on sending side. */
-void add_gid(gid_t gid)
+const char *add_gid(gid_t gid)
 {
 	struct idlist *list;
+	struct idlist *node;
+	union name_or_id noiu;
 
 	if (gid == 0)	/* don't map root */
-		return;
+		return NULL;
 
 	for (list = gidlist; list; list = list->next) {
-		if (list->id == (int)gid)
-			return;
+		if (list->id == gid)
+			return NULL;
 	}
 
-	add_to_list(&gidlist, (int)gid, gid_to_name(gid), 0);
+	noiu.name = gid_to_group(gid);
+	node = add_to_list(&gidlist, gid, noiu, 0, 0);
+	return node->u.name;
 }
 
-
 /* send a complete uid/gid mapping to the peer */
-void send_uid_list(int f)
+void send_id_list(int f)
 {
 	struct idlist *list;
 
-	if (preserve_uid) {
+	if (preserve_uid || preserve_acls) {
 		int len;
 		/* we send sequences of uid/byte-length/name */
 		for (list = uidlist; list; list = list->next) {
-			if (!list->name)
+			if (!list->u.name)
 				continue;
-			len = strlen(list->name);
-			write_int(f, list->id);
+			len = strlen(list->u.name);
+			write_varint30(f, list->id);
 			write_byte(f, len);
-			write_buf(f, list->name, len);
+			write_buf(f, list->u.name, len);
 		}
 
 		/* terminate the uid list with a 0 uid. We explicitly exclude
 		 * 0 from the list */
-		write_int(f, 0);
+		write_varint30(f, 0);
 	}
 
-	if (preserve_gid) {
+	if (preserve_gid || preserve_acls) {
 		int len;
 		for (list = gidlist; list; list = list->next) {
-			if (!list->name)
+			if (!list->u.name)
 				continue;
-			len = strlen(list->name);
-			write_int(f, list->id);
+			len = strlen(list->u.name);
+			write_varint30(f, list->id);
 			write_byte(f, len);
-			write_buf(f, list->name, len);
+			write_buf(f, list->u.name, len);
 		}
-		write_int(f, 0);
+		write_varint30(f, 0);
+	}
+}
+
+uid_t recv_user_name(int f, uid_t uid)
+{
+	struct idlist *node;
+	int len = read_byte(f);
+	char *name = new_array(char, len+1);
+	if (!name)
+		out_of_memory("recv_user_name");
+	read_sbuf(f, name, len);
+	if (numeric_ids < 0) {
+		free(name);
+		name = NULL;
 	}
+	node = recv_add_id(&uidlist, uidmap, uid, name); /* node keeps name's memory */
+	return node->id2;
+}
+
+gid_t recv_group_name(int f, gid_t gid, uint16 *flags_ptr)
+{
+	struct idlist *node;
+	int len = read_byte(f);
+	char *name = new_array(char, len+1);
+	if (!name)
+		out_of_memory("recv_group_name");
+	read_sbuf(f, name, len);
+	if (numeric_ids < 0) {
+		free(name);
+		name = NULL;
+	}
+	node = recv_add_id(&gidlist, gidmap, gid, name); /* node keeps name's memory */
+	if (flags_ptr && node->flags & FLAG_SKIP_GROUP)
+		*flags_ptr |= FLAG_SKIP_GROUP;
+	return node->id2;
 }
 
 /* recv a complete uid/gid mapping from the peer and map the uid/gid
  * in the file list to local names */
-void recv_uid_list(int f, struct file_list *flist)
+void recv_id_list(int f, struct file_list *flist)
 {
-	int id, i;
-	char *name;
+	id_t id;
+	int i;
 
-	if (preserve_uid && !numeric_ids) {
+	if ((preserve_uid || preserve_acls) && numeric_ids <= 0) {
 		/* read the uid list */
-		while ((id = read_int(f)) != 0) {
-			int len = read_byte(f);
-			name = new_array(char, len+1);
-			if (!name)
-				out_of_memory("recv_uid_list");
-			read_sbuf(f, name, len);
-			recv_add_uid(id, name); /* node keeps name's memory */
-		}
+		while ((id = read_varint30(f)) != 0)
+			recv_user_name(f, id);
 	}
 
-	if (preserve_gid && !numeric_ids) {
+	if ((preserve_gid || preserve_acls) && numeric_ids <= 0) {
 		/* read the gid list */
-		while ((id = read_int(f)) != 0) {
-			int len = read_byte(f);
-			name = new_array(char, len+1);
-			if (!name)
-				out_of_memory("recv_uid_list");
-			read_sbuf(f, name, len);
-			recv_add_gid(id, name); /* node keeps name's memory */
-		}
+		while ((id = read_varint30(f)) != 0)
+			recv_group_name(f, id, NULL);
 	}
 
 	/* Now convert all the uids/gids from sender values to our values. */
-	if (am_root && preserve_uid && !numeric_ids) {
-		for (i = 0; i < flist->count; i++)
-			F_UID(flist->files[i]) = match_uid(F_UID(flist->files[i]));
+#ifdef SUPPORT_ACLS
+	if (preserve_acls && (!numeric_ids || usermap || groupmap))
+		match_acl_ids();
+#endif
+	if (am_root && preserve_uid && (!numeric_ids || usermap)) {
+		for (i = 0; i < flist->used; i++)
+			F_OWNER(flist->files[i]) = match_uid(F_OWNER(flist->files[i]));
 	}
-	if (preserve_gid && (!am_root || !numeric_ids)) {
-		for (i = 0; i < flist->count; i++)
-			F_GID(flist->files[i]) = match_gid(F_GID(flist->files[i]));
+	if (preserve_gid && (!am_root || !numeric_ids || groupmap)) {
+		for (i = 0; i < flist->used; i++) {
+			F_GROUP(flist->files[i]) = match_gid(F_GROUP(flist->files[i]),
+							     &flist->files[i]->flags);
+		}
 	}
 }
+
+void parse_name_map(char *map, BOOL usernames)
+{
+	struct idlist **idmap_ptr = usernames ? &uidmap : &gidmap;
+	struct idlist **idlist_ptr = usernames ? &uidlist : &gidlist;
+	char *colon, *end, *cp = map + strlen(map);
+	union name_or_id noiu;
+	id_t id1;
+	uint16 flags;
+
+	/* Parse the list in reverse, so the order in the struct is right. */
+	while (1) {
+		end = cp;
+		while (cp > map && cp[-1] != ',') cp--;
+		if (!(colon = strchr(cp, ':'))) {
+			rprintf(FERROR, "No colon found in --%smap: %s\n",
+				usernames ? "user" : "group", cp);
+			exit_cleanup(RERR_SYNTAX);
+		}
+		if (!colon[1]) {
+			rprintf(FERROR, "No name found after colon --%smap: %s\n",
+				usernames ? "user" : "group", cp);
+			exit_cleanup(RERR_SYNTAX);
+		}
+		*colon = '\0';
+
+		if (isDigit(cp)) {
+			char *dash = strchr(cp, '-');
+			if (strspn(cp, "0123456789-") != (size_t)(colon - cp)
+			 || (dash && (!dash[1] || strchr(dash+1, '-')))) {
+				rprintf(FERROR, "Invalid number in --%smap: %s\n",
+					usernames ? "user" : "group", cp);
+				exit_cleanup(RERR_SYNTAX);
+			}
+			if (dash)
+				noiu.max_id = id_parse(dash+1);
+			else
+				noiu.max_id = 0;
+			flags = 0;
+			id1 = id_parse(cp);
+		} else if (strpbrk(cp, "*[?")) {
+			flags = NFLAGS_WILD_NAME_MATCH;
+			noiu.name = cp;
+			id1 = 0;
+		} else {
+			flags = NFLAGS_NAME_MATCH;
+			noiu.name = cp;
+			id1 = 0;
+		}
+
+		if (usernames) {
+			uid_t uid;
+			if (user_to_uid(colon+1, &uid, True))
+				add_to_list(idmap_ptr, id1, noiu, uid, flags);
+			else {
+				rprintf(FERROR,
+				    "Unknown --usermap name on receiver: %s\n",
+				    colon+1);
+			}
+		} else {
+			gid_t gid;
+			if (group_to_gid(colon+1, &gid, True))
+				add_to_list(idmap_ptr, id1, noiu, gid, flags);
+			else {
+				rprintf(FERROR,
+				    "Unknown --groupmap name on receiver: %s\n",
+				    colon+1);
+			}
+		}
+
+		if (cp == map)
+			break;
+
+		*--cp = '\0'; /* replace comma */
+	}
+
+	/* The 0 user/group doesn't get its name sent, so add it explicitly. */
+	recv_add_id(idlist_ptr, *idmap_ptr, 0,
+		    numeric_ids ? NULL : usernames ? uid_to_user(0) : gid_to_group(0));
+}
+
+#ifdef HAVE_GETGROUPLIST
+const char *getallgroups(uid_t uid, gid_t *gid_list, int *size_ptr)
+{
+	struct passwd *pw;
+	if ((pw = getpwuid(uid)) == NULL)
+		return "getpwuid failed";
+	/* Get all the process's groups, with the pw_gid group first. */
+	if (getgrouplist(pw->pw_name, pw->pw_gid, gid_list, size_ptr) < 0)
+		return "getgrouplist failed";
+	/* Paranoia: is the default group not first in the list? */
+	if (gid_list[0] != pw->pw_gid) {
+		int j;
+		for (j = 0; j < *size_ptr; j++) {
+			if (gid_list[j] == pw->pw_gid) {
+				gid_list[j] = gid_list[0];
+				gid_list[0] = pw->pw_gid;
+				break;
+			}
+		}
+	}
+	return NULL;
+}
+#endif