From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 8 Mar 2021 23:32:37 +0000 (+0000)
Subject: packager: Correctly resolve UIDs/GIDs
X-Git-Tag: 0.9.28~1285^2~594
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=677e9e5bf40d388f5298dab645a7efcabb4045bf;p=pakfire.git

packager: Correctly resolve UIDs/GIDs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/include/pakfire/pwd.h b/src/libpakfire/include/pakfire/pwd.h
index 372cf1a9f..fc04a52d8 100644
--- a/src/libpakfire/include/pakfire/pwd.h
+++ b/src/libpakfire/include/pakfire/pwd.h
@@ -32,7 +32,7 @@ struct passwd* pakfire_getpwnam(Pakfire pakfire, const char* name);
 struct passwd* pakfire_getpwuid(Pakfire pakfire, uid_t uid);
 
 struct group* pakfire_getgrnam(Pakfire pakfire, const char* name);
-struct group* pakfire_getgruid(Pakfire pakfire, gid_t gid);
+struct group* pakfire_getgrgid(Pakfire pakfire, gid_t gid);
 
 #endif
 
diff --git a/src/libpakfire/packager.c b/src/libpakfire/packager.c
index a7ecc3d75..d9687011f 100644
--- a/src/libpakfire/packager.c
+++ b/src/libpakfire/packager.c
@@ -38,6 +38,7 @@
 #include <pakfire/packager.h>
 #include <pakfire/pakfire.h>
 #include <pakfire/private.h>
+#include <pakfire/pwd.h>
 #include <pakfire/types.h>
 
 #define BUFFER_SIZE 64 * 1024
@@ -134,6 +135,44 @@ static void pakfire_packager_free(struct pakfire_packager* packager) {
 	pakfire_unref(packager->pakfire);
 }
 
+static const char* pakfire_packager_user_lookup(void* data, la_int64_t uid) {
+	Pakfire pakfire = (Pakfire)data;
+
+	// Fast path for "root"
+	if (uid == 0)
+		return "root";
+
+	// Find a matching entry in /etc/passwd
+	struct passwd* entry = pakfire_getpwuid(pakfire, uid);
+	if (!entry) {
+		ERROR(pakfire, "Could not retrieve uname for %ld: %s\n", uid, strerror(errno));
+		return 0;
+	}
+
+	DEBUG(pakfire, "Mapping UID %ld to %s\n", uid, entry->pw_name);
+
+	return entry->pw_name;
+}
+
+static const char* pakfire_packager_group_lookup(void* data, la_int64_t gid) {
+	Pakfire pakfire = (Pakfire)data;
+
+	// Fast path for "root"
+	if (gid == 0)
+		return "root";
+
+	// Find a matching entry in /etc/group
+	struct group* entry = pakfire_getgrgid(pakfire, gid);
+	if (!entry) {
+		ERROR(pakfire, "Could not retrieve gname for %ld: %s\n", gid, strerror(errno));
+		return 0;
+	}
+
+	DEBUG(pakfire, "Mapping GID %ld to %s\n", gid, entry->gr_name);
+
+	return entry->gr_name;
+}
+
 static int pakfire_packager_create_reader(struct pakfire_packager* p) {
 	// Open a reader
 	p->reader = archive_read_disk_new();
@@ -150,6 +189,12 @@ static int pakfire_packager_create_reader(struct pakfire_packager* p) {
 		return 1;
 	}
 
+	// Install our own routine for user/group lookups
+	archive_read_disk_set_uname_lookup(p->reader, p->pakfire,
+		pakfire_packager_user_lookup, NULL);
+	archive_read_disk_set_gname_lookup(p->reader, p->pakfire,
+		pakfire_packager_group_lookup, NULL);
+
 	return 0;
 }
 
diff --git a/src/libpakfire/pwd.c b/src/libpakfire/pwd.c
index 819e31a33..01a965399 100644
--- a/src/libpakfire/pwd.c
+++ b/src/libpakfire/pwd.c
@@ -144,6 +144,6 @@ static int __pakfire_getgrgid(struct group* entry, const void* value) {
 	return 0;
 }
 
-struct group* pakfire_getgruid(Pakfire pakfire, gid_t gid) {
+struct group* pakfire_getgrgid(Pakfire pakfire, gid_t gid) {
 	return pakfire_getgrent(pakfire, __pakfire_getgrgid, &gid);
 }