GitHub
/
pbot
mirror of https://github.com/pragma-/pbot.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not trigger ban evasion if mask matches banmask; use *!*@host instead of *!user@ip-mask for evasions

This commit is contained in:
Pragmatic Software 2016-02-25 00:51:52 -08:00
parent 75b29e78c5
commit b87db378cf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PBot/AntiFlood.pm
View File

@ -803,8 +803,8 @@ sub check_bans {
$banmask_regex =~ s/\\\*/.*/g; $banmask_regex =~ s/\\\*/.*/g;
$banmask_regex =~ s/\\\?/./g; $banmask_regex =~ s/\\\?/./g;
if($baninfo->{type} eq '+q' and $mask =~ /^$banmask_regex$/i) { if($mask =~ /^$banmask_regex$/i) {
$self->{pbot}->{logger}->log("anti-flood: [check-bans] Hostmask ($mask) matches quiet banmask ($banmask_regex), disregarding\n"); $self->{pbot}->{logger}->log("anti-flood: [check-bans] Hostmask ($mask) matches $baninfo->{type} banmask ($banmask_regex), disregarding\n");
next; next;
} }
@ -836,7 +836,8 @@ sub check_bans {
} elsif ($current_nickserv_account and $baninfo->{banmask} !~ m/^\$a:/i) { } elsif ($current_nickserv_account and $baninfo->{banmask} !~ m/^\$a:/i) {
$banmask = "\$a:$current_nickserv_account"; $banmask = "\$a:$current_nickserv_account";
} else { } else {
$banmask = "*!$user@" . address_to_mask($host); $banmask = "*!*\@$host";
#$banmask = "*!$user@" . address_to_mask($host);
} }
$self->{pbot}->{logger}->log("anti-flood: [check-bans] $mask evaded $baninfo->{banmask} banned in $baninfo->{channel} by $baninfo->{owner}, banning $banmask\n"); $self->{pbot}->{logger}->log("anti-flood: [check-bans] $mask evaded $baninfo->{banmask} banned in $baninfo->{channel} by $baninfo->{owner}, banning $banmask\n");
@ -943,7 +944,7 @@ sub on_whoisuser {
my ($id) = $self->{pbot}->{messagehistory}->{database}->find_message_account_by_nick($nick); my ($id) = $self->{pbot}->{messagehistory}->{database}->find_message_account_by_nick($nick);
if ($self->{pbot}->{registry}->get_value('antiflood', 'debug_checkban')) { if ($self->{pbot}->{registry}->get_value('antiflood', 'debug_checkban') >= 2) {
$self->{pbot}->{logger}->log("Got gecos for $nick ($id): '$gecos'\n"); $self->{pbot}->{logger}->log("Got gecos for $nick ($id): '$gecos'\n");
} }