Changeset 1197

Timestamp:

08/01/07 04:10:33 (6 years ago)

Author:

ggpolo

Message:

Merged with trunk again and adapted

Location:

branch/ggpolo

Files:

• share/umit/config/target_list.txt (modified) (1 diff)
• share/umit/config/umit.db (modified) (previous)
• test/test_option_parser.py (copied) (copied from trunk/test/test_option_parser.py)
• umit (modified) (2 diffs)
• umitCore/I18N.py (modified) (3 diffs)
• umitCore/Logging.py (modified) (1 diff)
• umitCore/Paths.py (modified) (2 diffs)
• umitCore/UmitConfigParser.py (modified) (1 diff)
• umitCore/UmitOptionParser.py (copied) (copied from trunk/umitCore/UmitOptionParser.py)
• umitGUI/About.py (modified) (1 diff)
• umitGUI/App.py (modified) (5 diffs)
• umitGUI/MainWindow.py (modified) (6 diffs)
• umitGUI/ScanNotebook.py (modified) (4 diffs)
• umitGUI/ScanOpenPortsPage.py (modified) (5 diffs)
• umitGUI/ScanToolbar.py (modified) (1 diff)
• umitInventory/Viewer.py (modified) (1 diff)

branch/ggpolo/share/umit/config/target_list.txt

@@ +1 @@
+192.168.0.1
 192.168.7.105

branch/ggpolo/umit

@@ -25 +25 @@
 import sys
 import signal
-from os.path import join, split, exists, abspath, dirname
+from os.path import join, split, expanduser
 
 ######################################
@@ -31 +31 @@
 
 from umitCore.Paths import Path
-print ">>> USING THIS PATH:", split(sys.argv[0])[0]
 
-config_file = join(split(sys.argv[0])[0], 'config', 'umit.conf')
-share_config_file = join(split(abspath(dirname(sys.argv[0])))[0], "share",
-                         "umit",  "config", "umit.conf")
+config_files = []
+config_files.append(join(split(sys.argv[0])[0], 'share', 'umit', 
+                         'config', 'umit.conf'))
+config_files.append(join(split(sys.argv[0])[0], 'config', 'umit.conf'))
+config_files.append("/usr/share/umit/config/umit.conf")
+config_files.append(join(expanduser("~"), ".umit", "umit.conf"))
 
-if exists(config_file):
-    Path.set_umit_conf(config_file)
-elif exists(share_config_file):
-    Path.set_umit_conf(share_config_file)
-else:
-    raise Exception("Config file couldn't be found!")
+Path.set_umit_conf(config_files)
 
 ######################################

branch/ggpolo/umitCore/I18N.py

@@ -22 +22 @@
 import locale
 
-from umitCore.Logging import log
 LC_ALL = locale.setlocale(locale.LC_ALL, '')
 LANG, ENC = locale.getdefaultlocale()
@@ -41 +40 @@
 
 except ImportError:
-    log.critical("You don't have gettext module, no \
-internationalization will be used.")
-
     # define _() so program will not fail
     import __builtin__
@@ -58 +54 @@
     # and thus, the text may be very hard to understand, but yet, no error will
     # occour
-    log.debug(">>> Converting '%s' from '%s' to unicode" % (string, ENC))
     string = string.decode("utf8", ERRORS).encode("utf8", ERRORS)
-    log.debug(">>> Converted to: '%s'" % string)
 
     return string

branch/ggpolo/umitCore/Logging.py

@@ -22 +22 @@
 
 from logging import Logger, StreamHandler, Formatter
+from umitCore.UmitOptionParser import option_parser
 
-LOGLEVEL = 0
+LOGLEVEL = option_parser.get_verbose()
 
 class Log(Logger, object):

branch/ggpolo/umitCore/Paths.py

@@ -78 +78 @@
     
     def set_umit_conf(self, umit_conf):
-        self.using_main = False
-
         # Place supposed to have the user's config file
-        supposed_user_conf = os.path.join(base_paths['user_dir'], base_paths['config_file'])
-
+        supposed_user_conf = os.path.join(base_paths['user_dir'],
+                                          base_paths['config_file'])
         config_file = supposed_user_conf
+        parsed = False
+
         if os.path.exists(supposed_user_conf)\
                and check_access(supposed_user_conf, os.R_OK):
-            self.config_parser.read(config_file)
-            log.debug(">>> Using config files in user home directory: %s" % config_file)
-
-        elif not os.path.exists(supposed_user_conf)\
+            try:
+                self.config_parser.read(config_file)
+                log.debug(">>> Using config files in user home \
+directory: %s" % config_file)
+                parsed = True
+            except:
+                log.debug(">>> Failed to load config file from \
+user home directory")
+
+        if not parsed and not os.path.exists(supposed_user_conf)\
                  and not check_access(base_paths['user_dir'], os.R_OK and os.W_OK):
