Changeset 3821

Timestamp:

12/15/08 12:29:21 (4 years ago)

Author:

gpolo

Message:

Merged revisions 1370,1377,1406,1450-1453,1458,1463-1464 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r1370 | ignotus21 | 2007-08-14 22:16:00 -0300 (Tue, 14 Aug 2007) | 1 line

Solve the missing markup in 'OS Class' on HostDetailsPage?.

........

r1377 | ejlb | 2007-08-15 09:27:32 -0300 (Wed, 15 Aug 2007) | 2 lines

Merge from r5558. Error message when no target is specified

........

r1406 | ejlb | 2007-08-17 06:38:06 -0300 (Fri, 17 Aug 2007) | 1 line

Merge from r5593. Now .usr is only added when no extension is specified by the user

........

r1450 | ejlb | 2007-08-20 07:30:40 -0300 (Mon, 20 Aug 2007) | 7 lines

Merge from r5624 nmap trunk

Added support to umit for searching unsaved scans. If an unsaved scan
matches the search query it's name (prepended with 'Unsaved') will
appear in the results. When it is clicked on the scans tab will be
automatically switched to.

........

r1451 | boltrix | 2007-08-20 09:39:21 -0300 (Mon, 20 Aug 2007) | 1 line

Setting a less restrictive umask during installation

........

r1452 | boltrix | 2007-08-20 09:48:17 -0300 (Mon, 20 Aug 2007) | 1 line

Resolved the conflict generated by the update version script

........

r1453 | boltrix | 2007-08-20 09:55:03 -0300 (Mon, 20 Aug 2007) | 1 line

Removed umit.db from setup.py

........

r1458 | boltrix | 2007-08-20 11:31:10 -0300 (Mon, 20 Aug 2007) | 1 line

Now setup will set permission to every file installed, except the umit script, which distutils already take care of. The system wide umask didn't work.

........

r1463 | boltrix | 2007-08-20 15:29:52 -0300 (Mon, 20 Aug 2007) | 1 line

Now, umit will find the modules path even if the user used --prefix to specify a different path for installation

........

r1464 | boltrix | 2007-08-20 16:59:10 -0300 (Mon, 20 Aug 2007) | 1 line

Installer will set perms of reguar files to 644 instead of 744

........

Location:

branch/NetworkInventory

Files:

• . (modified) (1 prop)
• install_scripts/macosx/setup.py (modified) (2 diffs)
• install_scripts/unix/MANIFEST.in (modified) (1 diff)
• install_scripts/unix/setup.py (modified) (4 diffs)
• install_scripts/utils/add_splash_version.py (modified) (1 diff)
• install_scripts/windows/setup.py (modified) (2 diffs)
• share/pixmaps/splash.png (modified) (previous)
• share/umit/config/umit_version (modified) (1 diff)
• umitCore/Diff.py (modified) (1 diff)
• umitCore/NmapParser.py (modified) (2 diffs)
• umitCore/Paths.py (modified) (2 diffs)
• umitCore/SearchResult.py (modified) (1 diff)
• umitGUI/MainWindow.py (modified) (2 diffs)
• umitGUI/ScanHostDetailsPage.py (modified) (1 diff)
• umitGUI/ScanNotebook.py (modified) (2 diffs)
• umitGUI/SearchGUI.py (modified) (5 diffs)
• umitGUI/SearchWindow.py (modified) (2 diffs)

branch/NetworkInventory

@@ -1 @@
-/trunk:1-560
+/trunk:1-560,1370-1397,1399-1418,1420-1464

@@ -1 @@
-/trunk:1-560
+/trunk:1-560,1370-1397,1399-1418,1420-1464

branch/NetworkInventory/install_scripts/macosx/setup.py

@@ -27 +27 @@
 
 VERSION = "0.9.4"
-REVISION = "1288"
+REVISION = "1453"
 
 # Directories for POSIX operating systems
@@ -59 +59 @@
                             [os.path.join(config_dir, 'scan_profile.usp')] +
                             [os.path.join(config_dir, 'umit_version')] +
