|
Jakub Filak |
f46f8f |
From f3ef192d2ee78bdb4290ea966bc1467d2b599a7e Mon Sep 17 00:00:00 2001
|
|
Jakub Filak |
f46f8f |
From: Jakub Filak <jfilak@redhat.com>
|
|
Jakub Filak |
f46f8f |
Date: Fri, 22 Mar 2013 10:18:16 +0100
|
|
Jakub Filak |
f46f8f |
Subject: [ABRT PATCH] abrtd: recreate Dump Location directory if it is delete
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
- add inotify watch IN_DELETE_SELF and IN_MOVE_SELF and as a rection on
|
|
Jakub Filak |
f46f8f |
these events create the dump location and restore inotify watch.
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
- closes #624
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
Jakub Filak |
f46f8f |
---
|
|
Jakub Filak |
f46f8f |
src/daemon/abrtd.c | 82 +++++++++++++++++++++++++++++++++---------------------
|
|
Jakub Filak |
f46f8f |
1 file changed, 50 insertions(+), 32 deletions(-)
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
diff --git a/src/daemon/abrtd.c b/src/daemon/abrtd.c
|
|
Jakub Filak |
f46f8f |
index f6d3965..7bc93ef 100644
|
|
Jakub Filak |
f46f8f |
--- a/src/daemon/abrtd.c
|
|
Jakub Filak |
f46f8f |
+++ b/src/daemon/abrtd.c
|
|
Jakub Filak |
f46f8f |
@@ -41,6 +41,7 @@
|
|
Jakub Filak |
f46f8f |
/* Maximum number of simultaneously opened client connections. */
|
|
Jakub Filak |
f46f8f |
#define MAX_CLIENT_COUNT 10
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
+#define IN_DUMP_LOCATION_FLAGS (IN_CREATE | IN_MOVED_TO | IN_DELETE_SELF | IN_MOVE_SELF)
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
/* Daemon initializes, then sits in glib main loop, waiting for events.
|
|
Jakub Filak |
f46f8f |
* Events can be:
|
|
Jakub Filak |
f46f8f |
@@ -490,6 +491,36 @@ static gboolean handle_event_output_cb(GIOChannel *gio, GIOCondition condition,
|
|
Jakub Filak |
f46f8f |
/* Removing will also drop the last ref to this gio, closing/freeing it */
|
|
Jakub Filak |
f46f8f |
}
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
+static void ensure_writable_dir(const char *dir, mode_t mode, const char *user)
|
|
Jakub Filak |
f46f8f |
+{
|
|
Jakub Filak |
f46f8f |
+ struct stat sb;
|
|
Jakub Filak |
f46f8f |
+
|
|
Jakub Filak |
f46f8f |
+ if (mkdir(dir, mode) != 0 && errno != EEXIST)
|
|
Jakub Filak |
f46f8f |
+ perror_msg_and_die("Can't create '%s'", dir);
|
|
Jakub Filak |
f46f8f |
+ if (stat(dir, &sb) != 0 || !S_ISDIR(sb.st_mode))
|
|
Jakub Filak |
f46f8f |
+ error_msg_and_die("'%s' is not a directory", dir);
|
|
Jakub Filak |
f46f8f |
+
|
|
Jakub Filak |
f46f8f |
+ struct passwd *pw = getpwnam(user);
|
|
Jakub Filak |
f46f8f |
+ if (!pw)
|
|
Jakub Filak |
f46f8f |
+ perror_msg_and_die("Can't find user '%s'", user);
|
|
Jakub Filak |
f46f8f |
+
|
|
Jakub Filak |
f46f8f |
+ if ((sb.st_uid != pw->pw_uid || sb.st_gid != pw->pw_gid) && lchown(dir, pw->pw_uid, pw->pw_gid) != 0)
|
|
Jakub Filak |
f46f8f |
+ perror_msg_and_die("Can't set owner %u:%u on '%s'", (unsigned int)pw->pw_uid, (unsigned int)pw->pw_gid, dir);
|
|
Jakub Filak |
f46f8f |
+ if ((sb.st_mode & 07777) != mode && chmod(dir, mode) != 0)
|
|
Jakub Filak |
f46f8f |
+ perror_msg_and_die("Can't set mode %o on '%s'", mode, dir);
|
|
Jakub Filak |
f46f8f |
+}
|
|
Jakub Filak |
f46f8f |
+
|
|
Jakub Filak |
f46f8f |
+static void sanitize_dump_dir_rights()
|
|
Jakub Filak |
f46f8f |
+{
|
|
Jakub Filak |
f46f8f |
+ /* We can't allow everyone to create dumps: otherwise users can flood
|
|
Jakub Filak |
f46f8f |
+ * us with thousands of bogus or malicious dumps */
|
|
Jakub Filak |
f46f8f |
+ /* 07000 bits are setuid, setgit, and sticky, and they must be unset */
|
|
Jakub Filak |
f46f8f |
+ /* 00777 bits are usual "rwxrwxrwx" access rights */
|
|
Jakub Filak |
f46f8f |
+ ensure_writable_dir(g_settings_dump_location, 0755, "abrt");
|
|
Jakub Filak |
f46f8f |
+ /* temp dir */
|
|
Jakub Filak |
f46f8f |
+ ensure_writable_dir(VAR_RUN"/abrt", 0755, "root");
|
|
Jakub Filak |
f46f8f |
+}
|
|
Jakub Filak |
f46f8f |
+
|
|
Jakub Filak |
f46f8f |
/* Inotify handler */
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpointer ptr_unused)
|
|
Jakub Filak |
f46f8f |
@@ -594,6 +625,22 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin
|
|
Jakub Filak |
f46f8f |
continue;
|
|
Jakub Filak |
f46f8f |
}
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
+ if (event->mask & IN_DELETE_SELF || event->mask & IN_MOVE_SELF)
|
|
Jakub Filak |
f46f8f |
+ {
|
|
Jakub Filak |
f46f8f |
+ /* HACK: we expect that we watch deletion only of 'g_settings_dump_location'
|
|
Jakub Filak |
f46f8f |
+ * but this handler is used for 'g_settings_sWatchCrashdumpArchiveDir' too
|
|
Jakub Filak |
f46f8f |
+ */
|
|
Jakub Filak |
f46f8f |
+ log("Recreating deleted dump location '%s'", g_settings_dump_location);
|
|
Jakub Filak |
f46f8f |
+ inotify_rm_watch(g_io_channel_unix_get_fd(gio), event->wd);
|
|
Jakub Filak |
f46f8f |
+ sanitize_dump_dir_rights();
|
|
Jakub Filak |
f46f8f |
+ if (inotify_add_watch(g_io_channel_unix_get_fd(gio), g_settings_dump_location, IN_DUMP_LOCATION_FLAGS) < 0)
|
|
Jakub Filak |
f46f8f |
+ {
|
|
Jakub Filak |
f46f8f |
+ perror_msg_and_die("inotify_add_watch failed on recreated '%s'", g_settings_dump_location);
|
|
Jakub Filak |
f46f8f |
+ }
|
|
Jakub Filak |
f46f8f |
+
|
|
Jakub Filak |
f46f8f |
+ continue;
|
|
Jakub Filak |
f46f8f |
+ }
|
|
Jakub Filak |
f46f8f |
+
|
|
Jakub Filak |
f46f8f |
if (!(event->mask & IN_ISDIR) || !name)
|
|
Jakub Filak |
f46f8f |
{
|
|
Jakub Filak |
f46f8f |
/* ignore lock files and such */
|
|
Jakub Filak |
f46f8f |
@@ -810,36 +857,6 @@ static void start_syslog_logging()
|
|
Jakub Filak |
f46f8f |
putenv((char*)"ABRT_SYSLOG=1");
|
|
Jakub Filak |
f46f8f |
}
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
-static void ensure_writable_dir(const char *dir, mode_t mode, const char *user)
|
|
Jakub Filak |
f46f8f |
-{
|
|
Jakub Filak |
f46f8f |
- struct stat sb;
|
|
Jakub Filak |
f46f8f |
-
|
|
Jakub Filak |
f46f8f |
- if (mkdir(dir, mode) != 0 && errno != EEXIST)
|
|
Jakub Filak |
f46f8f |
- perror_msg_and_die("Can't create '%s'", dir);
|
|
Jakub Filak |
f46f8f |
- if (stat(dir, &sb) != 0 || !S_ISDIR(sb.st_mode))
|
|
Jakub Filak |
f46f8f |
- error_msg_and_die("'%s' is not a directory", dir);
|
|
Jakub Filak |
f46f8f |
-
|
|
Jakub Filak |
f46f8f |
- struct passwd *pw = getpwnam(user);
|
|
Jakub Filak |
f46f8f |
- if (!pw)
|
|
Jakub Filak |
f46f8f |
- perror_msg_and_die("Can't find user '%s'", user);
|
|
Jakub Filak |
f46f8f |
-
|
|
Jakub Filak |
f46f8f |
- if ((sb.st_uid != pw->pw_uid || sb.st_gid != pw->pw_gid) && lchown(dir, pw->pw_uid, pw->pw_gid) != 0)
|
|
Jakub Filak |
f46f8f |
- perror_msg_and_die("Can't set owner %u:%u on '%s'", (unsigned int)pw->pw_uid, (unsigned int)pw->pw_gid, dir);
|
|
Jakub Filak |
f46f8f |
- if ((sb.st_mode & 07777) != mode && chmod(dir, mode) != 0)
|
|
Jakub Filak |
f46f8f |
- perror_msg_and_die("Can't set mode %o on '%s'", mode, dir);
|
|
Jakub Filak |
f46f8f |
-}
|
|
Jakub Filak |
f46f8f |
-
|
|
Jakub Filak |
f46f8f |
-static void sanitize_dump_dir_rights()
|
|
Jakub Filak |
f46f8f |
-{
|
|
Jakub Filak |
f46f8f |
- /* We can't allow everyone to create dumps: otherwise users can flood
|
|
Jakub Filak |
f46f8f |
- * us with thousands of bogus or malicious dumps */
|
|
Jakub Filak |
f46f8f |
- /* 07000 bits are setuid, setgit, and sticky, and they must be unset */
|
|
Jakub Filak |
f46f8f |
- /* 00777 bits are usual "rwxrwxrwx" access rights */
|
|
Jakub Filak |
f46f8f |
- ensure_writable_dir(g_settings_dump_location, 0755, "abrt");
|
|
Jakub Filak |
f46f8f |
- /* temp dir */
|
|
Jakub Filak |
f46f8f |
- ensure_writable_dir(VAR_RUN"/abrt", 0755, "root");
|
|
Jakub Filak |
f46f8f |
-}
|
|
Jakub Filak |
f46f8f |
-
|
|
Jakub Filak |
f46f8f |
int main(int argc, char** argv)
|
|
Jakub Filak |
f46f8f |
{
|
|
Jakub Filak |
f46f8f |
/* I18n */
|
|
Jakub Filak |
f46f8f |
@@ -966,8 +983,9 @@ int main(int argc, char** argv)
|
|
Jakub Filak |
f46f8f |
perror_msg_and_die("inotify_init failed");
|
|
Jakub Filak |
f46f8f |
close_on_exec_on(inotify_fd);
|
|
Jakub Filak |
f46f8f |
|
|
Jakub Filak |
f46f8f |
- /* Watching 'g_settings_dump_location' for new files... */
|
|
Jakub Filak |
f46f8f |
- if (inotify_add_watch(inotify_fd, g_settings_dump_location, IN_CREATE | IN_MOVED_TO) < 0)
|
|
Jakub Filak |
f46f8f |
+ /* Watching 'g_settings_dump_location' for new files and delete self
|
|
Jakub Filak |
f46f8f |
+ * because hooks expects that the dump location exists if abrtd is runnig*/
|
|
Jakub Filak |
f46f8f |
+ if (inotify_add_watch(inotify_fd, g_settings_dump_location, IN_DUMP_LOCATION_FLAGS) < 0)
|
|
Jakub Filak |
f46f8f |
{
|
|
Jakub Filak |
f46f8f |
perror_msg("inotify_add_watch failed on '%s'", g_settings_dump_location);
|
|
Jakub Filak |
f46f8f |
goto init_error;
|
|
Jakub Filak |
f46f8f |
--
|
|
Jakub Filak |
f46f8f |
1.8.1.4
|
|
Jakub Filak |
f46f8f |
|