Changeset 5736

Timestamp:

07/13/10 02:46:16 (3 years ago)

Author:

diogo

Message:

zion running in thread; communication between interface and zion with signals

Location:

zion/trunk/umit

Files:

• scan/zion/gui/ZionScanNotebookPage.py (modified) (13 diffs)
• zion/core/connector.py (added)
• zion/core/options.py (modified) (2 diffs)
• zion/core/zion.py (modified) (13 diffs)

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

@@ -40 +40 @@
 from umit.scan.zion.gui.AttractorWidget import AttractorWidget
 from umit.zion.scan import probe
-from umit.zion.core import address, options, zion, host
+from umit.zion.core import address, options, zion, host, connector
 from umit.zion.core.host import PORT_STATE_OPEN
 
@@ -160 +160 @@
         """
         self.__hbox = HIGHBox()
-        self.__info = gtk.Label(_('Information'))
+        self.__info = gtk.Label(_('No information available'))
         self.__attractor = AttractorWidget()
         self.__frame_attractor = HIGFrameRNet(_('Attractor'))
         self.__frame_attractor._add(self.__attractor)
+        
+        self.__table = gtk.Table(2, 2, False)
+        self.__table.set_col_spacings(3)
+        self.__table.set_row_spacings(3)
+        self.__table.attach(gtk.Label('Vendor:'), 0, 1, 0, 1)
+        self.vendor = gtk.Label('')
+        self.__table.attach(self.vendor, 1, 2, 0, 1)
+        self.__table.attach(gtk.Label('OS name:'), 0, 1, 1, 2)
+        self.os_name = gtk.Label('')
+        self.__table.attach(self.os_name, 1, 2, 1, 2)
 
         self.__hbox._pack_expand_fill(self.__info)
         self.__hbox._pack_noexpand_nofill(self.__frame_attractor)
-
+        
         self._pack_noexpand_nofill(self.__hbox)
+        self.pack_end(self.__table, True, True, 0)
         
     def update_attractors(self,attractors):
         """
+        Update the attractors at widget to plot them.
         """
         self.__attractor.update(attractors)
         
-
+    def update_os_info(self, info):
+        """
+        Update information about OS running on host.
+        """
+        print 'updated'
+        self.__info.set_text('Information:')
+        self.vendor.set_text(info['vendor_name'])
+        os = '%s %s' % (info['os_name'], info['os_version'])
+        self.os_name.set_text(os)
+        
 class ZionHostsList(gtk.ScrolledWindow):
     """
@@ -326 +347 @@
 
         self.pack_end(self.result)
+        
+        # signals needed to update info
+        self.connector = connector.Connector()
 
     def update_target(self, target):
@@ -337 +361 @@
         if self.target:
             return True
-
         return False
+    
+    def update_info(self, obj, text):
+        """
+        Update information page.
+        """
+        self.result.get_hosts_view().get_scans_page().write(text)
+        
+    def update_port_info(self, obj, host):
+        """
+        Update the port scan information of host.
+        """
+        self.result.update_host_info(host)
+        self.update_info(None, 'Obtaining TPC ISN samples\n')
+        
+    def update_attractors(self, obj, attractors):
+        """
+        Update the identification page with the graph of attractors
+        """
+        self.result.get_hosts_view().get_identification_page().update_attractors(attractors)
+        self.update_info(None, 'Building fingerprint\n')
+        
+    def update_host_information(self, obj, info):
+        """
+        Update information about OS running on host.
+        """
+        self.result.get_hosts_view().get_identification_page().update_os_info(info)
+        self.update_info(None, 'OS detection finished\n')
 
 class ZionProfileHoneyd(ZionProfile):
@@ -351 +401 @@
         """
         """
-        z = zion.Zion(options.Options(), [])
+        self.connector.connect('scan_finished', self.update_port_info)
+        self.connector.connect('honeyd_finished', self.honeyd_finished)
+        self.connector.connect('update_status', self.update_info)
         
         self.result.get_hosts_list().clear_hosts()
@@ -362 +414 @@
                     targets.append(host.Host(i, self.target))
                     host_str = '%s\n%s' % (i, self.target)
-                    self.result.get_hosts_list().add_host(host_str, PIXBUF_FIREWALL)
+                    self.result.get_hosts_list().add_host(host_str)
                 except:
                     print "Unimplemented support to address: %s." % i
         else:
             targets.append(host.Host(self.target))
-            self.result.get_hosts_list().add_host(i, PIXBUF_FIREWALL)
+            self.result.get_hosts_list().add_host(i)
             
         device = get_default_device()
         saddr = get_ip_address(device)
