Changeset 5839

Timestamp:

08/19/10 23:56:55 (3 years ago)

Author:

diogo

Message:

changed quickscan to display nmap output

Location:

network-scanner/branches/GSoC2010/umit/gui/qs

Files:

• EntryField.py (modified) (15 diffs)
• Main.py (modified) (3 diffs)

network-scanner/branches/GSoC2010/umit/gui/qs/EntryField.py

@@ -23 +23 @@
 import re
 from datetime import datetime
+from subprocess import Popen, PIPE
 
 import gobject
 import gtk
+import shlex
+import traceback
 from gtk import gdk
 
@@ -38 +41 @@
 from umit.core.qs.Nmap import Nmap
 from umit.core.TargetList import TargetList
+from umit.core.UmitLogging import log
+from umit.gui.NmapOutputViewer import NmapOutputViewer
 
 #TODO: Import this of core, changing it from ScanNotebook to core
@@ -128 +133 @@
         self.entry.set_max_length(1000)
         
-        #if not self.completion.get_model():
-            #self.load_data("host")
+        self.nmap_output = NmapOutputViewer()
+        # remove some buttons
+        self.nmap_output.hbox_buttons.remove(self.nmap_output.btn_output_properties)
+        self.nmap_output.hbox_buttons.remove(self.nmap_output.btn_refresh)
+        # add button to launch result in umit
+        self.btn_umit = gtk.Button ("Open Result")
+        self.nmap_output.hbox_buttons.pack_start(self.btn_umit)
+        
+        self.results_opened = False
+        
         self.load_data(None)
-        
-        self.result_text = HIGTextView()
-        self.result_text.set_editable(False)
-        self.result_text.set_cursor_visible(False)
-        self.result_text.set_justification(gtk.JUSTIFY_LEFT)
-        
-        # Menu to launch Network Scanner
-        #menu = gtk.Menu()
-        #menu_item = gtk.MenuItem("Open result on the Network Scanner")
-        #menu_item.connect('activate', self.launch_umit, self.result_text)
-        #menu.append(menu_item)
-        
-        #self.result_text.connect('activate', self.launch_umit)
-
-        self.buffer = self.result_text.get_buffer()
+         
+        self.btn_umit.connect("clicked", self._launch_umit, None)
         
         self.entry.show()
+        
+    def show_results(self):
+        """
+        Show scan output
+        """
+        if not self.results_opened:
+            self.vbox.pack_end(self.nmap_output)
+            self.vbox.show_all()
+            self.results_opened = True
+        
+    def hide_results(self):
+        """
+        Hide scan output
+        """
+        if self.results_opened:
+            self.vbox.remove(self.nmap_output)
+            self.results_opened = False
         
     def menu_to_umit(self, widget, button, time, data=None):
@@ -156 +173 @@
             data.show_all()
             
-    def launch_umit(self, widget, button):
+    def _launch_umit(self, widget, event):
         """
         Here will go the call to NetWork Scanner to display results previously
         loaded here.
         """