-                            [os.path.join(config_dir, 'umit.db')] + 
                             glob(os.path.join(config_dir, '*.xml'))+
                             glob(os.path.join(config_dir, '*.txt'))),

branch/NetworkInventory/install_scripts/unix/MANIFEST.in

@@ -10 +10 @@
 recursive-include share/umit/docs/wizard *.xml
 recursive-include share/umit/docs/screenshots *.png
-recursive-include share/umit/config *.xml *.conf *.usp *.txt *.db umit_version
+recursive-include share/umit/config *.xml *.conf *.usp *.txt umit_version
 recursive-include share/umit/misc *.dmp
 recursive-include umitCore *.py

branch/NetworkInventory/install_scripts/unix/setup.py

@@ -26 +26 @@
 
 from glob import glob
-from stat import ST_MODE
+from stat import ST_MODE, S_IRWXU, S_IRGRP, S_IROTH
 
 
 VERSION = "0.9.4"
-REVISION = "1288"
+REVISION = "1463"
 
 # Directories for POSIX operating systems
@@ -118 +118 @@
         install.run(self)
 
+        self.set_perms()
+        self.set_modules_path()
         self.fix_paths()
         self.create_uninstaller()
@@ -156 +158 @@
         mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0555) & 07777
         os.chmod(uninstaller_filename, mode)
+
+    def set_modules_path(self):
+        umit = os.path.join(self.install_scripts, "umit")
+        modules = self.install_lib
+
+        re_sys = re.compile("^import sys$")
+
+        ufile = open(umit, "r")
+        ucontent = ufile.readlines()
+        ufile.close()
+
+        uline = None
+        for line in xrange(len(ucontent)):
+            if re_sys.match(ucontent[line]):
+                uline = line + 1
+                break
+
+        ucontent.insert(uline, "sys.path.append('%s')\n" % modules)
+
+        ufile = open(umit, "w")
+        ufile.writelines(ucontent)
+        ufile.close()
+
+        print ">>> UMIT", open(umit, "r").readlines()[:uline + 5]
+
+    def set_perms(self):
+        re_bin = re.compile("(bin)")
+        for output in self.get_outputs():
+            if re_bin.findall(output):
+                continue
+
+            if os.path.isdir(output):
+                os.chmod(output, S_IRWXU | \
+                                 S_IRGRP | \
+                                 S_IXGRP | \
+                                 S_IROTH | \
+                                 S_IXOTH)
+            else:
+                os.chmod(output, S_IRUSR |
+                                 S_IWUSR | \
+                                 S_IRGRP | \
+                                 S_IROTH)
 
     def fix_paths(self):
@@ -241 +285 @@
       version = VERSION,
       scripts = ['umit', 'scheduler-umit'],
-      packages = ['', 'umitCore', 'umitDB', 'umitGUI', 'umitInventory', 
+      packages = ['', 'umitCore', 'umitDB', 'umitGUI', 'umitInventory',
                   'higwidgets'],
       data_files = data_files,

branch/NetworkInventory/install_scripts/utils/add_splash_version.py

@@ -30 +30 @@
 FONT = os.path.join(BASE_DIR, "fonts", "FreeSansBold.ttf")
 VERSION = "0.9.4"
-REVISION = "1288"
+REVISION = "1453"
 
 splash = Image.open(os.path.join(BASE_DIR, "images", "splash.png"))

branch/NetworkInventory/install_scripts/windows/setup.py

@@ -31 +31 @@
 
 VERSION = "0.9.4"
-REVISION = "1288"
+REVISION = "1453"
 
 # Directories for POSIX operating systems
@@ -73 +73 @@
                             [os.path.join(config_dir, 'scan_profile.usp')] +
                             [os.path.join(config_dir, 'umit_version')] +
-                            [os.path.join(config_dir, 'umit.db')] + 
                             glob(os.path.join(config_dir, '*.xml'))+
                             glob(os.path.join(config_dir, '*.txt'))),

branch/NetworkInventory/share/umit/config/umit_version

@@ -1 +1 @@
 0.9.4
-1288
+1453

branch/NetworkInventory/umitCore/Diff.py