-        z.get_option_object().add("-c",device)
-        z.get_option_object().add("--forge-addr",saddr)
+        
+        opts = options.Options()
+        opts.add("-c",device)
+        opts.add("--forge-addr",saddr)
+        # honeyd option
+        opts.add("-n")
+        
+        self.update_info(None, 'Honeyd Detection Started\n')
         
         for target in targets:
-            if z.honeyd_detection(target):
-                print 'target is honeyd'
-            else:
-                print 'target isnt honeyd'
-
+            z = zion.Zion(opts,  [target], self.connector)
+            z.start()
+            
+    def honeyd_finished(self, obj, result):
+        """
+        Write information about honeyd detection result
+        """
+        if result:
+            self.update_info(None, 'Target is honeyd\n')
+        else:
+            self.update_info(None, 'Target isnt honeyd\n')
 
 class ZionProfileOS(ZionProfile):
@@ -389 +453 @@
         ZionProfile.__init__(self, target)
         
+        self.connector.connect('scan_finished', self.update_port_info)
+        self.connector.connect('isn_samples_finished', self.update_info, 'Creating time series\n')
+        self.connector.connect('timeseries_created', self.update_info, 'Building attractors\n')
+        self.connector.connect('attractors_built', self.update_attractors)
+        self.connector.connect('fingerprint_finished', self.update_info, 'Performing OS fingerprint matching\n')
+        self.connector.connect('matching_finished', self.update_host_information)
+        
     def start(self):
         """
         """
-        z = zion.Zion(options.Options(), [])
+        z = zion.Zion(options.Options(), [], self.connector)
         
         self.result.clear_port_list()
@@ -406 +477 @@
                     z.append_target(host.Host(i, self.target))
                     host_str = '%s\n%s' % (i, self.target)
+                    self.result.get_hosts_list().add_host(host_str)
                 except:
                     print "Unimplemented support to address: %s." % i
@@ -412 +484 @@
             self.result.get_hosts_list().add_host(self.target)
             
-        self.result.get_hosts_list().add_host(host_str)
-
         # configure zion options
         device = get_default_device()
@@ -420 +490 @@
         z.get_option_object().add("-d")
         z.get_option_object().add("--forge-addr",saddr)
-        z.run()
-        #z.start()
-        
-        # update host information
-        self.result.update_host_info(z.get_target_list()[0])
-        
-        attractors = z.get_attractors()
-        
-        self.result.get_hosts_view().get_identification_page().update_attractors(attractors)
-
+        z.start()
+        
+        self.update_info(None, 'OS Detection Started\n')
+        self.update_info(None, 'Scanning host\n')
 
 class ZionProfilePrompt(ZionProfile):
@@ -467 +531 @@
         """
         """
-        z = zion.Zion(options.Options(), [])
+        self.connector.connect('scan_finished', self.update_port_info)
+        self.connector.connect('synproxy_finished', self.synproxy_finished)
+        self.connector.connect('update_status', self.update_info)
         
         self.result.get_hosts_list().clear_hosts()
@@ -478 +544 @@
                     targets.append(host.Host(i, self.target))
                     host_str = '%s\n%s' % (i, self.target)
-                    self.result.get_hosts_list().add_host(host_str, PIXBUF_FIREWALL)
+                    self.result.get_hosts_list().add_host(host_str)
                 except:
                     print "Unimplemented support to address: %s." % i
         else:
             targets.append(host.Host(self.target))
-            self.result.get_hosts_list().add_host(i, PIXBUF_FIREWALL)
+            self.result.get_hosts_list().add_host(i)
             
         device = get_default_device()
         saddr = get_ip_address(device)
-        z.get_option_object().add("-c",device)
-        z.get_option_object().add("--forge-addr",saddr)
+        
+        opts = options.Options()
+        opts.add("-c",device)
+        opts.add("--forge-addr",saddr)
+        # synproxy option
+        opts.add("-y")
+        
+        self.update_info(None, 'Syn Proxy Detection Started\n')
         
         for target in targets:
-            if z.synproxy_detection(target):
-                print 'target is syn proxy'
-            else:
-                print 'target isnt syn proxy'
+            self.update_info(None, 'Scanning host\n')
+            z = zion.Zion(opts,  [target], self.connector)
+            z.start()
+            
+    def synproxy_finished(self, obj, result):
+        """
+        Write information about synproxy detection result
+        """
+        if result:
+            self.update_info(None, 'Target is synproxy\n')
+        else:
+            self.update_info(None, 'Target isnt synproxy\n')
                 
 
@@ -610 +690 @@
 
     # TODO: read device from options
-    device = "eth0"
+    device = "wlan0"
     #device = netifaces.interfaces()[0]
     return device

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

@@ -57 +57 @@
 OPTION_SEND_INTERVAL = 11
 OPTION_HELP = 12