-            result = create_user_dir(umit_conf, HOME)
-            config_file = result['config_file']
-            self.config_parser.read(config_file)
-            [self.__setattr__(opt, result[opt]) for opt in result]
-            log.debug(">>> Using recently created config files in user home: %s" % config_file)
-
-        else:
-            self.using_main = True
-            config_file = umit_conf
-            self.config_parser.read(config_file)
-            log.debug(">>> Using main config file: %s" % config_file)
+            try:
+                result = create_user_dir(umit_conf, HOME)
+                config_file = result['config_file']
+                self.config_parser.read(config_file)
+                [self.__setattr__(opt, result[opt]) for opt in result]
+                log.debug(">>> Using recently created config files in \
+user home: %s" % config_file)
+                parsed = True
+            except:
+                log.debug(">>> Failed to create user home")
+
+        if not parsed and type(umit_conf) == type([]):
+            config_file = self.config_parser.read(umit_conf)
+            if config_file != None and len(config_file) >= 1:
+                config_file = config_file[0]
+            else:
+                raise Exception("Couldn't load umit config file!")
 
         # Should make the following only after reading the umit.conf file
@@ -155 +167 @@
 # Functions for directories creation
 
-def create_user_dir(main_config, user_home):
+def create_user_dir(config_list, user_home):
+    main_config = None
+    for config in config_list:
+        if os.path.exists(config):
+            main_config = config
+            break
+    else:
+        log.critical(">>> No useful configuration file found in this list: %s"\
+                 % config_list)
+        raise Exception(">>> No usefull configuration file found!")
+
     log.debug(">>> Create user dir at given home: %s" % user_home)
     log.debug(">>> Using %s as source" % main_config)

branch/ggpolo/umitCore/UmitConfigParser.py

@@ -38 +38 @@
     def read(self, filenames):
         self.filenames = ConfigParser.read(self, filenames)    
+        return self.filenames
 
     def readfp(self, fp, filename=None):

branch/ggpolo/umitGUI/About.py

@@ -224 +224 @@
 Maxim I. Gavrilov <lovelymax@gmail.com>
 
-Nmap Python Wrapper:
-Pavel Klemenkov <parser@cs.msu.su>
-
 Umit Web:
 Rodolfo da Silva Carvalho <rodolfo.ueg@gmail.com>

branch/ggpolo/umitGUI/App.py

@@ -24 +24 @@
 import os.path
 import sys
-import optparse
-
-import gtk
-import gtk.gdk
-import gobject
-
-from umitGUI.Splash import Splash
-from umitGUI.MainWindow import MainWindow
-
-from umitInventory.Viewer import InventoryViewer
 
 from umitCore.Paths import Path
+from umitCore.UmitOptionParser import option_parser
 from umitCore.UmitConf import is_maemo
 from umitCore.I18N import _
@@ -54 +45 @@
 class App:
     def __init__(self, args=sys.argv):
-        self.__create_option_parser()
-
-    def __create_option_parser(self):
-        self.option_parser = optparse.OptionParser()
-        self.option_parser.add_option("-i", "--inventory", default=False, 
-                                      action="store_true",
-                                      help=_("start Network Inventory"))
-        self.options, self.args = self.option_parser.parse_args()
+        pass
 
     def __parse_cmd_line(self):
@@ -67 +51 @@
 
     def __create_show_main_window(self):
-        if self.options.inventory:
+        if option_parser.get_inventory():
+            from umitInventory.Viewer import InventoryViewer
             self.main_window = InventoryViewer()
-            self.main_window.connect('destroy', lambda *args: gtk.main_quit())
         else:
+            from umitGUI.MainWindow import MainWindow
             self.main_window = MainWindow()
         
@@ -77 +62 @@
             self.hildon_app = hildon.Program()
             self.hildon_app.add_window(self.main_window)
-        
+
         self.main_window.show_all()
     
@@ -107 +92 @@
         except:
             log.warning(_("RUNNING WITHOUT PSYCO!"))
-            log.warning(_("""Psyco is a module that speeds up the execution of this \
-application. It is not a requirement, and Umit runs perfectly well with or without it, \
-but you're encourajed to install it to have a better speed experience. Download it \
-at http://psyco.sf.net/"""))
+            log.warning(_("""Psyco is a module that speeds up the execution \
+of this application. It is not a requirement, and Umit runs perfectly \
+with or without it, but you're encourajed to install it to have a better \
+speed experience. Download it at http://psyco.sf.net/"""))
             self.using_psyco = False