-        nscanner_call = "umit -f %s" % self.command_execution.get_normal_output_file()
-        if button == 3:
-            self.command_process = Popen(nscanner_call , bufsize=1, stdin=PIPE,
+        nscanner_call = "umit -f %s" % self.command_execution.get_xml_output_file()
+        args = shlex.split(nscanner_call)
+        print args
+        self.command_process = Popen(args, bufsize=1, stdin=PIPE,
                                          stdout=PIPE, stderr=PIPE)
 
@@ -173 +191 @@
         liststore = gtk.ListStore(str)
             
-        #if option == "host":
-        #    for _d in self.qs_data.get_target_list():
-        #        liststore.append([_d])
-        #elif option == "profile":
-        #    for _d in self.qs_data.get_profiles("profile_name"):
-        #        liststore.append([_d])
-        #elif option == "nmap_options":
-        #    for _d in self.qs_data.get_nmap_options():
-        #        liststore.append([_d])
-        #else:
-        for _d in self.qs_data.get_all().values():
-            for _i in _d:
-                liststore.append([_i])
+        if option == "host":
+            for _d in self.qs_data.get_target_list():
+                liststore.append([_d])
+        elif option == "profile":
+            for _d in self.qs_data.get_profiles("profile_name"):
+                liststore.append([_d])
+        elif option == "nmap_options":
+            for _d in self.qs_data.get_nmap_options():
+                liststore.append([_d])
+        else:
+            for _d in self.qs_data.get_all().values():
+                for _i in _d:
+                    liststore.append([_i])
             
         self.completion.set_model(liststore)
@@ -194 +212 @@
         self.entry.set_completion(self.completion)
         self.completion.set_text_column(0)
-        
-        #try:
-            #column = self.completion.get_text_column() + 1
-        #except:
-            #column = 0
-        
-        return
+
     
     #def load_if_not_complete(self, widget, event):
@@ -221 +233 @@
         return modelstr.lower().startswith(key.lower())
     
+    
     def on_completion_not_match(self, widget):
         """
@@ -228 +241 @@
         target_list = TargetList()
 
-            
         entered_text = self.entry.get_text()
 
@@ -283 +295 @@
                 alive = self.command_execution.scan_state()
 
+            file = self.command_execution.get_normal_output_file()
+            self.nmap_output.show_nmap_output(file)
+            self.show_results()
  
             
-            text_out = self.scan_result.set_nmap_output(possible_host, 
-                                    self.command_execution.get_normal_output(),
-                                    possible_profile)
+            #text_out = self.scan_result.set_nmap_output(possible_host, 
+            #                        self.command_execution.get_normal_output(),
+            #                        possible_profile)
                     
-            self.buffer.set_text(text_out)
-            self.vbox.pack_start(self.result_text, False, False, 0)
-            self.result_text.show()
+            #self.buffer.set_text(text_out)
+            #self.vbox.pack_start(self.result_text, False, False, 0)
+            #self.result_text.show()
         
             self.save_scan(possible_host)
@@ -302 +317 @@
         except:
             pass
+
         
     def on_completion_match(self, completion, model, iter):
         #get the text entered by the user
         entered_text = self.entry.get_text()
-
         
         if model[iter][0]:
@@ -336 +351 @@
                         text_out += "%s: %s\n" % (_t[0], _t[1])
                         
-                self.buffer.set_text(text_out)
-                self.vbox.pack_start(self.result_text, False, False, 0)
-                self.result_text.show()
+                #self.buffer.set_text(text_out)
+                #self.vbox.pack_start(self.result_text, False, False, 0)
+                #self.result_text.show()
                 
     
@@ -349 +364 @@
                     if not alive:
                         break
-                        
-                text_out = self.scan_result.set_nmap_output(possible_host, 
-                                self.command_execution.get_normal_output(),
-                                possible_profile)
-        
-                self.buffer.set_text(text_out)
-                self.vbox.pack_start(self.result_text, False, False, 0)
-                self.result_text.show()
+                    
+                file = self.command_execution.get_normal_output_file()
+                self.nmap_output.show_nmap_output(file)
+                self.show_results()
+                
+                #text_out = self.scan_result.set_nmap_output(possible_host, 
+                #                self.command_execution.get_normal_output(),
+                #                possible_profile)
+        
+                #self.buffer.set_text(text_out)
+                #self.vbox.pack_start(self.result_text, False, False, 0)
+                #self.result_text.show()
         
                 self.save_scan(possible_host)
@@ -365 +384 @@
         
             except:
-                pass
+                print("exception")
+                traceback.print_exc(file=sys.stdout)
             
             del data_from_db
@@ -373 +393 @@
             
     def on_backspace(self, entry):
-        if self.buffer.get_char_count() > 1:
-            self.buffer.set_text("")
-            #self.vbox.pack_start(self.result_text, False, False, 0)
-            self.vbox.remove(self.result_text)
-            self.resize(500,30)
-            self.result_text.show()
-            
+        self.hide_results()
+        self.resize(500,30)
         self.b_text = ""
 
@@ -499 +514 @@
         
     def set_nmap_output(self, host, msg, command):
+        
+        # Nmap output in parameter msg
       
         text_out = "Running a %s on %s...\n" % (command, host)

network-scanner/branches/GSoC2010/umit/gui/qs/Main.py

@@ -52 +52 @@
         HIGMainWindow.__init__(self)
         self.vbox = HIGVBox()
+        self.main_hbox = gtk.HBox()
         self.set_default_size(500, 30)
         self.set_border_width(0)
@@ -69 +70 @@
         EntryField.__init__(self)
         self.set_title("Umit QuickScan")
-        self.add(self.vbox)
+        self.add(self.main_hbox)
         self.set_position(gtk.WIN_POS_CENTER)
         
@@ -91 +92 @@
         status_icon.set_visible(True)
 
-        self.vbox.show()
+        
+        self.main_hbox.pack_start(self.vbox, True, True, 6)
+        self.vbox.pack_start(self.entry, False, True, 6)
         self.show_all()
-        self.vbox.pack_start(self.entry,False)
                 
-        libkeybinder.bind(libkeybinder.Modifiers['ctrl'], 'x', unhide_callback, self)
+        libkeybinder.bind(libkeybinder.Modifiers['alt'], 'q', unhide_callback, self)
         
     def minimize_to_tray(self, widget):