Crash-catcher

crash-catcher@lists.fedorahosted.org

2024 discussions

[PATCH libreport] dbus: Allow admins to load problems without a password
by Bastien Nocera 02 Apr '15

02 Apr '15

This allows gnome-abrt to not query for a password when an administrator opens gnome-abrt. --- src/dbus/abrt_polkit.policy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dbus/abrt_polkit.policy b/src/dbus/abrt_polkit.policy index a3425d9..a127b8f 100644 --- a/src/dbus/abrt_polkit.policy +++ b/src/dbus/abrt_polkit.policy @@ -20,7 +20,7 @@ Copyright (c) 2012 ABRT Team <crash-catcher(a)fedorahosted.com> <message>Reading others problems requires authentication</message> <defaults> <allow_any>auth_admin</allow_any> - <allow_active>auth_admin_keep</allow_active> + <allow_active>yes</allow_active> <allow_inactive>auth_admin</allow_inactive> </defaults> </action> -- 2.1.0

4 17

[PATCH] spec: Don't allow users to list problems "by hand"
by Bastien Nocera 02 Mar '15

02 Mar '15

abrt-dbus already allows users to list problems, and will make sure of filtering out problems that the user is not allowed to interact with. To avoid users knowing that particular problems are being created for another user, make sure that /var/tmp/abrt is not listable. --- abrt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abrt.spec.in b/abrt.spec.in index 53d3308..d52e66b 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -728,7 +728,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/abrt_event.conf.5.gz %config(noreplace) %{_sysconfdir}/libreport/events.d/smart_event.conf %{_mandir}/man5/smart_event.conf.5.gz -%dir %attr(0755, abrt, abrt) %{_localstatedir}/%{var_base_dir}/%{name} +%dir %attr(0750, abrt, abrt) %{_localstatedir}/%{var_base_dir}/%{name} %dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload # abrtd runs as root %dir %attr(0755, root, root) %{_localstatedir}/run/%{name} -- 2.1.0

2 2

[PATCH] dump_dir: Allow admins to modify and delete reports
by Bastien Nocera 02 Mar '15

02 Mar '15

