Make check_private_dir check for group ownership as appropriate

This commit is contained in:
Nick Mathewson 2011-05-15 13:11:48 -04:00
parent 287f6cb128
commit f72e792be5

View File

@ -30,6 +30,7 @@
#else #else
#include <dirent.h> #include <dirent.h>
#include <pwd.h> #include <pwd.h>
#include <grp.h>
#endif #endif
/* math.h needs this on Linux */ /* math.h needs this on Linux */
@ -1736,6 +1737,21 @@ check_private_dir(const char *dirname, cpd_check_t check)
tor_free(process_ownername); tor_free(process_ownername);
return -1; return -1;
} }
if ((check & CPD_GROUP_OK) && st.st_gid != getgid()) {
struct group *gr;
char *process_groupname = NULL;
gr = getgrgid(getgid());
process_groupname = gr ? tor_strdup(gr->gr_name) : tor_strdup("<unknown>");
gr = getgrgid(st.st_gid);
log_warn(LD_FS, "%s is not owned by this group (%s, %d) but by group "
"%s (%d). Are you running Tor as the wrong user?",
dirname, process_groupname, (int)getgid(),
gr ? gr->gr_name : "<unknown>", (int)st.st_gid);
tor_free(process_groupname);
return -1;
}
if (check & CPD_GROUP_OK) { if (check & CPD_GROUP_OK) {
mask = 0027; mask = 0027;
} else { } else {