cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unveil mime_path's parent directory with the 'r' permission to allow

Browse Source 
stat(1) on it and then also unveil paths configured in XDG_DATA_DIRS
the same way so that the check_in_path_xdg_data() function can do its
job
after everything is done, call unveil(NULL, NULL) to disallow further
calls to unveil

ok ajacoutot@
This commit is contained in:
robert 2019-03-25 15:49:22 +00:00
parent aea0680278
commit 8d43a9958f
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/shared-mime-info/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.64 2018/09/25 19:07:11 jasper Exp $
# $OpenBSD: Makefile,v 1.65 2019/03/25 15:49:22 robert Exp $
COMMENT= shared mime database for desktops
DISTNAME= shared-mime-info-1.10
REVISION= 4
REVISION= 5
CATEGORIES= misc

48
misc/shared-mime-info/patches/patch-update-mime-database_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-update-mime-database_c,v 1.7 2018/09/25 19:07:11 jasper Exp $
$OpenBSD: patch-update-mime-database_c,v 1.8 2019/03/25 15:49:22 robert Exp $
- unveil: unveil the provided mime_dir
- pledge: https://bugs.freedesktop.org/show_bug.cgi?id=104368
@ -6,20 +6,56 @@ $OpenBSD: patch-update-mime-database_c,v 1.7 2018/09/25 19:07:11 jasper Exp $
Index: update-mime-database.c
--- update-mime-database.c.orig
+++ update-mime-database.c
@@ -3683,6 +3683,16 @@ int main(int argc, char **argv)
@@ -2164,6 +2164,11 @@ static void check_in_path_xdg_data(const char *mime_pa
path = g_path_get_dirname(mime_path);
+ if (unveil(path, "r") == -1) {
+ g_warning("Can't unveil '%s' directory: %s",
+ path, g_strerror(errno));
+ }
+
if (stat(path, &path_info))
{
g_warning("Can't stat '%s' directory: %s",
@@ -2188,12 +2193,23 @@ static void check_in_path_xdg_data(const char *mime_pa
for (i = 0; i < n; i++)
{
+ if (unveil(dirs[i], "r") == -1) {
+ g_warning("Can't unveil '%s' directory: %s",
+ dirs[i], g_strerror(errno));
+ goto out;
+ }
+
if (stat(dirs[i], &dir_info) == 0 &&
dir_info.st_ino == path_info.st_ino &&
dir_info.st_dev == path_info.st_dev)
break;
}
+ if (unveil(NULL, NULL) == -1) {
+ g_warning(_("unveil"));
+ goto out;
+ }
+
if (i == n)
{
g_printerr(_("\nNote that '%s' is not in the search path\n"
@@ -3682,6 +3698,16 @@ int main(int argc, char **argv)
LIBXML_TEST_VERSION;
mime_dir = argv[optind];
+
+ if (unveil(mime_dir, "rwc") == -1) {
+ g_warning(_("unveil"));
+ return EXIT_FAILURE;
+ }
+
+ if (pledge("stdio rpath wpath cpath getpw", NULL) == -1) {
+ if (pledge("stdio rpath wpath cpath getpw unveil", NULL) == -1) {
+ g_warning(_("pledge"));
+ return EXIT_FAILURE;
+ }
+
/* Strip trailing / characters */
{
int l = strlen(mime_dir);