Changeset 789

Timestamp:

06/12/07 04:45:14 (6 years ago)

Author:

ggpolo

Message:

fixes on new sample for timeline, added more retrieve methods in umitDB, changed umitInventory/viewer so it loads the new timeline sample and viewer also loads port and extraports data (this will change a lot, dont worry ;) )

Location:

branch/ggpolo

Files:

• umitDB/retrieve.py (modified) (1 diff)
• umitInventory/new-sample/new-sample-demo.py (modified) (5 diffs)
• umitInventory/viewer.py (modified) (21 diffs)

branch/ggpolo/umitDB/retrieve.py

@@ -360 +360 @@
         
         return fts
+    
+    
+    """
+    Missing (c1) for port data retrieve: ostype in service_info.
+    Reason: NmapParser doesn't handle this yet.
+    """
+    
+    def get_portid_and_fks_for_host_from_db(self, host):
+        """
+        Get portid and fks from port table, for a host.
+        """
+        debug("Getting portid and foreign keys for host id %d from \
+table port.." % host)
+        
+        pdata = self.cursor.execute("SELECT portid, fk_service_info, \
+                                    fk_protocol, fk_port_state FROM port \
+                                    JOIN _host_port ON \
+                                    (_host_port.fk_port=port.pk) \
+                                    WHERE _host_port.fk_host=?",
+                                    (host, )).fetchall()
+        
+        return pdata
+    
+    def get_port_data_for_pdata_from_db(self, protocol_id, port_state_id,
+                                        service_info_id):
+        """
+        Get port data based on data returned from
+        get_portid_and_fks_for_host_from_db
+        """
+        debug("Getting port data for pdata..")
+        
+        fullpdata = self.cursor.execute("SELECT protocol.name, \
+                        port_state.state, service_info.product, \
+                        service_info.version, service_info.extrainfo, \
+                        service_info.method, service_info.conf, \
+                        service_name.name FROM protocol, port_state, \
+                        service_info, service_name WHERE protocol.pk = ? AND \
+                        port_state.pk = ? AND service_info.pk = ? AND \
+                        service_name.pk = service_info.fk_service_name",
+                        (protocol_id, port_state_id, service_info_id)).fetchall()[0]
+        
+        return fullpdata
+    
+    """
+    End (c1)
+    """
+    
+    def get_extraports_data_for_host_from_db(self, host_id):
+        """
+        Get extraport data for host id
+        """
+        debug("Getting extraports data for host id %d" % host_id)
+        
+        epdata = self.cursor.execute("SELECT extraports.count, \
+                            port_state.state FROM extraports, port_state \
+                            WHERE extraports.fk_host = ? AND \
+                            port_state.pk = extraports.fk_port_state",
+                            (host_id, )).fetchall()[0]
+        return epdata
 
 

branch/ggpolo/umitInventory/new-sample/new-sample-demo.py

@@ -691 +691 @@
 
         for btn in self.tlbox:
-            self.goodp.append((x, y - (btn.evts['good'] * 11.55)))
-            self.badp.append((x, y - (btn.evts['bad'] * 11.55)))
-            self.nonep.append((x, y - (btn.evts['none'] * 11.55)))
-            self.unknownp.append((x, y - (btn.evts['unknown'] * 11.55)))
+            self.goodp.append((x, y - (btn.evts['good'] * (end_y/9.0)) + 1))
+            self.badp.append((x, y - (btn.evts['bad'] * (end_y/9.0)) + 1))
+            self.nonep.append((x, y - (btn.evts['none'] * (end_y/9.0)) + 1))
+            self.unknownp.append((x, y - (btn.evts['unknown'] * (end_y/9.0)) + 1))
             
             x += vdivs
@@ -716 +716 @@
         cr.rel_line_to(0, end_y + 10)
         cr.stroke()
-        cr.move_to(start_x - 10, start_y + end_y + 20)
-        cr.set_source_rgba(0, 0, 0, 0.6) 
-        cr.show_text('Jan')
+        t = 'Jan'
+        x_bearing, y_bearing, width, height, x_advance, y_advance = cr.text_extents(t)
+        cr.move_to(start_x - width/2, start_y + end_y + 20)
+        cr.set_source_rgba(0, 0, 0, 0.6)
+        cr.show_text(t)
         
         cr.set_source_rgb(0, 0, 0)
