Prepare file configured logging

[pwnitter] / pwnitter.py

diff --git a/pwnitter.py b/pwnitter.py
index a0860be..4ef93eb 100755 (executable)
--- a/pwnitter.py
+++ b/pwnitter.py
@@ -7,6 +7,8 @@
 import dbus.service
 import dbus.mainloop.glib
 import getopt, sys, pcap, dpkt, re, httplib, urllib
+import logging
+import logging.config
 import socket
 import time
 import gobject
@@ -38,9 +40,13 @@ class Pwnitter(dbus.service.Object):
     
     @dbus.service.method(NAME,
                          in_signature='', out_signature='')
-    def Start(self):
+    def Start(self, filename=None):
         # FIXME: Prevent double Start()
-        self.setup_monitor(self.device):
+        if filename is None: # Then we do *not* want to read from a PCap file but rather a monitor device
+            self.setup_monitor(device)
+            device = self.device
+        else: # We have given a filename, so let's make PCap read from the file
+            device = filename
         self.is_running = True
         try:
             self.cap = pcap.pcap(device)
@@ -50,6 +56,12 @@ class Pwnitter(dbus.service.Object):
         self.cap.setfilter('dst port 80')
         cap_fileno = self.cap.fileno()
         self.source_id = gobject.io_add_watch(cap_fileno, gobject.IO_IN, self.cap_readable_callback, device) 
+
+    @dbus.service.method(NAME,
+                         in_signature='s', out_signature='')
+    def StartFromFile(self, filename):
+        return self.Start(filename=filename)
+
     
     def cap_readable_callback(self, source, condition, device):
         return self.pwn(device, self.MessageSent)
@@ -72,7 +84,7 @@ class Pwnitter(dbus.service.Object):
         return self.status
 
 
-    def tear_down_monitor(device='mon0'):
+    def tear_down_monitor(self, device='mon0'):
         cmd = '/sbin/ifconfig mon0 down'.split()
         subprocess.call(cmd)
         cmd = '/usr/sbin/iw dev mon0 del'.split()
@@ -216,16 +228,33 @@ def main():
 
 
 if __name__ == '__main__':
+    from optparse import OptionParser
+    parser = OptionParser("usage: %prog [options]")
+    parser.add_option("-l", "--loglevel", dest="loglevel", 
+                      help="Sets the loglevel to one of debug, info, warn, error, critical")
+    parser.add_option("-s", "--session", dest="use_session_bus",
+                      action="store_true", default=False,
+                      help="Bind Pwnitter to the SessionBus instead of the SystemBus")
+    (options, args) = parser.parse_args()
+    loglevel = {'debug': logging.DEBUG, 'info': logging.INFO,
+                'warn': logging.WARN, 'error': logging.ERROR,
+                'critical': logging.CRITICAL}.get(options.loglevel, "warn")
+    logging.basicConfig(level=loglevel)
+    #logging.config.fileConfig('logging.conf') #FIXME: Have file configured logging
+    log = logging.getLogger("Main")
+
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
-    #session_bus = dbus.SessionBus()
-    session_bus = dbus.SystemBus()
+    if options.use_session_bus:
+        session_bus = dbus.SessionBus()
+    else:
+        session_bus = dbus.SystemBus()
     name = dbus.service.BusName(NAME, session_bus)
     pwnitter = Pwnitter(session_bus, '/Pwnitter')
     #object.Start()
 
     loop = gobject.MainLoop()
-    print "Running example signal emitter service."
+    log.info("Running example signal emitter service.")
     # FIXME: This is debug code
     #gobject.idle_add(pwnitter.MessageSent)