@@ -31 +31 @@
         
         self.umit_top_banner = ['|'+'-'*70+'|\n',
-                            '|'+_('UMIT - The nmap frontend').center (70)+'|\n',
-                            '|'+_('http://umit.sourceforge.net').center(70)+'|\n',
-                            '|'+' '*70+'|\n',
-                            '|'+_('This diff was generated by UMIT').center(70)+'|\n',
-                            '|'+_("(Changes to this file can make UMIT unable to read it.)").center(70)+'|\n',
-                            '|'+'-'*70+'|\n',
-                            '\n',
-                            '-'*10+_(' Start of diff ')+'-'*10+'\n']
+            '|'+_('UMIT - The nmap frontend').center (70)+'|\n',
+            '|'+_('http://umit.sourceforge.net').center(70)+'|\n',
+            '|'+' '*70+'|\n',
+            '|'+_('This diff was generated by UMIT').center(70)+'|\n',
+            '|'+_("(Changes to this file can make UMIT unable to read it.)").center(70)+'|\n',
+            '|'+'-'*70+'|\n',
+            '\n',
+            '-'*10+_(' Start of diff ')+'-'*10+'\n']
         
         self.end_diff = ['\n'+'-'*10+_(' End of diff ')+'-'*10+'\n']

branch/NetworkInventory/umitCore/NmapParser.py

@@ -751 +751 @@
 
         self.nmap_xml_file = None
+        self.unsaved = False
 
     def set_parser(self, parser):
@@ -1271 +1272 @@
                 return xml_file
 
+    def set_unsaved(self):
+        self.unsaved = True
+
+    def is_unsaved(self):
+        return self.unsaved
 
 def nmap_parser_sax(nmap_xml_file=""):

branch/NetworkInventory/umitCore/Paths.py

@@ -30 +30 @@
 
 VERSION = "0.9.4"
-REVISION = "1288"
+REVISION = "1453"
 
 CONFIG_DIR = join("share", "umit", "config")
@@ -295 +295 @@
     copy_config_file("target_list.txt", main_dir, user_dir)
     copy_config_file("umit_version", main_dir, user_dir)
-    copy_config_file("umit.db", main_dir, user_dir)
     copy_config_file("umitng.db", main_dir, user_dir)
     copy_config_file("timeline-settings.conf", main_dir, user_dir)

branch/NetworkInventory/umitCore/SearchResult.py

@@ -295 +295 @@
                     yield parsed
 
+class SearchTabs(SearchResult, object):
+    def __init__(self, notebook):
+        self.scan_notebook = notebook
+
+    def get_scan_results(self):
+        scan_file = None
+        for i in range(self.scan_notebook.get_n_pages()):
+            sbook_page = self.scan_notebook.get_nth_page(i)
+
+            if not sbook_page.status.get_empty():
+                scan_file = sbook_page.command_execution.get_xml_output_file()
+            if scan_file and os.access(scan_file, os.R_OK) and os.path.isfile(scan_file):
+                log.debug(">>> Retrieving unsaved scan result: %s" % scan_file)
+
+                try:
+                    parsed = NmapParser()
+                    parsed.set_xml_file(scan_file)
+                    parsed.parse()
+                    parsed.set_scan_name("Unsaved " + sbook_page.get_tab_label())
+                    parsed.set_unsaved()
+                except:
+                    pass
+                else:
+                    yield parsed
 
 if __name__ == "__main__":

branch/NetworkInventory/umitGUI/MainWindow.py

@@ -469 +469 @@
 
     def _search_scan_result(self, widget):
-        search_window = SearchWindow(self._load_search_result)
+        search_window = SearchWindow(self._load_search_result, self.scan_notebook)
         search_window.show_all()
 
     def _load_search_result(self, results):
         for result in results:
