mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-01 23:05:11 +00:00
Code Issues Releases Wiki Activity

utils/aa-notify:

Browse Source 
- set HOME (and DISPLAY) only once on startup to avoid NSS lookups

Acked-by: Jamie Strandboge <jamie@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
Acked-by: Christian Boltz <opensuse@cboltz.de>
This commit is contained in:
Jamie Strandboge
2011-09-30 18:00:52 -05:00
parent a4d4eddd92
commit a30dfb6b19
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
utils/aa-notify
View File

@@ -36,6 +36,8 @@ my %prefs;
my $conf = "/etc/apparmor/notify.conf"; my $conf = "/etc/apparmor/notify.conf";
my $user_conf = "$ENV{HOME}/.apparmor/notify.conf"; my $user_conf = "$ENV{HOME}/.apparmor/notify.conf";
my $notify_exe = "/usr/bin/notify-send"; my $notify_exe = "/usr/bin/notify-send";
my $notify_home = "";
my $notify_display = "";
my $last_exe = "/usr/bin/last"; my $last_exe = "/usr/bin/last";
my $ps_exe = "/bin/ps"; my $ps_exe = "/bin/ps";
my $url = "https://wiki.ubuntu.com/DebuggingApparmor"; my $url = "https://wiki.ubuntu.com/DebuggingApparmor";
@@ -154,6 +156,12 @@ if (-s $conf) {
if ($opt_p) { if ($opt_p) {
-x "$notify_exe" or _error("Could not find '$notify_exe'. Please install libnotify-bin. Aborting"); -x "$notify_exe" or _error("Could not find '$notify_exe'. Please install libnotify-bin. Aborting");
# we need correct values for $HOME and $DISPLAY environment variables,
# otherwise $notify_exe won't be able to connect to DBUS to display the
# message. Do this here to avoid excessive lookups.
$notify_home = (getpwuid $>)[7]; # homedir of the user
# TODO: set $notify_display;
} elsif ($opt_l) { } elsif ($opt_l) {
-x "$last_exe" or _error("Could not find '$last_exe'. Aborting"); -x "$last_exe" or _error("Could not find '$last_exe'. Aborting");
} }
@@ -305,10 +313,9 @@ sub send_message {
# notify-send needs $< to be the unprivileged user # notify-send needs $< to be the unprivileged user
$< = $>; $< = $>;
# we need correct values for $HOME and $DISPLAY environment variables, otherwise $notify_home ne "" and $ENV{'HOME'} = $notify_home;
# $notify_exe won't be able to connect to DBUS to display the message $notify_display ne "" and $ENV{'DISPLAY'} = $notify_display;
$ENV{'HOME'} = (getpwuid $>)[7]; # homedir of the user
# TODO: set $ENV{'DISPLAY'}
# 'system' uses execvp() so no shell metacharacters here. # 'system' uses execvp() so no shell metacharacters here.
# $notify_exe is an absolute path so execvp won't search PATH. # $notify_exe is an absolute path so execvp won't search PATH.
system "$notify_exe", "-i", "gtk-dialog-warning", "-u", "critical", "--", "AppArmor Message", "$msg"; system "$notify_exe", "-i", "gtk-dialog-warning", "-u", "critical", "--", "AppArmor Message", "$msg";