ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: syslog: only load Sys::Syslog module if configuration option is set; soft-fail on syslog calls

pull/88/head
Axel Burri 2016-04-25 18:36:15 +02:00
parent 59d96420c8
commit c424d917b6
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
btrbk
View File

@ -45,8 +45,6 @@ use warnings FATAL => qw( all );
use Carp qw(confess); use Carp qw(confess);
use Getopt::Long qw(GetOptions); use Getopt::Long qw(GetOptions);
use Time::Local qw( timelocal timegm timegm_nocheck ); use Time::Local qw( timelocal timegm timegm_nocheck );
use Sys::Syslog;
use Sys::Syslog qw(:standard :macros);
our $VERSION = "0.23.1-dev"; our $VERSION = "0.23.1-dev";
our $AUTHOR = 'Axel Burri <axel@tty0.ch>'; our $AUTHOR = 'Axel Burri <axel@tty0.ch>';
@ -71,11 +69,7 @@ my $ssh_cipher_match = qr/[a-z0-9][a-z0-9@.-]+/;
my $safe_cmd_match = qr/[0-9a-zA-Z_@=\+\-\.\/]+/; # $file_match plus '=': good enough for our purpose my $safe_cmd_match = qr/[0-9a-zA-Z_@=\+\-\.\/]+/; # $file_match plus '=': good enough for our purpose
my %day_of_week_map = ( sunday => 0, monday => 1, tuesday => 2, wednesday => 3, thursday => 4, friday => 5, saturday => 6 ); my %day_of_week_map = ( sunday => 0, monday => 1, tuesday => 2, wednesday => 3, thursday => 4, friday => 5, saturday => 6 );
my %syslog_facility_map = ( my @syslog_facilities = qw( user mail daemon auth lpr news cron authpriv local0 local1 local2 local3 local4 local5 local6 local7 );
user => LOG_USER, mail => LOG_MAIL, daemon => LOG_DAEMON, auth => LOG_AUTH, lpr => LOG_LPR, news => LOG_NEWS,
cron => LOG_CRON, authpriv => LOG_AUTHPRIV, local0 => LOG_LOCAL0, local1 => LOG_LOCAL1, local2 => LOG_LOCAL2,
local3 => LOG_LOCAL3, local4 => LOG_LOCAL4, local5 => LOG_LOCAL5, local6 => LOG_LOCAL6, local7 => LOG_LOCAL7,
);
my %config_options = ( my %config_options = (
# NOTE: the parser always maps "no" to undef # NOTE: the parser always maps "no" to undef
@ -101,7 +95,7 @@ my %config_options = (
ssh_cipher_spec => { default => "default", accept_regexp => qr/^$ssh_cipher_match(,$ssh_cipher_match)*$/ }, ssh_cipher_spec => { default => "default", accept_regexp => qr/^$ssh_cipher_match(,$ssh_cipher_match)*$/ },
rate_limit => { default => undef, accept => [ "no" ], accept_regexp => qr/^[0-9]+[kmgt]?$/, require_bin => '/usr/bin/pv' }, rate_limit => { default => undef, accept => [ "no" ], accept_regexp => qr/^[0-9]+[kmgt]?$/, require_bin => '/usr/bin/pv' },
transaction_log => { default => undef, accept_file => { absolute => 1 } }, transaction_log => { default => undef, accept_file => { absolute => 1 } },
transaction_syslog => { default => undef, accept => [ keys %syslog_facility_map ] }, transaction_syslog => { default => undef, accept => \@syslog_facilities },
raw_target_compress => { default => undef, accept => [ "no", "gzip", "bzip2", "xz" ] }, raw_target_compress => { default => undef, accept => [ "no", "gzip", "bzip2", "xz" ] },
raw_target_compress_level => { default => "default", accept => [ "default" ], accept_numeric => 1 }, raw_target_compress_level => { default => "default", accept => [ "default" ], accept_numeric => 1 },
@ -332,6 +326,7 @@ sub ABORTED($;$)
sub init_transaction_log($$) sub init_transaction_log($$)
{ {
my $file = shift; my $file = shift;
my $config_syslog_facility = shift;
if(defined($file) && (not $dryrun)) { if(defined($file) && (not $dryrun)) {
if(open($tlog_fh, ">> $file")) { if(open($tlog_fh, ">> $file")) {
# print headers # print headers
@ -342,10 +337,16 @@ sub init_transaction_log($$)
ERROR "Failed to open transaction log '$file': $!"; ERROR "Failed to open transaction log '$file': $!";
} }
} }
my $config_syslog_facility = shift;
if(defined($config_syslog_facility) && (not $dryrun)) { if(defined($config_syslog_facility) && (not $dryrun)) {
$syslog_facility = $syslog_facility_map{$config_syslog_facility}; eval { local $SIG{'__DIE__'};
openlog("btrbk", 0, $syslog_facility); require Sys::Syslog;
};
if($@) {
WARN "Syslog disabled: $@";
} else {
$syslog_facility = $config_syslog_facility;
Sys::Syslog::openlog("btrbk", "", $syslog_facility);
}
} }
action("startup", status => "v$VERSION", message => "$VERSION_INFO"); action("startup", status => "v$VERSION", message => "$VERSION_INFO");
} }
@ -356,7 +357,11 @@ sub close_transaction_log()
DEBUG "Closing transaction log"; DEBUG "Closing transaction log";
close $tlog_fh || ERROR "Failed to close transaction log: $!"; close $tlog_fh || ERROR "Failed to close transaction log: $!";
} }
closelog if defined $syslog_facility; if(defined($syslog_facility)) {
eval { local $SIG{'__DIE__'};
Sys::Syslog::closelog();
};
}
} }
sub action($@) sub action($@)
@ -374,7 +379,10 @@ sub action($@)
print_formatted("transaction", [ $h ], output_format => "syslog", no_header => 1, outfile => $msg_fh); print_formatted("transaction", [ $h ], output_format => "syslog", no_header => 1, outfile => $msg_fh);
seek($msg_fh, 0, 0); seek($msg_fh, 0, 0);
while (my $line = <$msg_fh>) { while (my $line = <$msg_fh>) {
syslog(LOG_INFO, $line); eval { local $SIG{'__DIE__'};
Sys::Syslog::syslog("info", $line);
};
if($@) { WARN "syslog failed: $@"; }
} }
close $msg_fh; close $msg_fh;
} }