Administrators should be able to report, modify and delete reports for other users. But we still want users for which the crashes occurred to be able to report them themselves. So add READ and WRITE ACLs to the dump directory. The ACL 'patching' is based upon systemd helper code. Closes #915 --- configure.ac | 15 +++++++ src/lib/Makefile.am | 6 ++- src/lib/acl_util.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/acl_util.h | 23 ++++++++++ src/lib/dump_dir.c | 29 +++++++++++++ 5 files changed, 189 insertions(+), 2 deletions(-) create mode 100644 src/lib/acl_util.c create mode 100644 src/lib/acl_util.h diff --git a/configure.ac b/configure.ac index c9f07bd..43e905e 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,21 @@ AC_PATH_PROG([XMLTO], [xmlto], [no]) [exit 1] [fi] +AC_CHECK_HEADERS( + [sys/acl.h acl/libacl.h], + [have_acl=yes], + [AC_MSG_ERROR([*** ACL headers not found.]) + ]) + +AC_CHECK_LIB( + [acl], + [acl_get_file], + [have_acl=yes], + [AC_MSG_ERROR([*** libacl not found.]) + ]) + +ACL_LIBS="-lacl" + AC_ARG_WITH(bugzilla, AS_HELP_STRING([--with-bugzilla],[use Bugzilla plugin (default is YES)]), LIBREPORT_PARSE_WITH([bugzilla])) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index b5de38e..d393d3d 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -66,7 +66,8 @@ libreport_la_SOURCES = \ xml_parser.c \ libreport_init.c \ reporters.c \ - global_configuration.c + global_configuration.c \ + acl_util.c acl_util.h libreport_la_CPPFLAGS = \ -I$(srcdir)/../include \ @@ -97,7 +98,8 @@ libreport_la_LIBADD = \ $(JOURNAL_LIBS) \ $(GOBJECT_LIBS) \ $(AUGEAS_LIBS) \ - $(SATYR_LIBS) + $(SATYR_LIBS) \ + $(ACL_LIBS) libreportconfdir = $(CONF_DIR) dist_libreportconf_DATA = \ diff --git a/src/lib/acl_util.c b/src/lib/acl_util.c new file mode 100644 index 0000000..fefbe1c --- /dev/null +++ b/src/lib/acl_util.c @@ -0,0 +1,118 @@ +/* + Copyright (C) 2015 Bastien Nocera <hadess(a)hadess.net> + Copyright (C) 2011, 2013 Lennart Poettering• + Copyright (C) 2015 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include <acl/libacl.h> +#include <string.h> +#include <errno.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <stdio.h> +#include <assert.h> +#include <stdbool.h> +#include <sys/types.h> +#include <dirent.h> + +#include "internal_libreport.h" + +#define IN_SET(x, y, ...) \ + ({ \ + const typeof(y) _y = (y); \ + const typeof(_y) _x = (x); \ + unsigned _i; \ + bool _found = false; \ + for (_i = 0; _i < 1 + sizeof((const typeof(_x)[]) { __VA_ARGS__ })/sizeof(const typeof(_x)); _i++) \ + if (((const typeof(_x)[]) { _y, __VA_ARGS__ })[_i] == _x) { \ + _found = true; \ + break; \ + } \ + _found; \ + }) + + +int calc_acl_mask_if_needed(acl_t *acl_p) { + acl_entry_t i; + int r; + + assert(acl_p); + + for (r = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, &i); + r > 0; + r = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, &i)) { + acl_tag_t tag; + + if (acl_get_tag_type(i, &tag) < 0) + return -errno; + + if (tag == ACL_MASK) + return 0; + if (IN_SET(tag, ACL_USER, ACL_GROUP)) + goto calc; + } + if (r < 0) + return -errno; + return 0; + +calc: + if (acl_calc_mask(acl_p) < 0) + return -errno; + return 1; +} + +int add_group_acl(int fd, gid_t gid) +{ + acl_t acl = NULL; + acl_entry_t entry; + acl_permset_t permset; + + assert(fd >= 0); + + acl = acl_get_fd(fd); + if (!acl) + { + perror_msg("Failed to get ACL: %s", strerror(errno)); + return -errno; + } + + if (acl_create_entry(&acl, &entry) < 0 || + acl_set_tag_type(entry, ACL_GROUP) < 0 || + acl_set_qualifier(entry, &gid) < 0) { + perror_msg("Failed to patch ACL: %s", strerror(errno)); + acl_free(&acl); + return -errno; + } + + if (acl_get_permset(entry, &permset) < 0 || + acl_add_perm(permset, ACL_READ) < 0 || + acl_add_perm(permset, ACL_WRITE) < 0 || + calc_acl_mask_if_needed(&acl) < 0) { + perror_msg("Failed to patch ACL: %s", strerror(errno)); + acl_free(&acl); + return -errno; + } + + if (acl_set_fd(fd, acl) < 0) { + acl_free(&acl); + perror_msg("Failed to apply ACL: %s", strerror(errno)); + return -errno; + } + + acl_free(&acl); + return 0; +} diff --git a/src/lib/acl_util.h b/src/lib/acl_util.h new file mode 100644 index 0000000..7d8684d --- /dev/null +++ b/src/lib/acl_util.h @@ -0,0 +1,23 @@ +/* + Copyright (C) 2015 Bastien Nocera <hadess(a)hadess.net> + Copyright (C) 2011, 2013 Lennart Poettering• + Copyright (C) 2015 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include <grp.h> + +int add_group_acl(int fd, gid_t gid); diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c index d50ebf7..49dc8ca 100644 --- a/src/lib/dump_dir.c +++ b/src/lib/dump_dir.c @@ -18,6 +18,7 @@ */ #include <sys/utsname.h> #include "internal_libreport.h" +#include "acl_util.h" // Locking logic: // @@ -621,6 +622,34 @@ struct dump_dir *dd_create(const char *dir, uid_t uid, mode_t mode) } } + /* Allow 'wheel' users (admins) to modify dump dirs */ + { + /* Get wheel's group gid */ + struct group *gr = getgrnam("wheel"); + if (!gr) + { + error_msg("Group 'wheel' does not exist, not adding ACLs"); + } + else + { + DIR *d; + + d = opendir(dir); + if (!d) + { + error_msg("Can't open '%s' to add ACLs", dir); + } + else + { + int fd; + + fd = dirfd(d); + add_group_acl(fd, gr->gr_gid); + closedir(d); + } + } + } + return dd; } -- 2.1.0

