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

Improve unbanme handling

Browse Source 
Sometimes people might join the channel uncloaked and get join-flood banned
with their uncloaked hostmask, and then later attempt to join the channel while
cloaked but the network will prevent them from joining since it checks their IP
address against the banlist in addition to their cloak.

Attempts to use unbanme while cloaked will look for a ban matching the cloak
instead of the IP address and will not find their uncloaked join-flood ban.

To fix this, we now traverse all known aliases/hostmasks for an individual
requesting a join-flood unban and remove any and all bans matching any of the
hostmasks linked to this individual.
This commit is contained in:
Pragmatic Software 2015-11-20 21:08:30 -08:00
parent 742eb849e8
commit 4cd1211684
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
PBot/AntiFlood.pm
View File

@ -478,45 +478,57 @@ sub unbanme {
return "/msg $nick Usage: unbanme <channel>"; return "/msg $nick Usage: unbanme <channel>";
} }
my $banmask = address_to_mask($host); my %unbanned;
my $mask = "*!$user\@$banmask\$##stop_join_flood"; my %aliases = $self->{pbot}->{messagehistory}->{database}->get_also_known_as($nick);
if(not $self->{pbot}->{chanops}->{unban_timeout}->find_index($channel . '-floodbans', $mask)) { foreach my $alias (keys %aliases) {
return "/msg $nick There is no temporary ban set for $mask in channel $channel."; next if $aliases{$alias}->{type} == $self->{pbot}->{messagehistory}->{database}->{alias_type}->{WEAK};
}
my $message_account = $self->{pbot}->{messagehistory}->{database}->get_message_account($nick, $user, $host); my ($anick, $auser, $ahost) = $alias =~ m/([^!]+)!([^@]+)@(.*)/;
my @nickserv_accounts = $self->{pbot}->{messagehistory}->{database}->get_nickserv_accounts($message_account); my $banmask = address_to_mask($ahost);
push @nickserv_accounts, undef; my $mask = "*!$auser\@$banmask\$##stop_join_flood";
next if exists $unbanned{$mask};
next if not $self->{pbot}->{chanops}->{unban_timeout}->find_index($channel . '-floodbans', $mask);
foreach my $nickserv_account (@nickserv_accounts) { my $message_account = $self->{pbot}->{messagehistory}->{database}->get_message_account($anick, $auser, $ahost);
my $baninfos = $self->{pbot}->{bantracker}->get_baninfo("$nick!$user\@$host", $channel, $nickserv_account); my @nickserv_accounts = $self->{pbot}->{messagehistory}->{database}->get_nickserv_accounts($message_account);
if(defined $baninfos) { push @nickserv_accounts, undef;
foreach my $baninfo (@$baninfos) {
if($self->ban_whitelisted($baninfo->{channel}, $baninfo->{banmask})) { foreach my $nickserv_account (@nickserv_accounts) {
$self->{pbot}->{logger}->log("anti-flood: [unbanme] $nick!$user\@$host banned as $baninfo->{banmask} in $baninfo->{channel}, but allowed through whitelist\n"); my $baninfos = $self->{pbot}->{bantracker}->get_baninfo("$anick!$auser\@$ahost", $channel, $nickserv_account);
} else {
if($channel eq lc $baninfo->{channel}) { if(defined $baninfos) {
my $mode = $baninfo->{type} eq "+b" ? "banned" : "quieted"; foreach my $baninfo (@$baninfos) {
$self->{pbot}->{logger}->log("anti-flood: [unbanme] $nick!$user\@$host $mode as $baninfo->{banmask} in $baninfo->{channel} by $baninfo->{owner}, unbanme rejected\n"); if($self->ban_whitelisted($baninfo->{channel}, $baninfo->{banmask})) {
return "/msg $nick You have been $mode as $baninfo->{banmask} by $baninfo->{owner}, unbanme will not work until it is removed."; $self->{pbot}->{logger}->log("anti-flood: [unbanme] $anick!$auser\@$ahost banned as $baninfo->{banmask} in $baninfo->{channel}, but allowed through whitelist\n");
} else {
if($channel eq lc $baninfo->{channel}) {
my $mode = $baninfo->{type} eq "+b" ? "banned" : "quieted";
$self->{pbot}->{logger}->log("anti-flood: [unbanme] $anick!$auser\@$ahost $mode as $baninfo->{banmask} in $baninfo->{channel} by $baninfo->{owner}, unbanme rejected\n");
return "/msg $nick You have been $mode as $baninfo->{banmask} by $baninfo->{owner}, unbanme will not work until it is removed.";
}
} }
} }
} }
} }
my $channel_data = $self->{pbot}->{messagehistory}->{database}->get_channel_data($message_account, $channel, 'offenses');
if($channel_data->{offenses} > 1) {
return "/msg $nick You may only use unbanme for the first offense. You will be automatically unbanned in a few hours, and your offense counter will decrement once every 24 hours.";
}
$self->{pbot}->{chanops}->unban_user($mask, $channel . '-floodbans');
$unbanned{$mask}++;
} }
my $channel_data = $self->{pbot}->{messagehistory}->{database}->get_channel_data($message_account, $channel, 'offenses'); if (keys %unbanned) {
if($channel_data->{offenses} > 1) { return "/msg $nick You have been unbanned from $channel.";
return "/msg $nick You may only use unbanme for the first offense. You will be automatically unbanned in a few hours, and your offense counter will decrement once every 24 hours."; } else {
return "/msg $nick There is no temporary join-flooding ban set for you in channel $channel.";
} }
$self->{pbot}->{chanops}->unban_user($mask, $channel . '-floodbans');
return "/msg $nick You have been unbanned from $channel.";
} }
sub address_to_mask { sub address_to_mask {