-            page = self._load(parsed_result=results[result][1],
+            if results[result][1].is_unsaved():
+                for i in range(self.scan_notebook.get_n_pages()):
+                    if results[result][0] == "Unsaved " + \
+                    self.scan_notebook.get_nth_page(i).get_tab_label():
+                        self.scan_notebook.set_current_page(i)
+            else:
+                page = self._load(parsed_result=results[result][1],
                               title=results[result][1].scan_name)
-            page.status.set_search_loaded()
+                page.status.set_search_loaded()
 
     def _close_scan_cb(self, widget, data=None):
@@ -867 +873 @@
             if (response == gtk.RESPONSE_OK):
                 filename = self._save_results_filechooser_dialog.get_filename()
-                filter = self._save_results_filechooser_dialog.get_filter()
-                # determine file extension from filter and filename
-                if (filter.get_name() == "UMIT Scan Results (*.usr)" and
-                not (filename.find('.usr') == len(filename)-4)):
-                    filename += '.usr'
+                # add .usr to filename if there is no other extension
+                if filename.find('.') == -1:
+                    filename += ".usr"
                 self._save(current_page, filename)
                 

branch/NetworkInventory/umitGUI/ScanHostDetailsPage.py

@@ -265 +265 @@
             try:
                 self.set_osclass(os['osclass'])
+                self.osclass_expander.set_use_markup(True)
                 table.attach(self.osclass_expander,0,2,y1,y2)
             except:pass

branch/NetworkInventory/umitGUI/ScanNotebook.py

@@ -461 +461 @@
             self.set_tab_label(profile)
 
-        ####
-        # Setting status to scanning
-        self.status.set_scanning()
-        ####
-        
         if target != '':    
             self.toolbar.add_new_target(target)
 
+        if (command.find("-iR") == -1 and command.find("-iL") == -1):
+            if command.find("<target>") > 0:
+                warn_dialog = HIGAlertDialog(message_format=_("No Target Host!"), 
+                                             secondary_text=_("Target specification \
+is mandatory. Either by an address in the target input box or through the '-iR' and \
+'-iL' nmap options. Aborting scan."),
+                                             type=gtk.MESSAGE_ERROR)
+                warn_dialog.run()
+                warn_dialog.destroy()
+                return
+
         if command != '':
+            # Setting status to scanning
+            self.status.set_scanning()
             self.execute_command(command)
         else:
@@ -480 +488 @@
             warn_dialog.run()
             warn_dialog.destroy()
-    
+
     def close_tab(self):
         try:

branch/NetworkInventory/umitGUI/SearchGUI.py

@@ -37 +37 @@
 from umitCore.UmitLogging import log
 from umitCore.NmapParser import months
-from umitCore.SearchResult import SearchDir, SearchDB
+from umitCore.SearchResult import SearchDir, SearchDB, SearchTabs
 from umitCore.UmitConf import SearchConfig
 
@@ -50 +50 @@
 
 class SearchGUI(gtk.HPaned, object):
-    def __init__(self):
+    def __init__(self, notebook):
         gtk.HPaned.__init__(self)
 
@@ -89 +89 @@
         self.scan_num = 1
         self.id = 0
+        self.notebook = notebook
 
     def _create_widgets(self):
@@ -424 +425 @@
                 self.append_result(result)
 
-
         if self.directory:
             search_dir = SearchDir(self.directory, self.file_extension)
@@ -430 +430 @@
             for result in search_dir.search(**search_dict):
                 self.append_result(result)
+
+        search_tabs = SearchTabs(self.notebook)
+        for result in search_tabs.search(**search_dict):
+            self.append_result(result)  
 
     def clear_result_list(self):

branch/NetworkInventory/umitGUI/SearchWindow.py

@@ -52 +52 @@
 
 class SearchWindow(BaseSearchWindow, object):
-    def __init__(self, load_method):
+    def __init__(self, load_method, notebook):
         BaseSearchWindow.__init__(self)
 
         self.load_method = load_method
+        self.notebook = notebook
 
         self._create_widgets()
@@ -66 +67 @@
         self.btn_open = HIGButton(stock=gtk.STOCK_OPEN)
         self.btn_close = HIGButton(stock=gtk.STOCK_CLOSE)
-        self.search_gui = SearchGUI()
+        self.search_gui = SearchGUI(self.notebook)
 
     def _pack_widgets(self):

@@ -1 @@
-/trunk:1-560
+/trunk:1-560,1370-1397,1399-1418,1420-1464