+OPTION_HONEYD = 13
+OPTION_SYNPROXY = 14
 
 FORGE_MODE_SYN = 'syn'
@@ -77 +79 @@
            '-i':                OPTION_SEND_INTERVAL,
            '-d':                OPTION_DETECT,
-           '--detect':          OPTION_DETECT}
+           '--detect':          OPTION_DETECT,
+           '-y':                OPTION_SYNPROXY,
+           '-n':                OPTION_HONEYD}
 
-OPTIONS_SHORT = 'c:i:p:f:svhd'
+OPTIONS_SHORT = 'c:i:p:f:svhdyn'
 OPTIONS_LONG = ['capture=',
                 'capture-amount=',

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

@@ -37 +37 @@
 FORGE_FILTER = 'src host %s and src port %s and dst host %s and dst port %s'
 AMOUNT_OS_DETECTION = 50
-AMOUNT_HONEYD_DETECTION = 25
+AMOUNT_HONEYD_DETECTION = 5
 SEND_INTERVAL = 0.1
 SYNPROXY_INTERVAL = 1
@@ -48 +48 @@
     """
     """
-    def __init__(self, option, target=[]):
+    def __init__(self, option, target=[], connector=None):
         """
         """
@@ -55 +55 @@
         self.__capture_result = []
         self.__attractors = []
+        self.__connector = connector
         threading.Thread.__init__ (self)
 
@@ -94 +95 @@
         for target in self.__target:
             print target
+            
+        self.notify('scan_finished', self.__target[0])
             
     def do_capture(self, dev=None):
@@ -186 +189 @@
 
             print options.HELP_TEXT
-
-        if self.__option.has(options.OPTION_FORGE):
+            
+        elif self.__option.has(options.OPTION_SYNPROXY):
+            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):
+            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):
 
             print
@@ -218 +237 @@
             print 'Capturing packets'
             self.do_forge()
+            
+            self.notify('isn_samples_finished')
 
             print 'Calculating PRNG'
             Rt = self.calculate_PRNG()
             
+            self.notify('timeseries_created')
+            
             print 'Creating attractors'
             self.__classification(Rt)
             
+            self.notify('fingerprint_finished')
+            
             print 'Matching'
-            return self.__matching()
+            result = self.__matching()
+        
+            self.notify('matching_finished', result)
                 
         elif self.__option.has(options.OPTION_CAPTURE):
@@ -240 +267 @@
             
             
-    def honeyd_detection(self,target):
-        """ Detect if target are an honeyd. """
-        
-        print 'start honeyd detection'
-        self.__target = []
-        self.append_target(target)
-        
+    def honeyd_detection(self):
+        """ Detect if target are an honeyd. """        
         # configure parameters for honeyd detection
         if not self.__option.has(options.OPTION_CAPTURE_AMOUNT):
@@ -272 +294 @@
                 if increments.count(k)==4:
                     return True
-
-            return False                
-        else:
+            
             return False
-
-        
-    def synproxy_detection(self, target):
+        else:
+            return False
+            
+
+        
+    def synproxy_detection(self):
         """ Detect if target is an syn proxy. """
-        
-        print 'start syn proxy detection'
-        self.__target = []
-        self.append_target(target)
-        
+                
         # configure parameters for honeyd detection
         if not self.__option.has(options.OPTION_CAPTURE_AMOUNT):
@@ -290 +309 @@
         self.__option.add('-f','syn')
         
+        self.notify('update_status','Searching for open ports\n')
+        
+        target = self.__target[0]
+        
         # search for open ports in target
         self.do_scan()
         ports = target.get_open_ports()
+        
+        self.notify('update_status','Generate random ports\n')
         
         origin_port1 = random.randint(1024, 65535)
@@ -303 +328 @@
         addr = self.__option.get(options.OPTION_FORGE_ADDR)
         
+        self.notify('update_status','Sending packets\n')
         self.do_forge_mode_syn(s, target, ports[0], addr, origin_port1)
         isn1 = self.__capture_result[0][1]
@@ -316 +342 @@
         else:
             return False
-
+        
             
     def calculate_PRNG(self):
@@ -367 +393 @@
             matrix.set(self.__matrix, i, 0, x)
             matrix.set(self.__matrix, i, 1, y)
+            
+        self.notify('attractors_built', self.__attractors)    
 
         som.caracterization(self.__som, self.__matrix, EPOCHS)
@@ -403 +431 @@
         return self.__attractors
     
+    def notify(self, signal, param=None):
+        """
+        If a connector exists, emits the signal.
+        """
+        if self.__connector!=None:
+            if param==None:
+                self.__connector.emit(signal)
+            else:
+                self.__connector.emit(signal, param)