@@ -787 +789 @@
             cr.rel_line_to(0, 10)
             cr.stroke()
-            cr.move_to(start_v - 12, end_y + 30)
-            cr.show_text(months[h][:3])
+            # need to correctly align this
+            t = months[h][:3]
+            x_bearing, y_bearing, width, height, x_advance, y_advance = cr.text_extents(t)
+            cr.move_to(start_v - width/2, end_y + 30)
+            cr.show_text(t)
             
             start_v += vdivs
@@ -796 +801 @@
         if sel != -1:
             self.temp_level = 0
-            #self.painting_sel = True
             self.painting_sel = gobject.timeout_add(50, self._progressive_sel, sel, area)
-            #print self.painting_sel
             return True
         return False
@@ -1091 +1094 @@
 
     def do_size_request(self, requisition):
-        requisition.width = 10
-        requisition.height = 10
+        requisition.width = 360
+        requisition.height = 90
 
     def do_size_allocate(self, allocation):

branch/ggpolo/umitInventory/viewer.py

@@ -36 +36 @@
 import umitInventory.tl as tl
 
+from samplentl import samplentl_box
+
 try:
     umitdb = Path.umitdb_ng
@@ -274 +276 @@
         self.add_accel_group(self.main_accel_group)
         
+        self.viewernb = HIGNotebook()
+        
         self.invdb = InventoryRetrieve(umitdb)
         self.invtree = InventoryTree(self)
@@ -281 +285 @@
         self.invnbpages_objects = [ ]
         
+        self.newtl = samplentl_box()
+        self.newtl.show_all()
+        
+        """
         self.timeline = tl.main(testing_mode=True, zoom=3, 
                                 cell_border=False, border_on_focus=False,
@@ -290 +298 @@
         self.uparrow = tl.arrow(-3, self.timeline) # up arrow (zoom out)
         self.tl_dtitle = gtk.Label() # timeline title
+        """
         
         # statusbar
@@ -297 +306 @@
        
         # tooltips
+        """
         self.tooltips = gtk.Tooltips()
         self.tooltips.set_tip(self.tlyah, _("Timeline: You are here!"))
@@ -302 +312 @@
         self.tooltips.set_tip(self.rarrow, _("Go to the next date."))
         self.tooltips.set_tip(self.timeline, _("TimeLine"))
+        """
         
         self._fill_tree()
@@ -307 +318 @@
         self.__set_props()
         self.__do_layout()
-
+       
         self.connect('destroy', self._exit_ni)
         self.connect('inventory-activated', self._inventory_activated)
-        self.timeline.connect('date-change-notify', self._tl_date_changed)
-        self.timeline.connect('range-change-notify', self._tl_date_changed)
-        self.timeline.connect('scroll_event', self._tl_scroll_event)
-    
-        self._tl_date_changed(None)
-        
+        self.connect('realize', self.on_realize)
+        #self.timeline.connect('date-change-notify', self._tl_date_changed)
+        #self.timeline.connect('range-change-notify', self._tl_date_changed)
+        #self.timeline.connect('scroll_event', self._tl_scroll_event)
+    
+        #self._tl_date_changed(None)
+        
+    def on_realize(self, event):
+        self.viewernb.set_current_page(0)
     
     def _tl_date_changed(self, event):
@@ -386 +400 @@
 
 
+    """
     def _tl_view_legend(self, event):
-        """
-        Show up TimeLine legend.
-        """
+        #Show up TimeLine legend.
         dlg = LegendDlg(self.timeline)
         dlg.show_all()
         
 
+    
     def _set_yahrange(self, min, max):
-        """
-        Set new TimeLine year range.
-        """
+        #Set new TimeLine year range.
         miny = min.year - 1 
         maxy = max.year + 1
@@ -404 +416 @@
             self.timeline.year_range = (miny, maxy)
             self.timeline.emit('range-change-notify')
+    """
     
 
@@ -532 +545 @@
         content = p.get_nth_page(p.get_n_pages() - 1)
             