1 1

[PATCH libreport] dump_dir: Allow admins to modify and delete reports
by Bastien Nocera 25 Feb '15

25 Feb '15

Administrators should be able to report, modify and delete reports for other users. But we still want users for which the crashes occurred to be able to report them themselves. So add READ and WRITE ACLs to the dump directory. The ACL 'patching' is based upon systemd helper code. Closes #915 --- configure.ac | 15 +++++++ src/lib/Makefile.am | 6 ++- src/lib/acl_util.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/acl_util.h | 23 ++++++++++ src/lib/dump_dir.c | 29 +++++++++++++ 5 files changed, 189 insertions(+), 2 deletions(-) create mode 100644 src/lib/acl_util.c create mode 100644 src/lib/acl_util.h diff --git a/configure.ac b/configure.ac index 15acd2a..2c1a0cf 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,21 @@ AC_PATH_PROG([XMLTO], [xmlto], [no]) [exit 1] [fi] +AC_CHECK_HEADERS( + [sys/acl.h acl/libacl.h], + [have_acl=yes], + [AC_MSG_ERROR([*** ACL headers not found.]) + ]) + +AC_CHECK_LIB( + [acl], + [acl_get_file], + [have_acl=yes], + [AC_MSG_ERROR([*** libacl not found.]) + ]) + +ACL_LIBS="-lacl" + AC_ARG_WITH(bugzilla, AS_HELP_STRING([--with-bugzilla],[use Bugzilla plugin (default is YES)]), LIBREPORT_PARSE_WITH([bugzilla])) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 1a52931..799f124 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -58,7 +58,8 @@ libreport_la_SOURCES = \ config_item_info.c \ xml_parser.c \ libreport_init.c \ - reporters.c + reporters.c \ + acl_util.c acl_util.h libreport_la_CPPFLAGS = \ -I$(srcdir)/../include \ @@ -89,7 +90,8 @@ libreport_la_LIBADD = \ $(JOURNAL_LIBS) \ $(GOBJECT_LIBS) \ $(AUGEAS_LIBS) \ - $(SATYR_LIBS) + $(SATYR_LIBS) \ + $(ACL_LIBS) libreportconfdir = $(CONF_DIR) dist_libreportconf_DATA = \ diff --git a/src/lib/acl_util.c b/src/lib/acl_util.c new file mode 100644 index 0000000..fefbe1c --- /dev/null +++ b/src/lib/acl_util.c @@ -0,0 +1,118 @@ +/* + Copyright (C) 2015 Bastien Nocera <hadess(a)hadess.net> + Copyright (C) 2011, 2013 Lennart Poettering• + Copyright (C) 2015 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include <acl/libacl.h> +#include <string.h> +#include <errno.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <stdio.h> +#include <assert.h> +#include <stdbool.h> +#include <sys/types.h> +#include <dirent.h> + +#include "internal_libreport.h" + +#define IN_SET(x, y, ...) \ + ({ \ + const typeof(y) _y = (y); \ + const typeof(_y) _x = (x); \ + unsigned _i; \ + bool _found = false; \ + for (_i = 0; _i < 1 + sizeof((const typeof(_x)[]) { __VA_ARGS__ })/sizeof(const typeof(_x)); _i++) \ + if (((const typeof(_x)[]) { _y, __VA_ARGS__ })[_i] == _x) { \ + _found = true; \ + break; \ + } \ + _found; \ + }) + + +int calc_acl_mask_if_needed(acl_t *acl_p) { + acl_entry_t i; + int r; + + assert(acl_p); + + for (r = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, &i); + r > 0; + r = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, &i)) { + acl_tag_t tag; + + if (acl_get_tag_type(i, &tag) < 0) + return -errno; + + if (tag == ACL_MASK) + return 0; + if (IN_SET(tag, ACL_USER, ACL_GROUP)) + goto calc; + } + if (r < 0) + return -errno; + return 0; + +calc: + if (acl_calc_mask(acl_p) < 0) + return -errno; + return 1; +} + +int add_group_acl(int fd, gid_t gid) +{ + acl_t acl = NULL; + acl_entry_t entry; + acl_permset_t permset; + + assert(fd >= 0); + + acl = acl_get_fd(fd); + if (!acl) + { + perror_msg("Failed to get ACL: %s", strerror(errno)); + return -errno; + } + + if (acl_create_entry(&acl, &entry) < 0 || + acl_set_tag_type(entry, ACL_GROUP) < 0 || + acl_set_qualifier(entry, &gid) < 0) { + perror_msg("Failed to patch ACL: %s", strerror(errno)); + acl_free(&acl); + return -errno; + } + + if (acl_get_permset(entry, &permset) < 0 || + acl_add_perm(permset, ACL_READ) < 0 || + acl_add_perm(permset, ACL_WRITE) < 0 || + calc_acl_mask_if_needed(&acl) < 0) { + perror_msg("Failed to patch ACL: %s", strerror(errno)); + acl_free(&acl); + return -errno; + } + + if (acl_set_fd(fd, acl) < 0) { + acl_free(&acl); + perror_msg("Failed to apply ACL: %s", strerror(errno)); + return -errno; + } + + acl_free(&acl); + return 0; +} diff --git a/src/lib/acl_util.h b/src/lib/acl_util.h new file mode 100644 index 0000000..7d8684d --- /dev/null +++ b/src/lib/acl_util.h @@ -0,0 +1,23 @@ +/* + Copyright (C) 2015 Bastien Nocera <hadess(a)hadess.net> + Copyright (C) 2011, 2013 Lennart Poettering• + Copyright (C) 2015 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include <grp.h> + +int add_group_acl(int fd, gid_t gid); diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c index d50ebf7..49dc8ca 100644 --- a/src/lib/dump_dir.c +++ b/src/lib/dump_dir.c @@ -18,6 +18,7 @@ */ #include <sys/utsname.h> #include "internal_libreport.h" +#include "acl_util.h" // Locking logic: // @@ -621,6 +622,34 @@ struct dump_dir *dd_create(const char *dir, uid_t uid, mode_t mode) } } + /* Allow 'wheel' users (admins) to modify dump dirs */ + { + /* Get wheel's group gid */ + struct group *gr = getgrnam("wheel"); + if (!gr) + { + error_msg("Group 'wheel' does not exist, not adding ACLs"); + } + else + { + DIR *d; + + d = opendir(dir); + if (!d) + { + error_msg("Can't open '%s' to add ACLs", dir); + } + else + { + int fd; + + fd = dirfd(d); + add_group_acl(fd, gr->gr_gid); + closedir(d); + } + } + } + return dd; } -- 2.1.0

