GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-01-11 20:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Catch more rare scenarios for strongly linking accounts

Browse Source
This commit is contained in:
Pragmatic Software 2016-08-26 04:02:30 -07:00
parent e532c5711f
commit c13f3ae9dc
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
PBot/MessageHistory_SQLite.pm
View File

@ -463,13 +463,30 @@ sub get_message_account {
$sth->execute(); $sth->execute();
my $rows = $sth->fetchall_arrayref({}); my $rows = $sth->fetchall_arrayref({});
my ($account1) = $host =~ m{/([^/]+)$};
$account1 = '' if not defined $account1;
my $hostip = undef;
if ($host =~ m/(\d+[[:punct:]]\d+[[:punct:]]\d+[[:punct:]]\d+)\D/) {
$hostip = $1;
$hostip =~ s/[[:punct:]]/./g;
}
foreach my $row (@$rows) { foreach my $row (@$rows) {
$self->{pbot}->{logger}->log("Found matching nick $row->{hostmask} with id $row->{id}\n"); $self->{pbot}->{logger}->log("Found matching nick $row->{hostmask} with id $row->{id}\n");
my ($thost) = $row->{hostmask} =~ m/@(.*)$/; my ($thost) = $row->{hostmask} =~ m/@(.*)$/;
if ($thost =~ m{(^unaffiliated|/staff/|/member/)} and $host ne $thost) { if ($thost =~ m{(^unaffiliated|/staff/|/member/)}) {
$self->{pbot}->{logger}->log("Skipping non-matching cloaked hosts: $host vs $thost\n"); my ($account2) = $thost =~ m{/([^/]+)$};
next;
if ($account1 ne $account2) {
$self->{pbot}->{logger}->log("Skipping non-matching cloaked hosts: $host vs $thost\n");
next;
} else {
$self->{pbot}->{logger}->log("Cloaked hosts match: $host vs $thost\n");
$rows->[0] = $row;
return ($rows, $self->{alias_type}->{STRONG});
}
} }
my $distance = fastdistance($host, $thost); my $distance = fastdistance($host, $thost);
@ -477,7 +494,24 @@ sub get_message_account {
$self->{pbot}->{logger}->log("distance: " . ($distance / $length) . " -- $host vs $thost\n") if $length != 0; $self->{pbot}->{logger}->log("distance: " . ($distance / $length) . " -- $host vs $thost\n") if $length != 0;
my $match = 0;
if ($length != 0 && $distance / $length < 0.50) { if ($length != 0 && $distance / $length < 0.50) {
$match = 1;
} else {
# handle cases like 99.57.140.149 vs 99-57-140-149.lightspeed.sntcca.sbcglobal.net
if (defined $hostip) {
$match = 1 if $hostip eq $thost;
$self->{pbot}->{logger}->log("IP vs hostname match: $host vs $thost\n");
} elsif ($thost =~ m/(\d+[[:punct:]]\d+[[:punct:]]\d+[[:punct:]]\d+)\D/) {
my $thostip = $1;
$thostip =~ s/[[:punct:]]/./g;
$match = 1 if $thostip eq $host;
$self->{pbot}->{logger}->log("IP vs hostname match: $host vs $thost\n");
}
}
if ($match) {
$rows->[0] = $row; $rows->[0] = $row;
return ($rows, $self->{alias_type}->{STRONG}); return ($rows, $self->{alias_type}->{STRONG});
} }