Changeset 3823

Timestamp:

12/15/08 13:01:32 (4 years ago)

Author:

gpolo

Message:

Merged revisions 2560,2562,2564-2566,2570-2571 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r2560 | boltrix | 2007-09-22 10:46:19 -0300 (Sat, 22 Sep 2007) | 1 line

Removed the PIL dependency from package generation system, as asked by Fyodor. Now, I'm using GTK to put the version and revision number inside the Splash screen. Also, fixed a bug reported by David, in which Umit crashes after removal of target_list.txt and other files that are sent empty. I also removed them from repository, and now umit creates them if needed

........

r2562 | boltrix | 2007-09-22 11:36:48 -0300 (Sat, 22 Sep 2007) | 1 line

Fixed a bug on About dialog

........

r2564 | boltrix | 2007-09-22 11:40:46 -0300 (Sat, 22 Sep 2007) | 1 line

Removed a debug from About

........

r2565 | boltrix | 2007-09-22 11:49:05 -0300 (Sat, 22 Sep 2007) | 1 line

Improved bug report title, to ease the task of finding duplicated bug reports

........

r2566 | boltrix | 2007-09-22 12:06:34 -0300 (Sat, 22 Sep 2007) | 1 line

Fixed a bug caused by trying to execute a command generated through the wizard with no scan tab openned.

........

r2570 | boltrix | 2007-09-22 14:25:53 -0300 (Sat, 22 Sep 2007) | 1 line

Moved option_parser to the beginning, to avoid loosing the help if not in development mode

........

r2571 | boltrix | 2007-09-22 14:49:24 -0300 (Sat, 22 Sep 2007) | 1 line

Updated some names on Credits window. Four of them are still missing and I'll update them as soon as I get their names and emails. Also, pushed the version and revision 5 pixels up on splash screen.

........

Location:

branch/NetworkInventory

Files:

• . (modified) (1 prop)
• install_scripts/unix/setup.py (modified) (3 diffs)
• install_scripts/utils/add_splash_version.py (deleted)
• install_scripts/utils/images (deleted)
• install_scripts/windows/setup.py (modified) (1 diff)
• share/pixmaps/splash.png (modified) (previous)
• share/pixmaps/umit.op (deleted)
• share/pixmaps/umit.opf (modified) (previous)
• share/pixmaps/umit.opi (deleted)
• share/umit/config/recent_scans.txt (deleted)
• share/umit/config/target_list.txt (deleted)
• share/umit/config/umit.db (deleted)
• share/umit/config/umit_version (modified) (1 diff)
• umit (modified) (2 diffs)
• umitCore/BasePaths.py (modified) (1 diff)
• umitCore/Paths.py (modified) (7 diffs)
• umitCore/UmitConf.py (modified) (2 diffs)
• umitGUI/About.py (modified) (4 diffs)
• umitGUI/MainWindow.py (modified) (2 diffs)
• umitGUI/ScanHostsView.py (modified) (3 diffs)
• umitGUI/ScanNotebook.py (modified) (6 diffs)
• umitGUI/Splash.py (modified) (1 diff)
• umitGUI/Wizard.py (modified) (1 diff)

branch/NetworkInventory/install_scripts/unix/setup.py

@@ -33 +33 @@
 # The environ variables are catch only on package generating phase.
 # After package generation, the version and revision turns into a hardcoded string
-VERSION = os.environ.get("UMIT_VERSION", "0.4.5")
-REVISION = os.environ.get("UMIT_REVISION", "1567")
+VERSION = os.environ.get("UMIT_VERSION", "0.9.5")
+REVISION = os.environ.get("UMIT_REVISION", "2549")
 
 VERSION_FILE = os.path.join("share", "umit", "config", "umit_version")
@@ -302 +302 @@
         # Updating version, revision, splash and paths informations...
         sys.path.append(os.path.join("install_scripts", "utils"))