1 0

[Bug 851210] [abrt] will-crash-0.2-1.fc17: main: Process /usr/bin/will_abort was killed by signal 6 (SIGABRT)
by Red Hat Bugzilla 17 Feb '15

17 Feb '15

https://bugzilla.redhat.com/show_bug.cgi?id=851210 Fedora End Of Life <endoflife(a)fedoraproject.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution|--- |EOL Last Closed|2013-08-01 05:54:33 |2015-02-17 09:25:50 --- Comment #25 from Fedora End Of Life <endoflife(a)fedoraproject.org> --- Fedora 19 changed to end-of-life (EOL) status on 2015-01-06. Fedora 19 is no longer maintained, which means that it will not receive any further security or bug fix updates. As a result we are closing this bug. If you can reproduce this bug against a currently maintained version of Fedora please feel free to reopen this bug against that version. If you are unable to reopen this bug, please file a new report against the current release. If you experience problems, please add a comment to this bug. Thank you for reporting this bug and we are sorry it could not be fixed. -- You are receiving this mail because: You reported the bug.

1 0

[PATCH] build: Launch configure after autogen.sh
by Bastien Nocera 21 Jan '15

21 Jan '15

As is common amongst other autotools-based projects. --- autogen.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autogen.sh b/autogen.sh index 5468271..acdb621 100755 --- a/autogen.sh +++ b/autogen.sh @@ -68,3 +68,5 @@ case "$1" in automake --add-missing --force --copy || exit 1 ;; esac + +./configure "$@" -- 2.1.0

