Changeset 5741

Timestamp:

07/15/10 21:10:43 (8 weeks ago)

Author:

diogo

Message:

zion profile prompt. interface improvement

Location:

zion/trunk/umit

Files:

• scan/zion/gui/ZionScanNotebookPage.py (modified) (7 diffs)
• zion/core/zion.py (modified) (8 diffs)

zion/trunk/umit/scan/zion/gui/ZionScanNotebookPage.py

@@ -145 +145 @@
         
     def write(self, text):
+        """
+        Write text to output box.
+        """
         self.text_buffer.insert(self.text_buffer.get_end_iter(), text)
+        
+    def clean(self):
+        """
+        Clear all text in output box.
+        """
+        self.text_buffer.set_text('')
         
     def update_attractors(self,attractors):
@@ -165 +174 @@
         """
         self.remove(self.__boxalign)
+        
+    def show_attractor_box(self):
+        """
+        Show the box containing the attractor widget.
+        """
+        self._pack_noexpand_nofill(self.__boxalign)
+        self.show_all()
 
             
@@ -356 +372 @@
         """
         self.result.update_host_info(host)
-        self.update_info(None, 'Obtaining TPC ISN samples\n')
+        self.update_info(None, 'Host scanning finished\n')
         
     def update_attractors(self, obj, attractors):
@@ -445 +461 @@
         z = zion.Zion(options.Options(), [], self.connector)
         
+        self.result.get_hosts_view().get_scans_page().clean()
         self.result.clear_port_list()
         
@@ -479 +496 @@
         """
         ZionProfile.__init__(self, target)
+        
+        # hide attractor box
+        self.result.get_hosts_view().get_scans_page().hide_attractor_box()
 
         self.__command_hbox = HIGHBox()
@@ -514 +534 @@
             zion_options.add(opt, value)
             
-        z = zion.Zion(zion_options, [])
+        # hide attractor box if not needed
+        if zion_options.has(options.OPTION_DETECT) or zion_options.has(options.OPTION_SYNPROXY):
+            self.result.get_hosts_view().get_scans_page().show_attractor_box()
+            
+        z = zion.Zion(zion_options, [], self.connector)
             
         for a in addrs:
@@ -527 +551 @@
                 z.append_target(host.Host(a))
         
-        # run command
-        z.run()
+        # run zion
+        z.start()
         
 

zion/trunk/umit/zion/core/zion.py

@@ -124 +124 @@
             pass
 
-    def do_forge(self):
+    def do_forge(self, fields=None):
         """
         """
@@ -135 +135 @@
         if mode == options.FORGE_MODE_SYN:
             self.do_scan()
+            
+            if fields!=None:
+                s.fields = fields
 
             for t in self.__target:
@@ -156 +159 @@
             s.amount = int(amount)
 
-        s.fields = ['tcp.seq']
         s.filter = FORGE_FILTER % (target.get_addr().addr, target_port,
                 addr, port)
@@ -190 +192 @@
             print options.HELP_TEXT
             
-        elif self.__option.has(options.OPTION_SYNPROXY):
-            
-            self.notify('update_status', 'Syn Proxy Detection Started\n\n')
-            
-            synproxy = self.synproxy_detection()
-            if synproxy==True:
-                print 'Target is synproxy'
-            else:
-                print 'Target isnt synproxy'
-                
-            self.notify('synproxy_finished', synproxy)
-            
-        elif self.__option.has(options.OPTION_HONEYD):
-            
-            self.notify('update_status', 'Honeyd Detection Started\n')
-            
-            honeyd = self.honeyd_detection()
-            if honeyd==False:
-                print 'Target isnt honeyd'
-            else:
-                print 'Target is honeyd'
-                
-            self.notify('honeyd_finished', honeyd)
-
-        elif self.__option.has(options.OPTION_FORGE):
-            
-            self.notify('update_status', 'Forge started\n')
-
-            print
-            print 'Getting packets'
-            print '---------------'
-
-            self.do_forge()
-
-        elif self.__option.has(options.OPTION_SCAN):
-
-            self.notify('update_status', 'Scanning host\n')
-            
-            print
-            print 'TCP SYN port scan results'
-            print '-------------------------'
-
-            self.do_scan()
-                        
         elif self.__option.has(options.OPTION_DETECT):
             
@@ -250 +208 @@
             
             print 'Capturing packets'
-            self.do_forge()
+            self.do_forge(['tcp.seq'])
             
             self.notify('isn_samples_finished')
@@ -268 +226 @@
         
             self.notify('matching_finished', result)
+            
+            
+        elif self.__option.has(options.OPTION_SYNPROXY):
+            
+            self.notify('update_status', 'Syn Proxy Detection Started\n\n')
+            
+            synproxy = self.synproxy_detection()
+            if synproxy==True:
+                print 'Target is synproxy'
+            else:
+                print 'Target isnt synproxy'
+                
+            self.notify('synproxy_finished', synproxy)
+            
+        elif self.__option.has(options.OPTION_HONEYD):
+            
+            self.notify('update_status', 'Honeyd Detection Started\n')
+            
+            honeyd = self.honeyd_detection()
+            if honeyd==False:
+                print 'Target isnt honeyd'
+            else:
+                print 'Target is honeyd'
+                
+            self.notify('honeyd_finished', honeyd)
+
+        elif self.__option.has(options.OPTION_FORGE):
+            
+            self.notify('update_status', 'Forge started\n')
+
+            print
+            print 'Getting packets'
+            print '---------------'
+
+            self.do_forge()
+
+        elif self.__option.has(options.OPTION_SCAN):
+
+            self.notify('update_status', 'Scanning host\n')
+            
+            print
+            print 'TCP SYN port scan results'
+            print '-------------------------'
+
+            self.do_scan()
                 
         elif self.__option.has(options.OPTION_CAPTURE):
@@ -288 +291 @@
         self.__option.add('-f','syn')
                 
-        self.do_forge()
+        self.do_forge(['tcp.seq'])
         Rt = self.calculate_PRNG()
         
@@ -343 +346 @@
         
         self.notify('update_status','Sending packets\n')
+        s.fields = ['tcp.seq']
         self.do_forge_mode_syn(s, target, ports[0], addr, origin_port1)
         isn1 = self.__capture_result[0][1]