-        lstore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
-                
-        # insert scan finish date and host status
+        lstore = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING,
+                               gobject.TYPE_STRING, gobject.TYPE_STRING)
+            
+        # fill liststore
         host_count = 0
         for item in finish_data:
             iter = lstore.append()
             lstore.set(iter, 0, item[1])
-                    
+                
+            try: 
+                base_hosts_data[host_count][0]
+            except: 
+                lstore.set(iter, 1, "down")
+                continue
+            
             if base_hosts_data[host_count][0] == item[0]:
                 lstore.set(iter, 1, "up")
+                # get port data for this host
+                pdata = self.invdb.get_portid_and_fks_for_host_from_db(base_hosts_data[host_count][1])
+                temp = ""
+                for pd in pdata:
+                    fpd = self.invdb.get_port_data_for_pdata_from_db(pd[2], 
+                                                                     pd[3], 
+                                                                     pd[1])
+                    if len(pdata) > 1:
+                        temp += "Port No: %s, Data: %s\n" % (pd[0], fpd)
+                    else:
+                        temp += "Port No: %s, Data: %s" % (pd[0], fpd)
+                    
+                lstore.set(iter, 2, temp)
+                
+                # get extraports data for this host
+                epdata = self.invdb.get_extraports_data_for_host_from_db(base_hosts_data[host_count][1])
+                lstore.set(iter, 3, "Count: %d, State: %s" % (epdata[0], epdata[1]))
+                    
                 host_count += 1
             else:
@@ -558 +596 @@
         column = gtk.TreeViewColumn(_("Host status"), 
                                     gtk.CellRendererText(), text=1)
+        treeview.append_column(column)
+        
+        # column for host ports (this will be broken in several parts)
+        column = gtk.TreeViewColumn(_("Host ports"),
+                                    gtk.CellRendererText(), text=2)
+        treeview.append_column(column)
+        
+        # column for host extraports (" ")
+        column = gtk.TreeViewColumn(_("Host extraports"),
+                                    gtk.CellRendererText(), text=3)
         treeview.append_column(column)
                 
@@ -607 +655 @@
         
         # Adjusts timeline range based on min and max timestamps from scans.
-        if timestamps:
-            self._set_yahrange(min(timestamps), max(timestamps))
+        #if timestamps:
+        #    self._set_yahrange(min(timestamps), max(timestamps))
     
         self.invtree.treeview.expand_all()
@@ -632 +680 @@
             ("File", None, _("_File"), None),
             ("Edit", None, _("_Edit" ), None),
-            ("TimeLine", None, _("_Timeline"), None),
+            #("TimeLine", None, _("_Timeline"), None),
             ("ToolbarOpt", None, _("Tool_bar"), None),
             ("InvTabs", None, _("_Tabs"), None),
@@ -647 +695 @@
             
             # Edit/Timeline
-            ("ViewLegend", None, _("View _Legend"), None,
-             _("Show up Legend for Timeline"), self._tl_view_legend),
-            
-            ("ZoomIn", gtk.STOCK_ZOOM_IN, _("Zoom _In"), None,
-             _("Zoom In one level"), self._tl_zoom_in),
-            
-            ( "ZoomOut", gtk.STOCK_ZOOM_OUT, _("Zoom _Out"), None,
-              _("Zoom Out one level"), self._tl_zoom_out),
+            #("ViewLegend", None, _("View _Legend"), None,
+            # _("Show up Legend for Timeline"), self._tl_view_legend),
+            
+            #("ZoomIn", gtk.STOCK_ZOOM_IN, _("Zoom _In"), None,
+            # _("Zoom In one level"), self._tl_zoom_in),
+            
+            #( "ZoomOut", gtk.STOCK_ZOOM_OUT, _("Zoom _Out"), None,
+            #  _("Zoom Out one level"), self._tl_zoom_out),
             
             # Edit/ToolbarOpt