1 1

[PATCH] applet: Remove the automatic crash reporting message dialog
by Bastien Nocera 21 Jan '15

21 Jan '15

See https://github.com/abrt/gnome-abrt/issues/74#issuecomment-68704587 --- src/applet/applet.c | 63 ----------------------------------------------------- 1 file changed, 63 deletions(-) diff --git a/src/applet/applet.c b/src/applet/applet.c index 4f5d587..4d2949c 100644 --- a/src/applet/applet.c +++ b/src/applet/applet.c @@ -91,27 +91,6 @@ static bool is_autoreporting_enabled(void) return ret; } -static bool is_ureport_auth_enabled(void) -{ - bool success, auth_enabled; - map_string_t *settings = new_map_string(); - char *ureport_conf_path = concat_path_file(LIBREPORT_PLUGINS_CONF_DIR, "ureport.conf"); - - success = load_conf_file(ureport_conf_path, settings, /*skipKeysWithoutValue*/false); - if (success) - { - const char *value = get_map_string_item_or_NULL(settings, "SSLClientAuth"); - auth_enabled = (value && value[0] != '\0'); - } - else - auth_enabled = true; /* assume it is, do not claim the reporting is anonymous */ - - free(ureport_conf_path); - free_map_string(settings); - - return auth_enabled; -} - static const char *get_autoreport_event_name(void) { load_user_settings("abrt-applet"); @@ -119,45 +98,6 @@ static const char *get_autoreport_event_name(void) return configured ? configured : g_settings_autoreporting_event; } -static void ask_start_autoreporting() -{ - struct strbuf *question = strbuf_new(); - question = strbuf_append_str(question, - _("The report which will be sent does not contain any security sensitive data. " - "Therefore it is not necessary to bother you next time and require any further action by you. \n")); - - if (is_ureport_auth_enabled()) - { - question = strbuf_append_str(question, - _("Do you want to enable automatically submitted crash reports?")); - } - else - { - question = strbuf_append_str(question, - _("Do you want to enable automatically submitted anonymous crash reports?")); - } - - /* The "Yes" response will be saved even if user don't check the - * "Don't ask me again" box. - */ - const int ret = run_ask_yes_no_save_result_dialog("AutoreportingEnabled", question->buf, - /*parent wnd */ NULL); - strbuf_free(question); - - load_user_settings("abrt-applet"); - - /* Don't forget: - * - * The "Yes" response will be saved even if user don't check the - * "Don't ask me again" box. - */ - if (ret != 0) - set_user_setting("AutoreportingEnabled", "yes"); - - /* must be called immediately, otherwise the data could be lost in case of crash */ - save_user_settings(); -} - static bool is_shortened_reporting_enabled() { return get_configured_bool_or_default("ShortenedReporting", g_settings_shortenedreporting); @@ -597,9 +537,6 @@ static void action_report(NotifyNotification *notification, gchar *action, gpoin } else { - if (pi->foreign == false && strcmp(A_REPORT_AUTOREPORT, action) == 0) - ask_start_autoreporting(); - /* if shortened reporting is configured don't start reporting process * when problem is unknown (just show notification) */ run_event_async(pi, get_autoreport_event_name(), -- 2.1.0