-        from add_splash_version import add_version
         from version_update import update_setup, update_paths, update_umit_version
 
-        add_version(base_dir, VERSION, REVISION)
         update_setup(base_dir, VERSION, REVISION)
         update_paths(base_dir, VERSION, REVISION)
@@ -316 +314 @@
         print
 
-# The umit_sdist class is intended to be used only from inside a svn working copy
-# because it uses install_scripts/utils/version_update.py and add_splash_version.py
-# which are not sent along with the source packages.
-# To avoid import errors, the following code redirects umit_sdist to the original
-# sdist class while running from a previously generated source package
 if SOURCE_PKG:
     umit_sdist = sdist

branch/NetworkInventory/install_scripts/windows/setup.py

@@ -108 +108 @@
         sys.path.append(os.path.join("install_scripts", "utils"))
         from version_update import update_umit_compiled, update_paths, update_umit_version
-        from add_splash_version import add_version
 
-        add_version(base_dir, VERSION, REVISION)
         update_umit_compiled(base_dir, VERSION, REVISION)
         update_paths(base_dir, VERSION, REVISION)

branch/NetworkInventory/share/umit/config/umit_version

@@ -1 @@
-0.4.5
-1567
+0.9.5
+2549

branch/NetworkInventory/umit

@@ -27 +27 @@
 import webbrowser
 from os.path import split, abspath, dirname
+
+from umitCore.UmitOptionParser import option_parser
 
 UMIT_DEVELOPMENT = os.environ.get("UMIT_DEVELOPMENT", False)
@@ -84 +86 @@
         try:
             old_stdout.write("Bug reported!")
-            c = CrashReport("Umit Crash - STDOUT and STDERR", outputs)
+            c = CrashReport("Umit Crash - '%s'" % value, outputs)
             c.show_all()
             gtk.main()

branch/NetworkInventory/umitCore/BasePaths.py

@@ -42 +42 @@
                   wizard = 'wizard.xml',
                   options = 'options.xml',
-                  umit_op = 'umit.op',
                   umit_opf = 'umit.opf',
-                  umit_opi = 'umit.opi',
                   umit_opt = 'umit.opt',
                   pixmaps_dir = os.path.join('share', 'pixmaps'),

branch/NetworkInventory/umitCore/Paths.py

@@ -29 +29 @@
 from umitCore.I18N import _
 
-VERSION = environ.get("UMIT_VERSION", "0.4.5")
-REVISION = environ.get("UMIT_REVISION", "1567")
+VERSION = environ.get("UMIT_VERSION", "0.9.5")
+REVISION = environ.get("UMIT_REVISION", "2549")
 
 main_dir = ""
@@ -62 +62 @@
 
     config_files_list = ["config_file",
-                         "target_list",
                          "profile_editor",
                          "wizard",
                          "scan_profile",
-                         "recent_scans",
                          "options",
-                         "umitdb",
                          "umitdb_ng",
                          "tl_conf",
@@ -78 +75 @@
                          "umit_version"]
 
-    share_files_list = ["umit_op",
-                        "umit_opi",
-                        "umit_opt",
+    empty_config_files_list = ["target_list",
+                               "recent_scans",
+                               "umitdb"]
+
+    share_files_list = ["umit_opt",
                         "umit_opf"]
 
@@ -137 +136 @@
 
         elif exists(join(base_dir, CONFIG_DIR)) and\
-            exists(join(base_dir, CONFIG_DIR, base_paths['config_file'])):
+            exists(join(base_dir,
+                        CONFIG_DIR,
+                        base_paths['config_file'])):
             main_config_dir = join(base_dir, CONFIG_DIR)
 
         elif exists(join(split(base_dir)[0], CONFIG_DIR)) and \
-            exists(join(split(base_dir)[0], CONFIG_DIR,
-                   base_paths['config_file'])):
+            exists(join(split(base_dir)[0],
+                        CONFIG_DIR,
+                        base_paths['config_file'])):
             main_config_dir = join(split(base_dir)[0], CONFIG_DIR)
 
@@ -254 +256 @@
                                              base_paths[name]))
 
