Added logging of kicks/bans/quiets/removes/klines/kills to a special SQL table and corresponding text files

Enabled SQL debugging
Bugfix: Only attempt to determine a host's IP if it doesn't contain a '/'
Updates to channels.xml and users.xml
Adjusted ;userx add and ;userx flags such that A cannot give B a flag that A doesn't already have
Tweaked the ;help command
Fixed ;mship such that it will respond even if it can't see the nick provided.
Tweaked ;status to give output in format like 7d22h18m3s instead of 9814798712 seconds
Added a ;teredo helper command to give info on IPv6 teredo-tunneled connections
Added a nick blacklist file (to counter bot nicklists).
Added a english wordlist file, for "garbage" detection.
Added ;investigate and ;investigate2 commands
Added a way to not throttle info-risk threats
Added special detection for a cycling botnet
Added special detection for bots that join, say something, and immediately quit
Added detection for ascii art
Added detection for "garbage" text
Added fuzzy-matching against a set of nicks
Added "real IP" to state tracking and logging, which "decrypts" gateway/web and teredo IPs
Moved sigalarm code into meta.pl
Improved statsp tracking, and logs it to a file
Ping-pong every 30 seconds, auto-reconnect on persistent lag.
Ensure inspector routine is always called AFTER log-handling routines
Fixed a state-tracking bug in topic change handling
Fixed a state-tracking bug with nick changes
Fixed some state-tracking bugs with mode changes
Determine who is impacted when a quiet/ban mask is placed
Fixed handling of CTCP SOURCE requests
Added feature where it keeps a 30 line "backlog" of each channel in memory.
Added the reason for parts and quits to text logging

1 files changed, 41 insertions, 0 deletions

diff --git a/modules/util.pl b/modules/util.pl
index dc3f285..54e25a6 100644
--- a/modules/util.pl
+++ b/modules/util.pl
@@ -183,6 +183,47 @@ sub dprint {
   print STDERR $text, "\n";
 }
 
+sub dottedQuadToInt
+{
+  my ($module, $dottedquad) = @_;
+  my $ip_number = 0;
+  my @octets = split(/\./, $dottedquad);
+  foreach my $octet (@octets) {
+    $ip_number <<= 8;
+    $ip_number |= $octet;
+  }
+  return $ip_number;
+}
+
+sub getNickIP
+{
+  my ($module, $nick) = @_;
+  $nick = lc $nick;
+  return unless defined($::sn{$nick});
+  if (defined($::sn{$nick}{ip})) {
+    return $::sn{$nick}{ip};
+  }
+  my $host = $::sn{$nick}{host};
+  if ( ($host =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/) or
+       ($host =~ /^gateway\/web\/freenode\/ip\.(\d+)\.(\d+)\.(\d+)\.(\d+)$/) ) {
+    #yay, easy IP!
+    $::sn{$nick}{ip} = dottedQuadToInt(undef, "$1.$2.$3.$4");
+    return $::sn{$nick}{ip};
+  } elsif (index($host, '/') != -1) {
+    return;
+  } elsif ($host =~ /^2001:0:/) {
+    my @splitip = split(/:/, $host);
+    #I think I can just do (hex($splitip[6] . $splitip[7]) ^ hex('ffffffff')) here but meh
+    my $host = join('.', unpack('C4', pack('N', (hex($splitip[6] . $splitip[7])^hex('ffffffff')))));
+    $::sn{$nick}{ip} = dottedQuadToInt(undef, $host);
+    return $::sn{$nick}{ip};
+  }
+  my @resolve = gethostbyname($::sn{$nick}{host});
+  return unless @resolve;
+  $::sn{$nick}{ip} = dottedQuadToInt(undef, join('.', unpack('C4', $resolve[4])));
+  return $::sn{$nick}{ip};
+}
+
 sub notRestricted {
   my ($module, $nick, $restriction) = @_;
   $nick = lc $nick;