2 1

[PATCH] applet: Use GNetworkMonitor instead of NM directly
by Bastien Nocera 21 Jan '15

21 Jan '15

GLib 2.44 (and development version 2.43) has support for checking the connectivity level. This nicely replaces all the custom code that talked to NetworkManager directly. --- configure.ac | 2 +- src/applet/applet.c | 146 ++++++---------------------------------------------- 2 files changed, 16 insertions(+), 132 deletions(-) diff --git a/configure.ac b/configure.ac index d7e0ea5..436cfcd 100644 --- a/configure.ac +++ b/configure.ac @@ -129,7 +129,7 @@ AC_SUBST(py3execdir, $PYTHON3_EXECDIR) PKG_CHECK_MODULES([XICE], [ice]) PKG_CHECK_MODULES([XSMP], [sm]) PKG_CHECK_MODULES([GTK], [gtk+-3.0]) -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.43]) PKG_CHECK_MODULES([DBUS], [dbus-1]) PKG_CHECK_MODULES([LIBXML], [libxml-2.0]) PKG_CHECK_MODULES([RPM], [rpm]) diff --git a/src/applet/applet.c b/src/applet/applet.c index 644da60..e5ac02a 100644 --- a/src/applet/applet.c +++ b/src/applet/applet.c @@ -38,14 +38,6 @@ #include "libabrt.h" #include "problem_api.h" -/* NetworkManager DBus configuration */ -#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" -#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" -#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" -#define NM_STATE_CONNECTED_LOCAL 50 -#define NM_STATE_CONNECTED_SITE 60 -#define NM_STATE_CONNECTED_GLOBAL 70 - /* libnotify action keys */ #define A_KNOWN_OPEN_GUI "OPEN" #define A_REPORT_REPORT "REPORT" @@ -67,7 +59,7 @@ enum }; -static GDBusConnection *g_system_bus; +static GNetworkMonitor *netmon; static GtkStatusIcon *ap_status_icon; static GtkWidget *ap_menu; static char **s_dirs; @@ -176,99 +168,11 @@ static bool is_notification_of_incomplete_problems_enabled(void) return get_configured_bool_or_default("NotifyIncompleteProblems", 0); } -/* - * Converts a NM state value stored in GVariant to boolean. - * - * Returns true if a state means connected. - * - * Sinks the args variant. - */ -static bool nm_state_is_connected(GVariant *args) -{ - GVariant *value = g_variant_get_child_value(args, 0); - - if (g_variant_is_of_type(value, G_VARIANT_TYPE_VARIANT)) - { - GVariant *tmp = g_variant_get_child_value(value, 0); - g_variant_unref(value); - value = tmp; - } - - int state = g_variant_get_uint32 (value); - - g_variant_unref(value); - g_variant_unref(args); - - return state == NM_STATE_CONNECTED_GLOBAL - || state == NM_STATE_CONNECTED_LOCAL - || state == NM_STATE_CONNECTED_SITE; -} - -/* - * The function tries to get network state from NetworkManager over DBus - * call. If NetworkManager DBus service is not available the function returns - * true which means that network is enabled and up. - * - * Function must return true on any error, otherwise user won't be notified - * about new problems. Because if network is not enabled, new problems are - * pushed to the deferred queue. The deferred queue is processed immediately - * after network becomes enabled. In case where NetworkManager is broken or not - * available, notification about network state doesn't work thus the deferred - * queue won't be ever processed. - */ static bool is_networking_enabled(void) { - GError *error = NULL; - - /* Create a D-Bus proxy to get the object properties from the NM Manager - * object. - */ - const int flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES - | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS; - - GDBusProxy *props_proxy = g_dbus_proxy_new_sync(g_system_bus, - flags, - NULL /* GDBusInterfaceInfo */, - NM_DBUS_SERVICE, - NM_DBUS_PATH, - DBUS_INTERFACE_PROPERTIES, - NULL /* GCancellable */, - &error); - - if (!props_proxy) - { - /* The NetworkManager DBus service is not available. */ - error_msg (_("Can't connect to NetworkManager over DBus: %s"), error->message); - g_error_free (error); - - /* Consider network state as connected. */ - return true; - } - - /* Get the State property from the NM Manager object */ - GVariant *const value = g_dbus_proxy_call_sync (props_proxy, - "Get", - g_variant_new("(ss)", NM_DBUS_INTERFACE, "State"), - G_DBUS_PROXY_FLAGS_NONE, - -1 /* timeout: use proxy default */, - NULL /* GCancellable */, - &error); - - /* Consider network state as connected if any error occurs */ - bool ret = true; - - if (!error) - /* Convert the state value and sink the variable */ - ret = nm_state_is_connected(value); - else - { - error_msg (_("Can't determine network status via NetworkManager: %s"), error->message); - g_error_free (error); - } - - g_object_unref(props_proxy); - - return ret; + if (!g_network_monitor_get_network_available(netmon)) + return FALSE; + return g_network_monitor_get_connectivity(netmon) == G_NETWORK_CONNECTIVITY_FULL; } static void show_problem_list_notification(GList *problems, int flags); @@ -282,14 +186,12 @@ static gboolean process_deferred_queue_timeout_fn(GList *queue) return FALSE; } -static void on_nm_state_changed(GDBusConnection *connection, const gchar *sender_name, - const gchar *object_path, const gchar *interface_name, - const gchar *signal_name, GVariant *parameters, - gpointer user_data) +static void connectivity_changed_cb(GObject *gobject, + GParamSpec *pspec, + gpointer user_data) { - g_variant_ref(parameters); - - if (nm_state_is_connected(parameters)) + if (g_network_monitor_get_network_available(netmon) && + g_network_monitor_get_connectivity(netmon) == G_NETWORK_CONNECTIVITY_FULL) { if (g_deferred_timeout) g_source_remove(g_deferred_timeout); @@ -1610,27 +1512,12 @@ int main(int argc, char** argv) glib_init(); - /* Monitor 'StateChanged' signal on 'org.freedesktop.NetworkManager' interface */ - GError *error = NULL; - g_system_bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); - - if (g_system_bus == NULL) - { - error_msg("Error creating D-Bus proxy: %s\n", error->message); - g_error_free(error); - return -1; - } - - const guint signal_ret = g_dbus_connection_signal_subscribe(g_system_bus, - NM_DBUS_SERVICE, - NM_DBUS_INTERFACE, - "StateChanged", - NM_DBUS_PATH, - /* arg0 */ NULL, - G_DBUS_SIGNAL_FLAGS_NONE, - on_nm_state_changed, - /* user_data */ NULL, - /* user_data_free_func */ NULL); + /* Monitor NetworkManager state */ + netmon = g_network_monitor_get_default (); + g_signal_connect (G_OBJECT (netmon), "notify::connectivity", + G_CALLBACK (connectivity_changed_cb), NULL); + g_signal_connect (G_OBJECT (netmon), "notify::network-available", + G_CALLBACK (connectivity_changed_cb), NULL); g_set_prgname("abrt"); gtk_init(&argc, &argv); @@ -1858,9 +1745,6 @@ next: * save_user_settings(); */ - g_dbus_connection_signal_unsubscribe(g_system_bus, signal_ret); - g_object_unref(g_system_bus); - free(g_last_notified_problem_id); return 0; -- 2.1.0