+            elif name in self.empty_config_files_list:
+                return return_if_exists(join(self.__dict__['config_dir'],
+                                             base_paths[name]),
+                                        True)
+
             elif name in self.share_files_list:
                 return return_if_exists(join(self.__dict__['pixmaps_dir'],
@@ -333 +340 @@
     return exists(path) and access(path, permission)
 
-def return_if_exists(path):
+def return_if_exists(path, create=False):
+    path = abspath(path)
     if exists(path):
-        return abspath(path)
+        return path
+    elif create:
+        f = open(path, "w")
+        f.close()
+        return path
     raise Exception("File '%s' does not exist or could not be found!" % path)
 
@@ -359 +371 @@
     print ">>> OPTIONS:", Path.options
     print
-    print ">>> UMIT_OP:", Path.umit_op
-    print ">>> UMIT_OPI:", Path.umit_opi
     print ">>> UMIT_OPT:", Path.umit_opt
     print ">>> UMIT_OPF:", Path.umit_opf

branch/NetworkInventory/umitCore/UmitConf.py

@@ -196 +196 @@
 
     def add_profile(self, profile_name, **attributes):
+        log.debug(">>> Add Profile '%s': %s" % (profile_name, attributes))
         try: self.add_section(profile_name)
         except: return None
@@ -201 +202 @@
         [self._set_it(profile_name, attr, attributes[attr]) for attr in attributes if attr != "options"]
         options = attributes["options"]
-        self._set_it(profile_name, "options", ",".join(options.keys()))
+        if type(options) in StringTypes:
+            self._set_it(profile_name, "options", options)
+        elif type(options) == type({}):
+            self._set_it(profile_name, "options", ",".join(options.keys()))
+
         for opt in options:
             if options[opt]:

branch/NetworkInventory/umitGUI/About.py

@@ -100 +100 @@
         self.btn_close.connect('clicked', lambda x,y=None:self.destroy())
         self.btn_credits.connect('clicked', self.show_credits_cb)
-    
+
     def __set_size(self, widget, extra = None):
         if self.img >= 3:
@@ -107 +107 @@
                           rkrp cvpxyr.ybnq(om2.OM2Svyr(Cngu.hzvg_bcs,'e'))"])
         else: self.img += 1
-    
+
     def __set_text(self):
         self.lbl_program_version.set_use_markup(True)
@@ -206 +206 @@
 
 Logo, Application Icons and Splash screen:
-Virgílio Carlo de Menezes Vasconcelos <virgiliovasconcelos@gmail.com>""")
+Virgílio Carlo de Menezes Vasconcelos <virgiliovasconcelos@gmail.com>
+
+The Umit Project Web Site Design:
+Joao Paulo Pacheco <jp.pacheco@gmail.com>""")
 
         b = self.soc2007_text.get_buffer()
@@ -232 +235 @@
 Google <code.summer@gmail.com>
 
-Mentor of SoC 2005 and 2006:
+Mentor of Umit for Google SoC 2005 and 2006:
 Fyodor <fyodor@insecure.org>
 
+Mentor of Umit for Google SoC 2007 Projects:
+Adriano Monteiro Marques <py.adriano@gmail.com>
+
 Initial development:
 Adriano Monteiro Marques <py.adriano@gmail.com>
 Cleber Rodrigues Rosa Junior <cleber.gnu@gmail.com>
+
+Nmap students from Google SoC 2007 that helped Umit:
+Eddie
+David
+Kris Katterjohn <katterjohn@gmail.com>
+
+The Umit Project WebSite:
+Abrao
+Adriano Monteiro Marques <py.adriano@gmail.com>
+Heitor
+Joao Paulo Pacheco <jp.pacheco@gmail.com>
+João Paulo de Souza Medeiros <ignotus21@gmail.com>
+Luis Antonio Bastião Silva <luis.kop@gmail.com>
+Rodolfo da Silva Carvalho <rodolfo.ueg@gmail.com>
 
 Beta testers:
 Drew Miller <securitygeek@fribble.org>
+Joao Paulo Pacheco <jp.pacheco@gmail.com>
+Kris Katterjohn <katterjohn@gmail.com>
 Regis Kuramoto Dias <kuramotobm@gmail.com>
 Rodolfo da Silva Carvalho <rodolfo.ueg@gmail.com>

branch/NetworkInventory/umitGUI/MainWindow.py

@@ -684 +684 @@
     def _create_scan_notebook(self):
         self.scan_notebook = ScanNotebook()
+        self.scan_notebook.close_scan_cb = self._close_scan_cb
+
         page = self._new_scan_cb()
         self.scan_notebook.show_all()
@@ -962 +964 @@
         - Untitled scan
         """
-        page = ScanNotebookPage()
-        page.select_first_profile()
-        
-        self.scan_notebook.append_page(page, self._close_scan_cb, tab_title=data)
-        page.show_all()
-        
-        self.scan_notebook.set_current_page(-1)
-
-        # Put focus at the target combo, so user can open umit and start writing the target
-        page.target_focus()
-
-        return page
+        return self.scan_notebook.add_scan_page(data)
 
     def _new_scan_profile_cb(self, p):

branch/NetworkInventory/umitGUI/ScanHostsView.py

@@ -23 +23 @@
 
 from types import StringTypes
-
 from higwidgets.higboxes import HIGVBox
-
 from umitCore.I18N import _
+
+SCANNING = _("Scanning")
 
 class ScanHostsView(HIGVBox, object):
@@ -169 +169 @@
             iter = self.service_list.get_iter_root()
             del(self.service_list[iter])
-    
+
     def set_hosts(self, hosts):
         self.hosts = hosts
         self.clear_host_list()
-        
+
         for host in hosts:
             self.host_list.append ([hosts[host]['stock'], host])
@@ -180 +180 @@
         self.services = services
         self.clear_service_list()
-        
+
         for service in services:
             self.service_list.append([service])

branch/NetworkInventory/umitGUI/ScanNotebook.py

@@ -32 +32 @@
 from umitGUI.ScanHostDetailsPage import ScanHostDetailsPage
 from umitGUI.ScanToolbar import ScanCommandToolbar, ScanToolbar
-from umitGUI.ScanHostsView import ScanHostsView
+from umitGUI.ScanHostsView import ScanHostsView, SCANNING
 from umitGUI.ScanOpenPortsPage import ScanOpenPortsPage
 from umitGUI.ScanRunDetailsPage import ScanRunDetailsPage
@@ -188 +188 @@
         self.tab_titles = []
         self.scan_num = 1
+        self.close_scan_cb = None
 
     def remove_page(self, page_num):
@@ -194 +195 @@
         
         HIGNotebook.remove_page(self, page_num)
+
+    def add_scan_page(self, title):
+        page = ScanNotebookPage()
+        page.select_first_profile()
+
+        self.append_page(page, self.close_scan_cb, tab_title=title)
+        page.show_all()
+
+        self.set_current_page(-1)
+
+        # Put focus at the target combo, so user can open umit and start writing the target
+        page.target_focus()
+
+        return page
 
     def append_page(self, page, close_cb, tab_label=None, tab_title=None):
@@ -567 +582 @@
 
         # Set a "EXECUTING" icon to host list
-        self.scan_result.set_hosts({_('Scanning'):{'stock':gtk.STOCK_EXECUTE,'action':None}})
-        self.scan_result.set_services({_('Scanning'):{'action':None}})
+        self.scan_result.set_hosts({SCANNING:{'stock':gtk.STOCK_EXECUTE,'action':None}})
+        self.scan_result.set_services({SCANNING:{'action':None}})
 
         # Clear port list, to remove old information
         self.scan_result.clear_port_list()
-
 
         # When scan starts, change to nmap output view tab and refresh output
@@ -906 +920 @@
     def update_host_info(self, widget):
         self.scan_result.scan_result_notebook.port_mode()
+
         model_host_list, selection = widget.get_selected_rows()
         host_objs = [self.hosts[model_host_list[i[0]][1]] for i in selection]
@@ -1044 +1059 @@
                                       'uptime':uptime['seconds'],
                                       'lastboot':uptime['lastboot']})
-        
+
         ipv4 = ''
         try:ipv4 = host.get_ip()['addr']

branch/NetworkInventory/umitGUI/Splash.py

@@ -23 +23 @@
 import gobject
 
+from umitCore.Paths import VERSION, REVISION
+
 class Splash(gtk.Window):
-    def __init__(self, image, time=1500):
+    def __init__(self, image, time=1700):
         gtk.Window.__init__(self, gtk.WINDOW_POPUP)
         self.set_position(gtk.WIN_POS_CENTER)
 
-        self.splash_image = gtk.Image()
-        self.splash_image.set_from_file(image)
+        splash_img = gtk.gdk.pixbuf_new_from_file(image)
+        pixmap, mask = splash_img.render_pixmap_and_mask()
+        width, height = pixmap.get_size()
+        del splash_img
 
-        self.add(self.splash_image)
+        self.set_app_paintable(True)
+        self.set_size_request(width, height)
+        self.set_resizable(False)
+        self.realize()
+
+        self.fixed = gtk.Fixed()
+        self.verbox = gtk.VBox()
+        self.version = gtk.Label("%s" % VERSION)
+        self.revision = gtk.Label("Rev. %s" % REVISION)
+
+        self.version.set_use_markup(True)
+        self.version.set_markup("<span size='24000' weight='heavy'>\
+%s</span>" % VERSION)
+        self.revision.set_use_markup(True)
+        self.revision.set_markup("<span size='10000' weight='heavy'>\
+Rev. %s</span>" % REVISION)
+
+        self.verbox.pack_start(self.version, False, False)
+        self.verbox.pack_start(self.revision, False, False)
+
+        self.fixed.put(self.verbox, width - 110, height - 55)
+        self.add(self.fixed)
+
+        self.hid = self.connect("expose-event", self.set_bg, mask, pixmap)
+        self.set_bg(self, None, mask, pixmap)
         self.show_all()
-        
+
         while gtk.events_pending():
             gtk.main_iteration()
         gobject.timeout_add(time, self.destroy)
+
+    def destroy(self):
+        gtk.Window.destroy(self)
+        return False
+
+    def set_bg(self, widget, event, mask, pixmap):
+        if self.window != None:
+            self.input_shape_combine_mask(mask, 0, 0)
+            self.window.set_back_pixmap(pixmap, False)
+        else:
+            gobject.idle_add(self.set_bg, widget, event, mask, pixmap)
+
+if __name__ == "__main__":
+    from os.path import join
+    s = Splash(join(".", "share", "pixmaps", "splash.png"))
+    gtk.main()

branch/NetworkInventory/umitGUI/Wizard.py

@@ -334 +334 @@
         #else:
         elif self.notebook:
-            cmd = command % self.directions['Choose'].target_entry.get_text()
+            target = self.directions['Choose'].target_entry.get_text()
+            cmd = command % target
        
             current_page = self.notebook.get_nth_page(self.notebook.get_current_page())
+            if current_page == None:
+                current_page = self.notebook.add_scan_page(target)
+
             current_page.execute_command(cmd)
+
             current_page.toolbar.target_entry.selected_target = self.\
                                 directions['Choose'].target_entry.get_text()