Changeset 829

Timestamp:

06/17/07 20:15:42 (6 years ago)

Author:

ggpolo

Message:

Inventory Viewer fixes

Files:

• branch/ggpolo/umitInventory/viewer.py (modified) (7 diffs)

branch/ggpolo/umitInventory/viewer.py

@@ -408 +408 @@
         self.daddy = daddy
         self.pages = [ ]
-        
-        #if inv_activated:
-        #    self.append_inv()
-        
+                
         self.__layout()
-
-
+        
+        self.connect('grab-focus', self._update_page_text)
+        
+    def _update_page_text(self, widget):
+        """
+        When changing from an Inventory tab to another, I noticed some text was
+        missing but it would appear when text-view received 'grab-focus'.
+        I'm emitting this signal so text updates when changing Inventory tabs.
+        """
+        cur_page = widget.get_current_page()
+        page = widget.get_nth_page(cur_page)
+        viewport = page.get_children()[0]
+        vbox = viewport.get_children()[0] 
+        vbox_children = vbox.get_children()
+        
+        textview = vbox_children[0]
+        textview.emit('grab-focus')
+        
+        
     def append_inv(self, title="Info", box=None):
         """
@@ -457 +471 @@
         Remove a page from notebook and from self.pages
         """
-        print button, page
-        
         del self.pages[self.pages.index(text)]
         self.remove(page)
@@ -780 +792 @@
                 box = self._load_inventory_data(title)
                 p.append_inv(box=box)
-        
-        """
-        if not err: # tab wasn't in inventory tab
-            if data["host_addr"]:
-                self._load_inventory_host_data(title, data["host_addr"])
-                
-            else:
-                pass
-                #self._load_inventory_data(title)
-        """
-                
                 
     
@@ -931 +932 @@
                 for pd in pdata:
                     fpd = self.invdb.get_port_data_for_pdata_from_db(pd[2], pd[3], 
-                                                                     pd[1])
-                    if len(pdata) > 1:
-                        el = '\n\n'
-                    else:
-                        el = '\n'
-                        
-                    temp += "Port No: %s, Protocol: %s, Port state: %s, \n\
+                                                                     pd[1])                        
+                    temp += "\nPort No: %s, Protocol: %s, Port state: %s, \n\
 Service product: %s, Service version: %s, Service extrainfo: %s, \n\
-Service name: %s%s" % (pd[0], fpd[0], fpd[1], fpd[2], fpd[3], fpd[4], fpd[7], el)
+Service name: %s\n" % (pd[0], fpd[0], fpd[1], fpd[2], fpd[3], fpd[4], fpd[7])
                 
                 text.append(temp) # port data
@@ -945 +941 @@
                 # get extraports data for this host
                 epdata = self.invdb.get_extraports_data_for_host_from_db(base_hosts_data[host_count][1])
-                text.append("Extraports\n")
-                text.append("Count: %d, State: %s" % (epdata[0], epdata[1]))
+                text.append("\nExtraports\n")
+                text.append("Count: %d, State: %s\n" % (epdata[0], epdata[1]))
                 
                 # get fingerprint info for host
                 fpinfo = self.invdb.get_fingerprint_info_for_host_from_db(base_hosts_data[host_count][1])
                 if fpinfo:
-                    text.append("Uptime: %s, Last boot:%s\netc: %s" % (fpinfo[0],
-                                                                       fpinfo[1],
-                                                                       fpinfo[2:]))
+                    text.append("\nUptime: %s, Last boot: %s\n" % (fpinfo[0],
+                                                                   fpinfo[1]))
+                    text.append("TCP Sequence\n")
+                    text.append("Class: %s, Index: %s, Value: %s\n" % (fpinfo[2],
+                                                                     fpinfo[3],
+                                                                     fpinfo[4]))
+                    text.append("TCP TS Sequence\n")
+                    text.append("Class: %s, Value: %s\n" % (fpinfo[5], fpinfo[6]))
+                    text.append("IP ID Sequence\n")
+                    text.append("Class: %s, Value: %s\n" % (fpinfo[7], fpinfo[8]))
                     
                 # get osmatch info for host
                 match = self.invdb.get_osmatch_for_host_from_db(base_hosts_data[host_count][1])
                 if match:
-                    text.append("Name: %s, Accuracy: %s, Line: %s" % (match[0],
+                    text.append("\nOS Match\n")
+                    text.append("Name: %s, Accuracy: %s, Line: %s\n" % (match[0],
                                                                       match[1],
                                                                       match[2]))
@@ -964 +968 @@
                 # get osclasses for host
                 classes = self.invdb.get_osclasses_for_host_from_db(base_hosts_data[host_count][1])
-                if classes:
-                    text.append(classes)
+                if len(classes):
+                    text.append("\nOS Classes\n")
+                for osclass in classes:
+                    text.append("Accuracy: %s, OS Gen: %s, OS Family: %s, \
+OS Vendor: %s, OS Type: %s\n" % (osclass[0], osclass[1], osclass[2], osclass[3],
+                               osclass[4]))
                     
-                print text, text_buffer
                 self.insert_text(text_buffer, text)
                 self.attach_widgets(tview, item[1])
@@ -974 +981 @@
                 host_count += 1
             else:
-                text.append("down")
+                text.append("Host down")
                 self.insert_text(text_buffer, text)
                 self.attach_widgets(tview, item[1])
                 box.pack_start(tview)
-                
+        
+        box.show_all()
         sw = gtk.ScrolledWindow()
         sw.add_with_viewport(box)
         sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        sw.show_all()
     
         return sw