+
+        self.diff = option_parser.get_diff()
+        if self.diff:
+            self.__run_text()
+        else:
+            self.__run_gui()
+
+    def __run_text(self):
+        log.info(">>> Text Mode")
+
+    def __run_gui(self):
+        log.info(">>> GUI Mode")
+        import gtk
+        import gobject
+        from umitGUI.Splash import Splash
 
         if not is_maemo():

branch/ggpolo/umitGUI/MainWindow.py

@@ -50 +50 @@
 from umitCore.Logging import log
 from umitCore.I18N import _
+from umitCore.UmitOptionParser import option_parser
 from umitCore.UmitConf import SearchConfig, is_maemo
 from umitCore.UmitDB import Scans, UmitDB
@@ -62 +63 @@
 root = False
 try:
-    if sys.platform == 'win32': root = True
-    elif is_maemo(): root = True
-    elif os.getuid() == 0: root = True
+    if sys.platform == 'win32':
+        root = True
+    elif is_maemo():
+        root = True
+    elif os.getuid() == 0:
+        root = True
 except: pass
 
@@ -116 +120 @@
         self._profile_filechooser_dialog = None
         self._results_filechooser_dialog = None
-        
-        self._new_scan_cb (None)
+
+        # Loading files passed as argument
+        files = option_parser.get_open_results()
+        if len(files) >= 1:
+            for file in files:
+                self._load(filename=file)
 
     def configure_focus_chain(self):
@@ -735 +743 @@
     def _create_scan_notebook(self):
         self.scan_notebook = ScanNotebook()
+        page = self._new_scan_cb()
         self.scan_notebook.show_all()
+
+        # Applying some command line options
+        target = option_parser.get_target()
+        profile = option_parser.get_profile()
+        nmap = option_parser.get_nmap()
+
+        if nmap:
+            page.command_toolbar.command = " ".join(nmap)
+            page.start_scan_cb()
+
+        else:
+            if target:
+                page.toolbar.selected_target = target
+
+            if profile:
+                page.toolbar.selected_profile = profile
+
+            if target and profile:
+                log.debug(">>> Executing scan with the given args: %s \
+with %s" % (target, profile))
+                page.start_scan_cb()
+
         if is_maemo():
             # No padding. We need space!
@@ -793 +824 @@
             else:
                 log.debug(">>> Creating a new page to load it.")
-                scan_page = self._new_scan_cb(None)
+                scan_page = self._new_scan_cb()
 
             log.debug(">>> Enabling page widgets")
@@ -979 +1010 @@
             alert.destroy()
     
