GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-23 04:19:27 +01:00
Code Issues Projects Releases Wiki Activity

Use SafeFilename in factlog and factundo/redo

Browse Source
This commit is contained in:
Pragmatic Software 2017-09-04 19:07:10 -07:00
parent 5e6e5cb21d
commit a805fe26e4
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
PBot/FactoidCommands.pm
View File

@ -19,6 +19,8 @@ use Getopt::Long qw(GetOptionsFromString);
use POSIX qw(strftime); use POSIX qw(strftime);
use Storable; use Storable;
use PBot::Utils::SafeFilename;
sub new { sub new {
if(ref($_[1]) eq 'HASH') { if(ref($_[1]) eq 'HASH') {
Carp::croak("Options to FactoidCommands should be key/value pairs, not hash reference"); Carp::croak("Options to FactoidCommands should be key/value pairs, not hash reference");
@ -118,8 +120,11 @@ sub log_factoid {
my $channel_path = $channel; my $channel_path = $channel;
$channel_path = 'global' if $channel_path eq '.*'; $channel_path = 'global' if $channel_path eq '.*';
my $channel_path_safe = safe_filename $channel_path;
my $trigger_safe = safe_filename $trigger;
my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog'; my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog';
open my $fh, ">> $path/$trigger.$channel_path" or do { open my $fh, ">> $path/$trigger_safe.$channel_path_safe" or do {
$self->{pbot}->{logger}->log("Failed to open factlog for $channel/$trigger: $!\n"); $self->{pbot}->{logger}->log("Failed to open factlog for $channel/$trigger: $!\n");
return; return;
}; };
@ -130,7 +135,7 @@ sub log_factoid {
return if $dont_save_undo; return if $dont_save_undo;
my $undos = eval { retrieve("$path/$trigger.$channel_path.undo"); }; my $undos = eval { retrieve("$path/$trigger_safe.$channel_path_safe.undo"); };
if (not $undos) { if (not $undos) {
$undos = { $undos = {
@ -152,7 +157,8 @@ sub log_factoid {
push @{$undos->{list}}, $self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger}; push @{$undos->{list}}, $self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger};
$undos->{idx}++; $undos->{idx}++;
store $undos, "$path/$trigger.$channel_path.undo"; eval { store $undos, "$path/$trigger_safe.$channel_path_safe.undo"; };
$self->{pbot}->{logger}->log("Error storing undo: $@\n") if $@;
} }
sub find_factoid_with_optional_channel { sub find_factoid_with_optional_channel {
@ -285,8 +291,11 @@ sub factundo {
my $channel_path = $channel; my $channel_path = $channel;
$channel_path = 'global' if $channel_path eq '.*'; $channel_path = 'global' if $channel_path eq '.*';
my $channel_path_safe = safe_filename $channel_path;
my $trigger_safe = safe_filename $trigger;
my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog'; my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog';
my $undos = eval { retrieve("$path/$trigger.$channel_path.undo"); }; my $undos = eval { retrieve("$path/$trigger_safe.$channel_path_safe.undo"); };
if (not $undos) { if (not $undos) {
return "There are no undos available for [$channel] $trigger."; return "There are no undos available for [$channel] $trigger.";
@ -298,7 +307,8 @@ sub factundo {
unless ($deleted) { unless ($deleted) {
$undos->{idx}--; $undos->{idx}--;
store $undos, "$path/$trigger.$channel_path.undo"; eval { store $undos, "$path/$trigger_safe.$channel_path_safe.undo"; };
$self->{pbot}->{logger}->log("Error storing undo: $@\n") if $@;
} }
$self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger} = $undos->{list}->[$undos->{idx}]; $self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger} = $undos->{list}->[$undos->{idx}];
@ -318,8 +328,11 @@ sub factredo {
my $channel_path = $channel; my $channel_path = $channel;
$channel_path = 'global' if $channel_path eq '.*'; $channel_path = 'global' if $channel_path eq '.*';
my $channel_path_safe = safe_filename $channel_path;
my $trigger_safe = safe_filename $trigger;
my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog'; my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog';
my $undos = eval { retrieve("$path/$trigger.$channel_path.undo"); }; my $undos = eval { retrieve("$path/$trigger_safe.$channel_path_safe.undo"); };
if (not $undos) { if (not $undos) {
return "There are no redos available for [$channel] $trigger."; return "There are no redos available for [$channel] $trigger.";
@ -330,7 +343,8 @@ sub factredo {
} }
$undos->{idx}++; $undos->{idx}++;
store $undos, "$path/$trigger.$channel_path.undo"; eval { store $undos, "$path/$trigger_safe.$channel_path_safe.undo"; };
$self->{pbot}->{logger}->log("Error storing undo: $@\n") if $@;
$self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger} = $undos->{list}->[$undos->{idx}]; $self->{pbot}->{factoids}->{factoids}->hash->{$channel}->{$trigger} = $undos->{list}->[$undos->{idx}];
@ -866,7 +880,11 @@ sub factlog {
my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog'; my $path = $self->{pbot}->{registry}->get_value('general', 'data_dir') . '/factlog';
$channel = 'global' if $channel eq '.*'; $channel = 'global' if $channel eq '.*';
open my $fh, "< $path/$trigger.$channel" or do {
my $channel_safe = safe_filename $channel;
my $trigger_safe = safe_filename $trigger;
open my $fh, "< $path/$trigger_safe.$channel_safe" or do {
$self->{pbot}->{logger}->log("Could not open $path/$trigger.$channel: $!\n"); $self->{pbot}->{logger}->log("Could not open $path/$trigger.$channel: $!\n");
$channel = 'the global channel' if $channel eq 'global'; $channel = 'the global channel' if $channel eq 'global';
return "No factlog available for $trigger in $channel."; return "No factlog available for $trigger in $channel.";