Changeset 471

Timestamp:

03/31/10 20:08:54 (9 years ago)

Author:

arthur

Message:

Merge IRC patch from Patrik Lantz. Change setup.py to use dpkt 1.7

Location:

trunk

Files:

• honeysnap/ircDecode.py (modified) (6 diffs)
• setup.py (modified) (1 diff)

trunk/honeysnap/ircDecode.py

@@ -33 +33 @@
 
 # global bot word list.
-botprefixes = [".", "-", "!", "\`",  "\\", "|"]
-botcoms = ["die ", "esay ", "flood ", "m ", "me ", "part ", "payment ", "ping ", "s ", "say ", "server ",
-        "services ", "startflood ", "stopflood ", "x ", "antiaction ", "antibold ", "anticolour ", "antinotice ",
-        "antipub ", "antirepeat ", "antireverse ", "antiunderline ", "antiurl ", "autovoice ", "chanserv ", 
-        "cycle ", "dynamicexempts ", "dynamicinvites ", "enforcetopiclimit ", "nodesynch ", "locked ",
-        "noop ", "op ", "passive ", "private ", "revenge ", "revengebot ", "secret ", "seen ", "seen ",
-        "shared ", "stats ", "strictop ", "suspended ", "topic ", "userexempts ", "userinvites ", "voice "]
+botprefixes = ["", "?", ":", ".", "-", "!", "\`",  "\\", "|"]
+botcoms = ["die ", "esay ", "flood ", "m ", "me ", "part ", "payment ", "ping ", "pingstop ", "s ", "say ", "server ", "services ", "startflood ",
+        "stopflood ", "x ", "advscan ", "asc ", "aolspam.", "antiaction ", "antibold ", "anticolour ", "antinotice ", "antipub ", "antirepeat ", "antireverse ",
+        "antiunderline ", "antiurl ", "autovoice ", "carnivore ", "chanserv ", "clone ", "c ", "clonestop ", "cycle ", "c_raw ", "c_mode ", "c_nick ",
+        "c_join ", "c_part ", "c_privmsg ", "c_action ", "c_r ", "c_m ", "c_n ", "c_j ", "c_p ", "c_pm ", "c_a ", "cvar.", "download ", "dl ", "dynamicexempts ",
+        "dynamicinvites ", "ddos.", "enforcetopiclimit ", "email ", "execute ", "findfile ", "ff ", "findfilestopp ", "http.", "icmp ", "icmpflood ",
+        "nodesynch ", "locked ", "noop ", "op ", "passive ", "private ", "rename ", "mv ", "revenge ", "revengebot ", "scanall ", "sa ", "scandel ", "scan.",
+        "scanstop ", "scanstats ", "secret ", "seen ", "seen ", "shared ", "sniffer.", "stats ", "spam.", "syn ", "synstop ", "strictop ", "suspended ", "topic ",
+        "udp ", "udpstop ", "update ", "up ", "userexempts ", "userinvites ", "voice "]
 
 botwords = []
@@ -92 +94 @@
         self.words = words
         self.wordlines = []
-        self.botlines = []
+        self.botlines = []    
+        self.currenttopicsBotCmd = []
+        self.currenttopicsKeyword = []        
         self.privcount = 0     
         self.dir = ""
@@ -155 +159 @@
             self.targets[target] += 1
             #self.ipsearch(c,e)
-            if cmd in ["privmsg", "pubmsg", "notice", "privnotice"]:
+            if cmd in ['privmsg', 'mode', 'quit', 'nick', 'join', 'pubmsg', 'currenttopic', 'topicinfo', 'topic']:
                 self.analyzeMsg(c, e)
             
@@ -196 +200 @@
     def ipsearch(self, c, e):
         cmd = e.eventtype()
-        if cmd in ['privmsg', 'mode', 'quit', 'nick', 'join', 'pubmsg']:
+        if cmd in ['privmsg', 'mode', 'quit', 'nick', 'join', 'pubmsg', 'currenttopic', 'topicinfo', 'topic']:
             #srcip = dnet.addr(c.pkt.src)
             srcip = e.src
@@ -205 +209 @@
                 
     def botcmds(self, c, e):   
-        """Find lines matching botwords"""
+        """Find lines matching botwords"""     
+        if e.eventtype() == 'topicinfo':
+            self.topics(e, 'botcmds')
+            return
         data = ' '.join(e.arguments())
         matches = [w for w in self.botwords if w in data]
         if len(matches) > 0:  
-            self.botlines.append([str(e), matches])
+            self.botlines.append([str(e), matches])  
+            if e.eventtype() == 'currenttopic':
+                self.currenttopicsBotCmd.append(str(e))
         
     def keywords(self, c, e):
-        """Find lines matching word list"""
+        """Find lines matching word list"""    
+        if e.eventtype() == 'topicinfo':
+            self.topics(e, 'keyword')
+            return        
         data = ' '.join(e.arguments())
         matches = [w for w in self.words if w in data]
         if len(matches) > 0: 
-            self.wordlines.append([str(e), matches])
+            self.wordlines.append([str(e), matches])  
+            if e.eventtype() == 'currenttopic':
+                self.currenttopicsKeyword.append(str(e))            
+
+    def topics(self, e, matchtype):
+        """
+        Find matching currenttopic and topicinfo
+        Store result in self.botlines or self.wordlines (for keyword matches)
+        """
+        savedtopics = self.currenttopicsBotCmd
+        matchlist   = self.botlines
+        if matchtype == 'keyword':
+            savedtopics = self.currenttopicsKeyword
+            matchlist   = self.wordlines
+        timecmp = str(e).split(' ')[0].strip()
+        for s in savedtopics:
+            if s.split(' ')[0].strip() == timecmp:
+                matchlist.append([str(e), 'currenttopic'])
     
     def analyzeMsg(self, c, e):
@@ -232 +261 @@
         else:
             fromuser = e.source()
-        #t = time.asctime(time.localtime(c.ts))
         t = e.time
         cmd = e.eventtype()
-        if cmd == "pubmsg" or cmd=="notice":
+        if cmd == "pubmsg" or cmd=="notice" or cmd=="topic":
             channel = e.target()
         if cmd == "privmsg" or cmd=="privnotice":

trunk/setup.py

@@ -23 +23 @@
     install_requires = [
         "python-irclib>=0.4.6",
-        "dpkt>=1.6", 
+        "dpkt>=1.7", 
     ],
     dependency_links = [    
-        "http://dpkt.googlecode.com/files/dpkt-1.6.tar.gz",
+        "http://dpkt.googlecode.com/files/dpkt-1.7.tar.gz",
     ],
     entry_points = {