github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-15 14:16:14 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 6

modif: improve fcopy error messages in check() (#6801)

Browse source 
Changes:

* Remove "file" from "invalid ownership" error message (`src` can also
  be a directory)
* Print more error messages
* Include the source path, realpath, file type and uid/username of the
  file owner where applicable

Relates to #6797.
This commit is contained in:
Kelvin M. Klann 2025-07-07 16:09:59 +00:00 • committed by GitHub
parent 9bc9b8af4e
commit 1f92779d27
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 51 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/fcopy/main.c
View file

@ -317,17 +317,55 @@ out:
return(0);
}
// Based on the output of ls(1p).
static char file_type_to_char(mode_t mode) {
char ftype = '?';
if (S_ISREG(mode))
ftype = '-';
else if (S_ISDIR(mode))
ftype = 'd';
else if (S_ISLNK(mode))
ftype = 'l';
else if (S_ISCHR(mode))
ftype = 'c';
else if (S_ISBLK(mode))
ftype = 'b';
else if (S_ISFIFO(mode))
ftype = 'p';
else if (S_ISSOCK(mode))
ftype = 's';
return ftype;
}
static char *check(const char *src) {
struct stat s;
char *rsrc = realpath(src, NULL);
if (!rsrc || stat(rsrc, &s) == -1)
goto errexit;
if (!rsrc) {
fprintf(stderr, "Error fcopy: realpath %s\n", src);
errExit("realpath");
}
struct stat s;
if (stat(rsrc, &s) == -1) {
fprintf(stderr, "Error fcopy: stat %s -> %s\n", src, rsrc);
errExit("stat");
}
struct passwd *src_pw = getpwuid(s.st_uid);
if (!src_pw) {
fprintf(stderr, "Error fcopy: getpwuid %s -> %s\n", src, rsrc);
errExit("getpwuid");
}
uid_t src_uid = src_pw->pw_uid;
char *src_username = strdup(src_pw->pw_name);
if (!src_username)
errExit("strdup");
uid_t user = getuid();
char ftype = file_type_to_char(s.st_mode);
// on systems with systemd-resolved installed /etc/resolve.conf is a symlink to
// /run/systemd/resolve/resolv.conf; this file is owned by systemd-resolve user
// checking gid will fail for files with a larger group such as /usr/bin/mutt_dotlock
uid_t user = getuid();
if (user == 0 && strncmp(rsrc, "/run/systemd/resolve/", 21) == 0) {
// check user systemd-resolve
struct passwd *p = getpwnam("systemd-resolve");
@ -342,12 +380,18 @@ static char *check(const char *src) {
}
// dir, link, regular file
if (S_ISDIR(s.st_mode) || S_ISREG(s.st_mode) || S_ISLNK(s.st_mode))
if (S_ISDIR(s.st_mode) || S_ISREG(s.st_mode) || S_ISLNK(s.st_mode)) {
free(src_username);
return rsrc; // normal exit from the function
}
fprintf(stderr, "Error fcopy: invalid file type for %s -> %s (type=%c uid=%lu name=%s)\n",
src, rsrc, ftype, (unsigned long)src_uid, src_username);
exit(1);
errexit:
free(rsrc);
fprintf(stderr, "Error fcopy: invalid ownership for file %s\n", src);
fprintf(stderr, "Error fcopy: invalid ownership for %s -> %s (type=%c uid=%lu name=%s)\n",
src, rsrc, ftype, (unsigned long)src_uid, src_username);
exit(1);
}