@@ -680 +728 @@
              self.write_tips),
             # Edit/Timeline
-            ("ShowTimeline", None,
-             _("Show _Timeline"), None,
-             _("Show/Hide Timeline"),
-             self._opt_timeline,
-             True),
-            ("ShowYAH", None,
-             _("Show \"You Are Here!\""), None,
-             _("Show/Hide \"You Are Here!\""),
-             self._opt_tlyah,
-             True),
+            #("ShowTimeline", None,
+            # _("Show _Timeline"), None,
+            # _("Show/Hide Timeline"),
+            # self._opt_timeline,
+            # True),
+            #("ShowYAH", None,
+            # _("Show \"You Are Here!\""), None,
+            # _("Show/Hide \"You Are Here!\""),
+            # self._opt_tlyah,
+            # True),
+    
             # Edit/Notebooks
             ("TabCloseBtn", None,
@@ -731 +780 @@
             </toolbar>
             """
+        
+        default_ui = """
+            <menubar>
+                <menu action='File'>
+                    <menuitem action='CloseHostTab' />
+                    <menuitem action='CloseInvTab' />
+                    <menuitem action='Quit' />
+                </menu>
+                <menu action='Edit'>
+                    <menu action='ToolbarOpt'>
+                         <menuitem action='TBIcon' />
+                         <menuitem action='TBText' />
+                         <menuitem action='TBBoth' />
+                    </menu>
+                    <menu action='InvTabs'>
+                         <menuitem action='TabCloseBtn' />
+                    </menu>
+                    <menuitem action='ShowTips' />
+                </menu>
+            </menubar>
+            """
 
         self.main_action_group.add_actions(main_actions)
@@ -756 +826 @@
         Set window properties.
         """
-        self.set_title(_("UMIT Network Inventory 0.0.2.2"))
+        self.set_title(_("UMIT Network Inventory 0.0.2.3"))
+        # a size for testing
+        self.set_position(gtk.WIN_POS_CENTER)
+        width, height = gtk.gdk.get_default_root_window().get_size()
+        self.set_default_size((width*3)/4, (height*3)/4)
         
 
@@ -773 +847 @@
         main_vbox.pack_start(menubar, False, False, 0)
 
+        """
         toolbar = self.ui_manager.get_widget("/Toolbar")
         toolbar.set_style(gtk.TOOLBAR_ICONS)
         main_vbox.pack_start(toolbar, False, False, 0)
+        """
 
         left_pane_box = gtk.VBox()
         left_pane_box.pack_start(self.invtree, True, True, 0)
         
+        """
         self.yah_hb = gtk.HandleBox()
         self.yah_hb.add(self.tlyah)
         self.yah_hb.set_handle_position(gtk.POS_TOP)
         left_pane_box.pack_end(self.yah_hb, False, False, 0)
+        """
         
         main_hpaned.add1(left_pane_box)
@@ -789 +867 @@
 
         # align left and right arrow with timeline height
+        """
         tlbox2 = gtk.HBox()
         align = gtk.Alignment(0, 1, 0, 0.5)
@@ -803 +882 @@
         
         tlbox.pack_start(tlbox2, True, True, 0)
+        """
         
         # place inventories notebook in a scrolledwindow
@@ -810 +890 @@
         nb_tl_hpaned.pack1(nbscroll, True, False)
        
-        main_vbox.pack_start(self.tl_dtitle, False, False, 6)
-        main_vbox.pack_start(tlbox, False, False, 0)
-        main_vbox.pack_start(main_hpaned, True, True, 0)
+        #main_vbox.pack_start(self.tl_dtitle, False, False, 6)
+        #main_vbox.pack_start(tlbox, False, False, 0)
+
+        self.viewernb.append_page(main_hpaned, gtk.Label(_(" Historic ")))
+        
+        self.viewernb.append_page(self.newtl, gtk.Label(_(" Timeline ")))
+
+        #main_vbox.pack_start(main_hpaned, True, True, 0)
+        main_vbox.pack_start(self.viewernb, True, True, 0)
         main_vbox.pack_end(self.statusbar, False, False, 0)