2 4

[PATCH] applet: Remove pointless custom signal handling
by Bastien Nocera 21 Jan '15

21 Jan '15

None of the actions we're supposed to be taking after the main loop should be necessary at that point in time. Let GTK+ handle that as it should by exiting if the SIGTERM signal is sent. --- src/applet/applet.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/src/applet/applet.c b/src/applet/applet.c index 1aa8cfe..4f5d587 100644 --- a/src/applet/applet.c +++ b/src/applet/applet.c @@ -65,7 +65,6 @@ static GtkWidget *ap_menu; static char **s_dirs; static GList *g_deferred_crash_queue; static guint g_deferred_timeout; -static int g_signal_pipe[2]; static ignored_problems_t *g_ignore_set; /* Used only for selection of the last notified problem if a user clicks on the systray icon */ static char *g_last_notified_problem_id; @@ -1295,35 +1294,6 @@ static void die_if_dbus_error(bool error_flag, DBusError* err, const char* msg) error_msg_and_die("%s", msg); } -static void handle_signal(int signo) -{ - int save_errno = errno; - - // Enable for debugging only, malloc/printf are unsafe in signal handlers - //log_debug("Got signal %d", signo); - - uint8_t sig_caught = signo; - if (write(g_signal_pipe[1], &sig_caught, 1)) - /* we ignore result, if () shuts up stupid compiler */; - - errno = save_errno; -} - -static gboolean handle_sigterm_pipe(GIOChannel *gio, GIOCondition condition, gpointer ptr_unused) -{ - /* It can be only SIGTERM. - * We are going to quit. - * Therefore No read from the channel is necessary. - */ - - /* Next received SIGTERM will kill the applet. */ - signal(SIGTERM, SIG_DFL); - - gtk_main_quit(); - - return FALSE; /* Pointless (loop is done and signal handler was reset); "please remove this event" */ -} - /* * XSMP client */ @@ -1686,32 +1656,14 @@ next: * the seen list. */ - /* Set up signal pipe */ - xpipe(g_signal_pipe); - close_on_exec_on(g_signal_pipe[0]); - close_on_exec_on(g_signal_pipe[1]); - ndelay_on(g_signal_pipe[0]); - ndelay_on(g_signal_pipe[1]); - signal(SIGTERM, handle_signal); - GIOChannel *channel_id_signal = my_io_channel_unix_new(g_signal_pipe[0]); - g_io_add_watch(channel_id_signal, - G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, - handle_sigterm_pipe, - NULL); - /* Register a handler quiting from gtk main loop on X Session death. */ xsmp_client_connect(); /* Enter main loop - * - * Returns on SIGTERM signal, on menu button Quit click or on X Session - * death. */ gtk_main(); - g_io_channel_unref(channel_id_signal); - ignored_problems_free(g_ignore_set); #if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31) -- 2.1.0