-    def _new_scan_cb(self, widget, data=None):
+    def _new_scan_cb(self, widget=None, data=None):
         """Append a new ScanNotebookPage to ScanNotebook
         New tab properties:

branch/ggpolo/umitGUI/ScanNotebook.py

@@ -435 +435 @@
         self.get_parent().set_tab_title(self, label)
     
-    def start_scan_cb(self, widget):
+    def start_scan_cb(self, widget=None):
         target = self.toolbar.selected_target
         command = self.command_toolbar.command
@@ -716 +716 @@
                     
                 self.scan_result.scan_host_view.add_host({hostname:{'stock':icon,
-                                                                        'action':None}})
+                                                                    'action':None}})
                 
             # Select the first host found
@@ -1063 +1063 @@
             host_page.add_port([self.findout_service_icon(p),
                                 p.get('portid', ''),
+                                p.get('protocol', ''),
                                 p.get('port_state', ''),
                                 p.get('service_name', ''),
@@ -1089 +1090 @@
         for host in host_list:
             parent = host_page.port_tree.append(None, [host['host'].\
-                                                get_hostname(),'','','','',''])
+                                            get_hostname(),'','','','','', ''])
             for port in host['host'].get_ports():
                 for p in port.get('port', []):
                     host_page.port_tree.append(parent, \
-                                ['',self.findout_service_icon(p), p.get('portid', ""),\
-                                p.get('port_state', ""),p.get('service_name', _("Unknown")),\
-                                p.get('service_product', "")])
+                                ['',
+                                 self.findout_service_icon(p),
+                                 p.get('portid', ""),
+                                 p.get('protocol', ''),
+                                 p.get('port_state', ""),
+                                 p.get('service_name', _("Unknown")),
+                                 p.get('service_product', "")])
 
     def set_multiple_service_host(self, service_list):

branch/ggpolo/umitGUI/ScanOpenPortsPage.py

@@ -51 +51 @@
         # Ports view
         self.port_columns = {}
-        self.port_list = gtk.ListStore(str, str, str, str, str, str)
-        self.port_tree = gtk.TreeStore(str, str, str, str, str, str)
+        self.port_list = gtk.ListStore(str, str, str, str, str, str, str)
+        self.port_tree = gtk.TreeStore(str, str, str, str, str, str, str)
         
         self.port_view = gtk.TreeView(self.port_list)
@@ -62 +62 @@
         self.port_columns['icon'] = gtk.TreeViewColumn('')
         self.port_columns['port_number'] = gtk.TreeViewColumn(_('Port'))
+        self.port_columns['protocol'] = gtk.TreeViewColumn(_('Protocol'))
         self.port_columns['state'] = gtk.TreeViewColumn(_('State'))
         self.port_columns['service'] = gtk.TreeViewColumn(_('Service'))
@@ -162 +163 @@
         self.port_view.append_column(self.port_columns['icon'])
         self.port_view.append_column(self.port_columns['port_number'])
+        self.port_view.append_column(self.port_columns['protocol'])
         self.port_view.append_column(self.port_columns['state'])
         self.port_view.append_column(self.port_columns['service'])
@@ -169 +171 @@
             self.port_columns[k].set_reorderable(True)
             self.port_columns[k].set_resizable(True)
-        
+
+
+        self.port_columns['icon'].set_min_width(35)
+
         self.port_columns['hostname'].connect('clicked', self.set_search_cb, 0)
         self.port_columns['icon'].connect('clicked', self.set_search_cb, 4)
-        self.port_columns['port_number'].connect('clicked', self.set_search_cb, 2)
-        self.port_columns['state'].connect('clicked', self.set_search_cb, 3)
-        self.port_columns['service'].connect('clicked', self.set_search_cb, 4)
-        self.port_columns['version'].connect('clicked', self.set_search_cb, 5)
+        self.port_columns['port_number'].connect('clicked', self.set_search_cb,
+                                                 2)
+        self.port_columns['protocol'].connect('clicked', self.set_search_cb, 3)
+        self.port_columns['state'].connect('clicked', self.set_search_cb, 4)
+        self.port_columns['service'].connect('clicked', self.set_search_cb, 5)
+        self.port_columns['version'].connect('clicked', self.set_search_cb, 6)
         
         self.port_columns['hostname'].set_sort_column_id(0)
-        self.port_columns['icon'].set_min_width(35)
-        self.port_columns['icon'].set_sort_column_id(3)
-        self.port_columns['port_number'].set_sort_column_id(1)
-        self.port_columns['state'].set_sort_column_id(2)
-        self.port_columns['service'].set_sort_column_id(3)
-        self.port_columns['version'].set_sort_column_id(4)
+        self.port_columns['icon'].set_sort_column_id(4)
+        self.port_columns['port_number'].set_sort_column_id(2)
+        self.port_columns['protocol'].set_sort_column_id(3)
+        self.port_columns['state'].set_sort_column_id(4)
+        self.port_columns['service'].set_sort_column_id(5)
+        self.port_columns['version'].set_sort_column_id(6)
         
         self.port_columns['hostname'].pack_start(self.cell_port, True)
         self.port_columns['icon'].pack_start(self.cell_icon, True)
         self.port_columns['port_number'].pack_start(self.cell_port, True)
+        self.port_columns['protocol'].pack_start(self.cell_port, True)
         self.port_columns['service'].pack_start(self.cell_port, True)
         self.port_columns['version'].pack_start(self.cell_port, True)
@@ -195 +203 @@
         self.port_columns['icon'].set_attributes(self.cell_icon, stock_id=1)
         self.port_columns['port_number'].set_attributes(self.cell_port, text=2)
-        self.port_columns['state'].set_attributes(self.cell_port, text=3)
-        self.port_columns['service'].set_attributes(self.cell_port, text=4)
-        self.port_columns['version'].set_attributes(self.cell_port, text=5)
+        self.port_columns['protocol'].set_attributes(self.cell_port, text=3)
+        self.port_columns['state'].set_attributes(self.cell_port, text=4)
+        self.port_columns['service'].set_attributes(self.cell_port, text=5)
+        self.port_columns['version'].set_attributes(self.cell_port, text=6)
         
         self.port_columns['hostname'].set_visible(False)

branch/ggpolo/umitGUI/ScanToolbar.py

@@ -126 +126 @@
 
     def set_selected_profile(self, profile):
-        self.profile_entry.selected_entry = profile
+        self.profile_entry.selected_profile = profile
 
     selected_profile = property(get_selected_profile, set_selected_profile)

branch/ggpolo/umitInventory/Viewer.py

@@ -202 +202 @@
         
         self.daddy = daddy
+        if not self.daddy:
+            self.connect('destroy', lambda *args: gtk.main_quit())
+
         self.tip_timer = -1
         self.main_accel_group = gtk.AccelGroup()