Changeset 5900

Timestamp:

04/09/11 16:30:52 (2 years ago)

Author:

luis

Message:

(Network Scanner) Added branch to integrate BT with new namespace

Location:

network-scanner/branches/BTIntegration

Files:

• . (copied) (copied from network-scanner/trunk)
• share/doc/umit/src/searching.rst (modified) (3 diffs)
• share/umit/config/scan_profile.usp (modified) (1 diff)
• share/umit/config/umit.conf (modified) (8 diffs)
• umit/gui/FileChoosers.py (modified) (2 diffs)
• umit/gui/MainWindow.py (modified) (4 diffs)
• umit/gui/ScanNotebook.py (modified) (3 diffs)

network-scanner/branches/BTIntegration/share/doc/umit/src/searching.rst

@@ -2 +2 @@
 =========
 
-.. sectionauthor:: Adriano Monteiro Marques
+.. sectionauthor:: Luís A. Bastião Silva
 
 
@@ -8 +8 @@
 
    This documentation is not finished! Part or all of it's content may be
-   missing or inaccurate. As Umit is under constant development and
-   improvement, expect changes in this documentation at upcoming releases.
+   missing or inaccurate. As Umit Network Scanner is under constant development
+   and improvement, expect changes in this documentation at upcoming releases.
 
 
@@ -15 +15 @@
 ------------
 
-Nothing yet.
+Search Scan Results allow you to search scans executed previous.
+
+
+Openning Instructions
+---------------------
+
+To reach the Search Scan Results, make sure that Umit Network Scanner is open, 
+and then do one of  the following:
+
+   1. **Use the key-stroke**
+
+      * The key-stroke that shows the Compare Results Window is CTRL + F.
+
+   2. **Access from the Main Menu**
+
+      * Go to the *Main Menu* (the one on the top of the application),
+        Tools->Search Scan Results.
+
+Searching
+---------
+
+*Search Window* open possibility for users find a scan made in the past. Each 
+scan are stored in database become acessible the search.
+
+User has available other type of specific search:
+
+ * Host
+ * Service
+ * OS
+
+All selected options by user need to match, only in this condition a result will
+showed in results.
+ 
+General Search
+--------------
+In Search Window user has possibility to search by general paramenters choosing
+keywords, profiles or even options.
+
+
+Keyword: Free text keywords
+
+Profile: Choose Profile selected by Scan. "Any Profile" is the default value.
+
+Option: User will able to choose a specific option, eg. IPv6. The default value
+is "Any Option".
+
+
+Host Search
+-----------
+
+
+
+Service Search
+--------------
+
+
+OS Search
+---------
+
+
+Search Options
+--------------
+
+
+

network-scanner/branches/BTIntegration/share/umit/config/scan_profile.usp

@@ -64 +64 @@
 options = Disable ping,Ports to scan,Traceroute
 