2 8

[PATCH] applet: Remove pre-glib 2.32 code
by Bastien Nocera 21 Jan '15

21 Jan '15

As we bumped the GLib requirements, there's no need to keep code to support older versions. --- src/applet/applet.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/applet/applet.c b/src/applet/applet.c index 4d2949c..5778263 100644 --- a/src/applet/applet.c +++ b/src/applet/applet.c @@ -1409,21 +1409,6 @@ int main(int argc, char** argv) #endif abrt_init(argv); - /* Glib 2.31: - * Major changes to threading and synchronisation - * - threading is now always enabled in GLib - * - support for custom thread implementations (including our own internal - * - support for errorcheck mutexes) has been removed - */ -#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31) - //can't use log(), because g_verbose is not set yet - /* Need to be thread safe */ - g_thread_init(NULL); - gdk_threads_init(); - gdk_threads_enter(); -#endif - - glib_init(); /* Monitor NetworkManager state */ netmon = g_network_monitor_get_default (); @@ -1603,10 +1588,6 @@ next: ignored_problems_free(g_ignore_set); -#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31) - gdk_threads_leave(); -#endif - /* new_dir_exists() is called for each notification and if user clicks on * the abrt icon. Those calls cover 99.97% of detected crashes * -- 2.1.0

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Crash-catcher