Added better logging support

Using Twitter 1.9.2 module (https://pypi.python.org/pypi/twitter)
Fixed hash regex to hopefully not find XML

Author: jordan-wright

dumpmon.py

@@ -14,8 +14,8 @@
 from lib.Pastie import Pastie, PastiePaste
 from lib.helper import log
 from time import sleep
-import twitter
-from settings import CONSUMER_KEY, CONSUMER_SECRET, ACCESS_TOKEN, ACCESS_TOKEN_SECRET
+from twitter import Twitter, OAuth
+from settings import CONSUMER_KEY, CONSUMER_SECRET, ACCESS_TOKEN, ACCESS_TOKEN_SECRET, log_file
 import threading
 import logging
 
@@ -34,12 +34,12 @@ def monitor():
     if args.verbose:
         level = logging.DEBUG
     logging.basicConfig(
-        format='%(asctime)s [%(levelname)s] %(message)s', level=level)
+        format='%(asctime)s [%(levelname)s] %(message)s', filename=log_file, level=level)
     logging.info('Monitoring...')
-    bot = twitter.Api(consumer_key=CONSUMER_KEY,
-                      consumer_secret=CONSUMER_SECRET,
-                      access_token_key=ACCESS_TOKEN,
-                      access_token_secret=ACCESS_TOKEN_SECRET)
+    bot = Twitter(
+        auth=OAuth(ACCESS_TOKEN, ACCESS_TOKEN_SECRET,
+            CONSUMER_KEY, CONSUMER_SECRET)
+        )
     # Create lock for both output log and tweet action
     log_lock = threading.Lock()
     tweet_lock = threading.Lock()

lib/Site.py

@@ -2,6 +2,7 @@
 import requests
 import time
 from requests import ConnectionError
+from twitter import TwitterError
 import logging
 import helper
 
@@ -75,7 +76,7 @@ def monitor(self, bot, t_lock):
                     with t_lock:
                         helper.record(tweet)
                         try:
-                            bot.PostUpdate(tweet)
+                            bot.statuses.update(status=tweet)
                         except TwitterError:
                             pass
             self.update()

lib/helper.py

@@ -21,9 +21,9 @@ def download(url, headers=None):
     try:
         response = r.get(url).text
     except requests.ConnectionError:
-        print('[!] Critical Error - Cannot connect to Pastebin')
+        logging.warn('[!] Critical Error - Cannot connect to site')
         sleep(5)
-        print('[!] Retrying...')
+        logging.warn('[!] Retrying...')
         response = self.download(url)
     return response
 

lib/regexes.py

@@ -3,7 +3,7 @@
 regexes = {
     'email': re.compile(r'[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}', re.I),
     #'ssn' : re.compile(r'\d{3}-?\d{2}-?\d{4}'),
-    'hash32': re.compile(r'[^A-F\d/]([A-F\d]{32})[^A-F\d]', re.I),
+    'hash32': re.compile(r'[^<A-F\d/]([A-F\d]{32})[^A-F\d]', re.I),
     'FFF': re.compile(r'FBI\s*Friday', re.I),  # will need to work on this to not match CSS
     'lulz': re.compile(r'(lulzsec|antisec)', re.I),
     'cisco_hash': re.compile(r'enable\s+secret', re.I),