+[umitbluetooth]
+description = 
+hint = 
+options = Umit Bluetooth Scan
+command = umitbluetooth
+annotation ='''
+
 [Nmap Intense Scan]
 tool = nmap

network-scanner/branches/BTIntegration/share/umit/config/umit.conf

@@ -6 +6 @@
 highlight = [65535, 65535, 65535]
 underline = 0
+
+[database]
+umit_decay = 60
+inventory_decay = 0
 
 [date_highlight]
@@ -33 +37 @@
 modified = [63881, 42182, 13193]
 
+[expose]
+host_list = 1
+show_toolbar = 1
+icons_toolbar_size = larger
+icons_toolbar = Both
+page_inside = 1
+details = 1
+
 [filtered_port_highlight]
 regex = \d{1,5}/.{1,5}\s+filtered\s+.*
@@ -41 +53 @@
 underline = 0
 
+[general_settings]
+log = File
+warnings = 1
+silent_root = 0
+splash = 1
+log_file = umit.log
+warnings_save = 1
+crash_report = 1
+
 [hostname_highlight]
-regex =  (\w{2,}://)?(([a-zA-Z0-9]|-)+\.)+([a-zA-Z]{2,}|com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|museum)([\w\d#/])*
+regex = (\w{2,}://)?(([a-zA-Z0-9]|-)+\.)+([a-zA-Z]{2,}|com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|museum)([\w\d#/])*
 bold = 1
 text = [0, 111, 65535]
@@ -48 +69 @@
 highlight = [65535, 65535, 65535]
 underline = 1
+
+[inventory]
+tips = True
+tabs_close_btn = True
 
 [ip_highlight]
@@ -56 +81 @@
 highlight = [65535, 65535, 65535]
 underline = 0
+
+[mapper]
+layout = 1
+zoom = 1.0
+lower_ring = 10
+frames = 60
+ring = 30
+view = address;hostname;icon;ring;region;slow
+interpolation = 1
+
+[network]
+username = 
+hostname = 
+proxy = 0
+password = 
+port = 
 
 [open_port_highlight]
@@ -71 +112 @@
 nmap_command_path = nmap
 
+[plugins]
+paths = /home/bastiao/Umit/svn/network-scanner/trunk/share/umit/config/plugins
+plugins = 
+
 [port_list_highlight]
 regex = PORT\s+STATE\s+SERVICE(\s+VERSION)?\s.*
@@ -79 +124 @@
 underline = 0
 
-[search]
-search_db = 1
-file_extension = usr
-store_results = 1
-directory = 
-save_time = 60;days
-
-[general_settings]
-splash = 1 
-warnings = 1
-crash_report = 1
-log = File
-log_file = umit.log
-warnings_save = 1
-silent_root = 0
-
-[expose]
-icons_toolbar = Both
-icons_toolbar_size = larger
-show_toolbar = 1
-host_list = 1
-details = 1
-page_inside = 1
-
 [profiles]
 profile = profile_editor.xml
@@ -109 +130 @@
 scan_profile = scan_profile.usp
 
-[network]
-proxy = 0
-hostname = 
-port = 
-username = 
-password = 
-
-[database]
-umit_decay = 60
-inventory_decay = 0
-
-[inventory]
-tips = True
-tabs_close_btn = True
-
 [script_manager]
 columns_order = I;Name;Type;Description;Author;Categories;ID
 columns_visible = I;Name;Type;ID
+http_proxy = :3128
 use_internal_editor = 1
+view_description = 1
+ftp_proxy = :3128
+view_categories = 1
 view_toolbar = 1
-view_description = 1
-view_categories = 1
+external_command = gedit %%s
 view_statusbar = 1
-http_proxy = :3128
-ftp_proxy = :3128
-external_command = gedit %%s
 
-[mapper]
-frames = 60
-interpolation = 1
-layout = 1
-zoom = 1.0
-ring = 30
-lower_ring = 10
-view = address;hostname;icon;ring;region;slow
+[search]
+save_time = 60;days
+file_extension = usr
+store_results = 1
+directory = 
+search_db = 1
+

network-scanner/branches/BTIntegration/umit/gui/FileChoosers.py

@@ -41 +41 @@
         self.set_name(_("Umit Scan Profile (%s)") % pattern)
 
+class ResultUmitBluetooth(gtk.FileFilter):
+    def __init__(self):
+        gtk.FileFilter.__init__(self)
+
+        pattern = "*.ubt"
+        self.add_pattern(pattern)
+        self.set_name(_("Umit bluetooth (%s)") % pattern)
+
 class ResultsFileFilter(gtk.FileFilter):
     def __init__(self):
@@ -113 +121 @@
                                        action, buttons)
 
-        for f in (ResultsFileFilter(), AllFilesFileFilter()):
+        for f in (ResultsFileFilter(), ResultUmitBluetooth(), AllFilesFileFilter()):
             self.add_filter(f)
 

network-scanner/branches/BTIntegration/umit/gui/MainWindow.py

@@ -41 +41 @@
 from umit.gui.FileChoosers import SaveResultsFileChooserDialog
 from umit.gui.FileChoosers import ExportHTMLResultsFileChooserDialog
-from umit.gui.ScanNotebook import ScanNotebook, ScanNotebookPage, NmapScanNotebookPage
+from umit.gui.ScanNotebook import ScanNotebook, ScanNotebookPage, NmapScanNotebookPage, ScanNotebookPageBT
 from umit.gui.ScanPage import ScanPage
 from umit.gui.ProfileEditor import ProfileEditor
@@ -272 +272 @@
                ('New Scan',
                 gtk.STOCK_NEW,
-                _('_New Scan'),
+                _('_New nmap Scan'),
                 "<Control>T",
-                _('Create a new Scan Tab'),
+                _('Create a new nmap Scan Tab'),
                 self._new_scan_cb),
 
@@ -1095 +1095 @@
             log.debug(">>> Permissions to access file? %s" % os.access(filename,
                                                                        os.R_OK))
+            base, ext = os.path.splitext(filename)
+            if ext==".ubt" :
+                current_page.toolbar.profile_entry.set_selected_profile("umitbluetooth")
+                #scan_page.scan_result = ScanNotebookPageBT()
+                scan_page.scan_result.on_load(filename)
+                return
 
             # Parse result
@@ -1140 +1146 @@
     def _save_scan_results_cb(self, saving_page):
         current_page = self._current_page()
+        if current_page.toolbar.selected_profile=="umitbluetooth":
+            current_page.scan_result.on_save()
         
         try:

network-scanner/branches/BTIntegration/umit/gui/ScanNotebook.py

@@ -47 +47 @@
 from umit.core.UmitConf import CommandProfile, ProfileNotFound, Profile
 from umit.core.NmapParser import NmapParser
+from umit.core.umitbluetooth.ubt_parser import XMLDocument
+from umit.core.umitbluetooth import btcore
 from umit.core.Paths import Path
 from umit.core.UmitLogging import log
@@ -309 +311 @@
             service.get('service_version', ''))
 
+class ScanNotebookPageBT(HIGVBox):
+    __gsignals__ = {
+        'scan-finished' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, ())
+    }
+
+    def __init__(self):
+        HIGVBox.__init__(self)
+        # The borders are consuming too much space on Maemo. Setting it to
+        # 0 pixels while on Maemo
+        if is_maemo():
+            self.set_border_width(0)
+        
+        self.set_spacing(0)
+        self.status = PageStatus()
+        self.status.set_empty()
+        
+        self.changes = False
+        self.comments = {}
+        self.hosts = {}
+        self.services = {}
+
+        self.parsed = XMLDocument()#XXX file to be included for this ubt_parser.py
+        self.vpaned = gtk.VPaned()
+
+        self.__create_topbar()
+        self.__create_BT_MAP()
+        self.__create_SDPview()
+        self.__create_statusbar()
+        
+        self.saved = False
+        self.saved_filename = ''
+
+        self._pack_expand_fill(self.vpaned)
+        self._pack_expand_fill(self.status_bar)
+
+        PluginEngine().core.emit('ScanNotebookPage-created', self)
+
+    def __create_topbar(self):
+        hbox1 = gtk.HBox()
+        #Progressbar
+        self.progb = gtk.ProgressBar()
+        self.progb.set_text("")
+        self.progb.set_fraction(0)
+        hbox1.pack_end(self.progb, False, False, 5)
+
+        #Button
+        self.scanbutton = gtk.Button("Probe Devices")
+        self.scanbutton.connect("clicked", self.enter_cb)
+        hbox1.pack_end(self.scanbutton, False, False, 0)
+
+        #toggle button
+        self.sdp_borwsing= gtk.ToggleButton(label="SDP Browsing", use_underline=False)
+        self.sdp_borwsing.connect("toggled", self.sdp_cb)
+
+        hbox1.pack_end(self.sdp_borwsing, False, False, 0)
+        self._pack_noexpand_nofill(hbox1)
+
+    def __create_BT_MAP(self):
+        
+         # BT Map
+        self.scrolled_map = gtk.ScrolledWindow()
+        self.scrolled_map.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        self.mapmodel = gtk.ListStore(str, gtk.gdk.Pixbuf)
+        self.btmap =   gtk.IconView(self.mapmodel)      
+        self.btmap.connect("item-activated", self.iconclick_cb)
+        self.btmap.set_text_column(0)
+        self.btmap.set_pixbuf_column(1)
+        self.scrolled_map.add(self.btmap)
+        self.vpaned.pack1(self.scrolled_map, True, True)
+
+    def __create_SDPview(self):
+        hbox2 = gtk.HBox()
+        # Labels  
+        self.label = gtk.Label("Device Details\t\t\t\t\n\nName: " + "\nMAC: " + "\nManufacturer: ")
+        self.label.set_selectable(True)
+        self.label.set_alignment(0.4,0)
+        hbox2.pack_start(self.label, False)
+        
+        # SDP View
+        self.scrolled_info = gtk.ScrolledWindow()
+        self.scrolled_info.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)       
+        self.sdpview = gtk.TextView()   
+        self.sdpview.set_editable(False)
+        self.sdpview.get_buffer().set_text("SDP Info\n\nNote: Option Disabled by Default. To enable SDP, select the SDP option under the Preference tab.")
+        self.scrolled_info.add(self.sdpview)    
+        hbox2.pack_start(self.scrolled_info, True)      
+        self.vpaned.pack2(hbox2, True, True)
+
+    def __create_statusbar(self):
+        # Statusbar
+        self.status_bar = gtk.Statusbar()      
+        self.context_id = self.status_bar.get_context_id("Scan Status")
+        message_id = self.status_bar.push(self.context_id, "Idle")
+        self.status_bar.set_has_resize_grip(True)
+
+    def enter_cb(self, widget):
+        btcore.btcore().scan(self)
+
+    def iconclick_cb(self, path, action):        
+        iter = self.btmap.get_cursor()
+        buffer = str(iter[0])[:2].replace("(","")
+        btid = int(buffer)
+        print "Clicked Icon: "+ str(buffer)
+        btcore.btcore().set_info(self, btid)
+        #outputs the location of the icon numerically
+
+    def sdp_cb(self, action):
+        # action has not toggled yet         
+        text = ('Enabled', 'Disabled')[self.sdp_borwsing.get_active()==False]        
+        message_id = self.status_bar.push(self.context_id, "SDP Browsing is %s"%text)
+        btcore.btcore().set_sdp(text)        
+        return
+
+    def on_load(self, filename):
+        btcore.btcore().load_scan(self, filename)
+       
+    def on_save(self):
+        btcore.btcore().save_scan(self)
+
+
 
 class ScanNotebookPage(HIGVBox):
@@ -541 +663 @@
         #log.debug(">>> Target: %s" % target)
         
-        try:
-            cmd_profile = CommandProfile()
-            command = cmd_profile.get_command(profile) % target
-            del(cmd_profile)
-            
-            # scan button must be enable if -iR or -iL options are passed
-            if command.find('-iR') != -1 or command.find('-iL') != -1:
-                self.page.toolbar.scan_button.set_sensitive(True)
-
-                # For these nmap options, target is unnecessary.
-                # Removes unnecessary target from the command
-                command = command.replace(target,'').strip()
-            elif target:
-                self.page.toolbar.scan_button.set_sensitive(True)
-            else:
-                self.page.toolbar.scan_button.set_sensitive(False)
-
-            self.command_toolbar.command = command
-        except ProfileNotFound:
-            pass
-            #self.profile_not_found_dialog()
-        except TypeError:
-            pass # That means that the command string conversion "%" didn't work
+        if profile == "umitbluetooth":
+            self.scan_result = ScanNotebookPageBT()
+            self.remove(self.get_children()[1])
+            self.command_toolbar.command="umitbluetooth"
+            self.command_toolbar.set_sensitive(False)
+            self.toolbar.target_entry.set_sensitive(False)
+            self.toolbar.scan_button.set_sensitive(False)
+            self._pack_expand_fill(self.scan_result)
+            self.show_all()
+        else:
+            self.scan_result = ScanResult()
+            self.remove(self.get_children()[1])
+            self.command_toolbar.set_sensitive(True)
+            self.toolbar.target_entry.set_sensitive(True)
+            self._pack_expand_fill(self.scan_result)
+            self.show_all()
+            try:
+                cmd_profile = CommandProfile()
+                command = cmd_profile.get_command(profile) % target
+                del(cmd_profile)
+                
+                # scan button must be enable if -iR or -iL options are passed
+                if command.find('-iR') != -1 or command.find('-iL') != -1:
+                    self.toolbar.scan_button.set_sensitive(True)
+
+                    # For these nmap options, target is unnecessary.
+                    # Removes unnecessary target from the command
+                    command = command.replace(target,'').strip()
+                elif target:
+                    self.page.toolbar.scan_button.set_sensitive(True)
+                else:
+                    self.page.toolbar.scan_button.set_sensitive(False)
+
+                self.command_toolbar.command = command
+            except ProfileNotFound:
+                pass
+                #self.profile_not_found_dialog()
+            except TypeError:
+                pass # That means that the command string conversion "%" didn't work
 
     def __create_scan_result(self):