watobo 0.9.21 → 0.9.23

data/lib/watobo/gui/log_file_viewer.rb

@@ -1,43 +1,34 @@
-#.
-# log_file_viewer.rb
-#.
-# Copyright 2014 by siberas, http://www.siberas.de
-# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
-# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
-# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 # @private 
-module Watobo#:nodoc: all
-  module Gui
-    class LogFileViewer < FXVerticalFrame
-
-      include Watobo::Constants
-      def show_logs
-        begin
-           @textbox.setText(Watobo.logs)
-        rescue => bang
-          puts "! Could not show logs"
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-      end
-
-   
-      def initialize(parent, mode = nil, opts)
-        opts[:padding]=0
-        
-        super(parent, opts)
-
-        update_btn = FXButton.new(self, "Update",:opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT).connect(SEL_COMMAND){ show_logs }
-        frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
-        @textbox = FXText.new(frame,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_AUTOSCROLL|TEXT_READONLY)
-        @textbox.editable = false
-      show_logs  
-   
-      end
-      
-          end
-
-  end
+module Watobo#:nodoc: all
+  module Gui
+    class LogFileViewer < FXVerticalFrame
+
+      include Watobo::Constants
+      def show_logs
+        begin
+           @textbox.setText(Watobo.logs)
+        rescue => bang
+          puts "! Could not show logs"
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      end
+
+   
+      def initialize(parent, mode = nil, opts)
+        opts[:padding]=0
+        
+        super(parent, opts)
+
+        update_btn = FXButton.new(self, "Update",:opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT).connect(SEL_COMMAND){ show_logs }
+        frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
+        @textbox = FXText.new(frame,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_AUTOSCROLL|TEXT_READONLY)
+        @textbox.editable = false
+      show_logs  
+   
+      end
+      
+          end
+
+  end
 end

data/lib/watobo/gui/log_viewer.rb

@@ -1,90 +1,85 @@
-#.
-# log_viewer.rb
-#.
-# Copyright 2014 by siberas, http://www.siberas.de
-# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
-# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
-# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 # @private 
-module Watobo#:nodoc: all
-  module Gui
-    class LogViewer < FXVerticalFrame
-
-      include Watobo::Constants
-      def purge_logs
-        begin
-          @log_text_lock.synchronize do
-            @textbox.setText('')
-          # @textbox.makePositionVisible 0
-          end
-        rescue => bang
-          puts "! Could not purge logs"
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-      end
-
-      # LOG_INFO
-      def log(log_level, msg )
-
-        t = Time.now
-        now = t.strftime("%m/%d/%Y @ %H:%M:%S")
-
-        begin
-          log_text = case log_level
-          when LOG_INFO
-            "#{now}: #{msg}\n"
-          else
-          ""
-          end
-          @log_queue << log_text
-        rescue => bang
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-      end
-
-      def initialize(parent, mode = nil, opts)
-        opts[:padding]=0
-        
-        @mode = mode.nil? ? :inster : mode
-
-        super(parent, opts)
-
-        @log_queue = Queue.new
-
-        @log_text_lock = Mutex.new
-
-        @textbox = FXText.new(self,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-        @textbox.editable = false
-        start_update_timer
-      end
-
-      private
-
-      def start_update_timer
-        @timer = FXApp.instance.addTimeout( 150, :repeat => true) {
-          #print @log_queue.length
-          if @log_queue.length > 0
-            msg = @log_queue.deq
-            if @mode == :insert
-              @log_text_lock.synchronize do
-                 @textbox.insertText(0,msg)
-               end
-            else
-              @log_text_lock.synchronize do
-                 @textbox.appendText(msg)
-               end
-            end
-             @textbox.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-          end
-          }
-
-      end
-     
-    end
-
-  end
+module Watobo #:nodoc: all
+  module Gui
+    class LogViewer < FXVerticalFrame
+
+      include Watobo::Constants
+
+      def purge_logs
+        begin
+          @log_text_lock.synchronize do
+            @textbox.setText('')
+            # @textbox.makePositionVisible 0
+          end
+        rescue => bang
+          puts "! Could not purge logs"
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      end
+
+      # LOG_INFO
+      def log(log_level, msg)
+
+        t = Time.now
+        now = t.strftime("%m/%d/%Y @ %H:%M:%S")
+
+        begin
+          log_text = case log_level
+                       when LOG_INFO
+                         "INFO - #{now}: #{msg}\n"
+                       else
+                         "UNDEF - #{now}: #{msg}\n"
+                     end
+          @log_queue << log_text
+
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      end
+
+      def initialize(parent, mode = nil, opts)
+        opts[:padding]=0
+
+        @mode = mode.nil? ? :inster : mode
+
+        super(parent, opts)
+
+        @log_queue = Queue.new
+
+        @log_text_lock = Mutex.new
+
+        @textbox = FXText.new(self, nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        @textbox.editable = false
+
+        start_update_timer
+      end
+
+      private
+
+      def start_update_timer
+        Watobo.save_thread {
+
+          #print @log_queue.length
+          if @log_queue.length > 0
+            msg = @log_queue.deq
+            if @mode == :insert
+              @log_text_lock.synchronize do
+                @textbox.insertText(0, msg)
+              end
+            else
+              @log_text_lock.synchronize do
+                @textbox.appendText(msg)
+              end
+            end
+            @textbox.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+          end
+        }
+
+      end
+
+    end
+
+  end
 end

data/lib/watobo/gui/login_wizzard.rb

@@ -1,12 +1,3 @@
-#.
-# login_wizzard.rb
-#.
-# Copyright 2014 by siberas, http://www.siberas.de
-# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
-# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
-# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 require 'fox16'
 
 include Fox

data/lib/watobo/gui/main_window.rb

@@ -1,20 +1,11 @@
-#.
-# main_window.rb
-#.
-# Copyright 2014 by siberas, http://www.siberas.de
-# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
-# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
-# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 # @private 
-module Watobo#:nodoc: all
+module Watobo #:nodoc: all
   module Gui
     ####################################################################################################################
     # M A I N   A P P L I C A T I O N   W I N D O W
     #
     class MainWindow < FXMainWindow
-      
+
       include Watobo
       include Watobo::Gui
       include Watobo::Constants
@@ -25,7 +16,7 @@ module Watobo#:nodoc: all
       attr :watobo_base
       attr :active_project
       attr :iproxy
-      
+
       def open_manual_request_editor(chat)
         begin
           mrtk = ManualRequestEditor.new(FXApp.instance, @project, chat)
@@ -41,72 +32,46 @@ module Watobo#:nodoc: all
           }
           mrtk.show(Fox::PLACEMENT_SCREEN)
         rescue => bang
-        puts "!!! could not open manual request"
-        puts bang
+          puts "!!! could not open manual request"
+          puts bang
         end
       end
 
       private
 
- def add_queue_timer(ms)
-  @update_timer = FXApp.instance.addTimeout( ms, :repeat => true) {
-    @finding_lock.synchronize do
-      @finding_queue.each do |f|
-        addFinding(f)
-      end
-      @finding_queue.clear
-    end
-    
-    unless @scanner.nil?
-      if @scanner.finished?
-         @scan_running = false
-         @status_lock.synchronize do
-            @new_status = SCAN_FINISHED
-         end
-         @scanner = nil
-      end
-    end
-    
-    @chat_lock.synchronize do
-      @chat_queue.each do |c|
-        addChat(c)
-      end
-      @chat_queue.clear
-    end
-    
-    @status_lock.synchronize do
-      unless @new_status.nil?
-        update_status(@new_status)
-      end
-        
-    end
-    
-    @msg_lock.synchronize do
-      while @msg_queue.length > 0
-        msg = @msg_queue.shift
-        case msg
-        when :modal_finished
-          puts "stopping modal ..."
-          getApp.stopModal
-          puts "modal stopped"
-        end
-      end
-    end
-    
-  }
- end
+      def add_queue_timer(ms)
+        @update_timer = Watobo.save_thread(ms) {
+
+              unless @scanner.nil?
+                if @scanner.finished?
+                  @scan_running = false
+                  @status_lock.synchronize do
+                    @new_status = SCAN_FINISHED
+                  end
+                  @scanner = nil
+                end
+              end
+
+              @status_lock.synchronize do
+                unless @new_status.nil?
+                  update_status(@new_status)
+                end
+              end
+        }
+      end
 
       def update_status(new_status)
         case new_status
-        when SCAN_STARTED
-          
-        when SCAN_FINISHED
-          @scan_button.icon = ICON_START
-          @dashboard.setScanStatus("Finished")
-          @statusBar.statusInfoText = "Ready."
+          when SCAN_STARTED
+
+          when SCAN_FINISHED
+            @scan_button.icon = ICON_START
+            @dashboard.setScanStatus("Finished")
+            @statusBar.statusInfoText = "Ready."
         end
         new_status = nil
       end
+
       #def loadDefaultS
       def saveDefaultSettings_UNUSED(update_settings={})
 
@@ -176,15 +141,14 @@ module Watobo#:nodoc: all
         Watobo::Utils.save_settings(@default_settings_file, settings )
 =end
       end
-      
-       
+
 
       def saveSessionSettings_UNUSED(project=nil)
         begin
-        #project.session_store.save_session_settings(project.session_settings)
-       # Watobo::Conf::Scanner.save_session(project.session_store)
-       Watobo::Gui.save_scanner_settings(project)
-        return true
+          #project.session_store.save_session_settings(project.session_settings)
+          # Watobo::Conf::Scanner.save_session(project.session_store)
+          Watobo::Gui.save_scanner_settings(project)
+          return true
         rescue => bang
           puts bang
           puts bang.backtrace if $DEBUG
@@ -206,14 +170,14 @@ module Watobo#:nodoc: all
 
       def saveProjectSettings_UNUSED(project=nil)
         begin
-       # project.session_store.save_project_settings(project.scan_settings)
-        return true
+          # project.session_store.save_project_settings(project.scan_settings)
+          return true
         rescue => bang
           puts bang
           puts bang.backtrace if $DEBUG
         end
         return false
-        
+
 #        unless project.nil?
 #          ps = YAML.load(YAML.dump(project.scan_settings))
 #          settings = { :scanner => Hash.new }
@@ -225,16 +189,16 @@ module Watobo#:nodoc: all
 #          settings[:scanner][:custom_error_patterns] = ps[:custom_error_patterns]
 #          settings[:scanner][:csrf_patterns] = ps[:csrf_patterns] unless ps[:csrf_patterns].nil?#
 
-          # remove proxy list because they are stored in the default settings
+# remove proxy list because they are stored in the default settings
 #          settings[:forwarding_proxy] = project.forward_proxy_settings
 
 #          settings[:project_name] = project.project_name
-          #   puts "==== WWW AUTH ==="
-          #   puts YAML.dump( settings[:www_auth] )
+#   puts "==== WWW AUTH ==="
+#   puts YAML.dump( settings[:www_auth] )
 
-          #     puts "=== PASSWORD POLICY ==="
-          #     puts YAML.dump(@settings[:password_policy])
-          #if master_password_required?
+#     puts "=== PASSWORD POLICY ==="
+#     puts YAML.dump(@settings[:password_policy])
+#if master_password_required?
 #          password_set = false
 #          settings[:www_auth].each_key do |p|
 #            if settings[:www_auth][p].has_key? :password
@@ -274,19 +238,19 @@ module Watobo#:nodoc: all
 #          cleanCredentials(settings)
 #          end
 
-        #   puts "* saving www_auth settings ..."
-        #   puts YAML.dump( settings[:www_auth])
+#   puts "* saving www_auth settings ..."
+#   puts YAML.dump( settings[:www_auth])
 #        Watobo::Utils.save_settings(project.projectSettingsFile, settings)
 #        end
       end
 
       def update_conversation_table()
-         @chatTable.showConversation(Watobo::Chats.to_a)
-         @chatTable.apply_filter(@conversation_table_ctrl.filter)
-         @conversation_table_ctrl.update_text  
-         return true
+        @chatTable.showConversation(Watobo::Chats.to_a)
+        @chatTable.apply_filter(@conversation_table_ctrl.filter)
+        @conversation_table_ctrl.update_text
+        return true
       end
-      
+
       #
       # SHOW CHAT
       #
@@ -303,15 +267,15 @@ module Watobo#:nodoc: all
         @switcher.current=0
         @lastViewed = chat
         src = case chat.source
-        when CHAT_SOURCE_INTERCEPT
-          "Interceptor"
-        when CHAT_SOURCE_PROXY
-          "Proxy"
-        when CHAT_SOURCE_MANUAL
-          "Manual"
-        when CHAT_SOURCE_FUZZER
-          "Fuzzer"
-        end
+                when CHAT_SOURCE_INTERCEPT
+                  "Interceptor"
+                when CHAT_SOURCE_PROXY
+                  "Proxy"
+                when CHAT_SOURCE_MANUAL
+                  "Manual"
+                when CHAT_SOURCE_FUZZER
+                  "Fuzzer"
+              end
         @quickViewTitle.text = "Chat-ID: #{chat.id} (#{src})"
         @quickViewSubTitle.text = ""
       end
@@ -320,7 +284,7 @@ module Watobo#:nodoc: all
       # SHOW VULN
       #
       def showVulnerability(vuln)
-       
+
         @mre_button.enabled = true
         @fuzz_button.enabled = true
         @bv_button.enabled = true
@@ -334,22 +298,22 @@ module Watobo#:nodoc: all
         @lastViewed = vuln
         if vuln.details[:check_pattern] then
 
-        pattern = vuln.details[:check_pattern].strip
-       
-        @request_viewer.highlight(pattern)
+          pattern = vuln.details[:check_pattern].strip
+
+          @request_viewer.highlight(pattern)
         end
 
         if vuln.details[:proof_pattern] then
-        pattern = vuln.details[:proof_pattern].strip
-        
-        @response_viewer.highlight(pattern)
+          pattern = vuln.details[:proof_pattern].strip
+
+          @response_viewer.highlight(pattern)
         end
         @switcher.current = 0
 
         @quickViewTitle.text = "Finding: #{vuln.details[:class]}"
         chat_id = "unknown"
         chat_id = vuln.details[:chat_id] if vuln.details.has_key? :chat_id
-        info_text = "[Module: #{vuln.details[:module].gsub(/watobo::modules::/i,'')}] [Chat-ID: #{chat_id}]"
+        info_text = "[Module: #{vuln.details[:module].gsub(/watobo::modules::/i, '')}] [Chat-ID: #{chat_id}]"
         @quickViewSubTitle.text = info_text
 
       end
@@ -361,21 +325,21 @@ module Watobo#:nodoc: all
       def openSessionManagement(sender, sel, item)
         smdlg = SessionManagementDialog.new(self)
         if smdlg.execute != 0 then
-         
+
           sidpatterns = smdlg.getSidPatterns()
           logout_signatures = smdlg.getLogoutSignatures()
           unless Watobo.project.nil?
-             ids = smdlg.getLoginScriptIds()
-          Watobo.project.setLoginChatIds(ids)
-          #Watobo.project.setSidPatterns(sidpatterns)
-          Watobo.project.setLogoutSignatures(logout_signatures)
+            ids = smdlg.getLoginScriptIds()
+            Watobo.project.setLoginChatIds(ids)
+            #Watobo.project.setSidPatterns(sidpatterns)
+            Watobo.project.setLogoutSignatures(logout_signatures)
           end
-        # save settings
-        #saveProjectSettings(@project)
-        #saveSessionSettings(@project)
-        Watobo::Conf::Scanner.logout_signatures = logout_signatures
-        Watobo::Conf::SidCache.patterns = sidpatterns
-        Watobo::Gui.save_settings()
+          # save settings
+          #saveProjectSettings(@project)
+          #saveSessionSettings(@project)
+          Watobo::Conf::Scanner.logout_signatures = logout_signatures
+          Watobo::Conf::SidCache.patterns = sidpatterns
+          Watobo::Gui.save_settings()
         end
       end
 
@@ -408,21 +372,21 @@ module Watobo#:nodoc: all
       end
 
       def openWwwAuthDialog()
-       # if @project.nil?
-       # FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
-       # else
-          auth_settings = {}
-          w3adlg = Watobo::Gui::WwwAuthDialog.new(self )
-          if w3adlg.execute != 0
+        # if @project.nil?
+        # FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
+        # else
+        auth_settings = {}
+        w3adlg = Watobo::Gui::WwwAuthDialog.new(self)
+        if w3adlg.execute != 0
           #puts "* New WWW-Authentication"
           #puts @project.getWwwAuthentication().to_yaml
           Watobo::Conf::General.save_passwords = w3adlg.savePasswords?
-         # saveProjectSettings(@project)
-         # Watobo::Gui.save_default_settings(@project)
-         Watobo::Gui.save_settings()
+          # saveProjectSettings(@project)
+          # Watobo::Gui.save_default_settings(@project)
+          Watobo::Gui.save_settings()
           #@iproxy.www_auth = @project.getWwwAuthentication()
           Watobo::Interceptor.proxy.refresh_www_auth
-          end
+        end
         #puts "* new www_auth settings"
         # puts YAML.dump(@project.settings[:www_auth])
         #end
@@ -431,42 +395,42 @@ module Watobo#:nodoc: all
 
       def open_client_cert_dialog()
         if @project.nil?
-        FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
+          FXMessageBox.information(self, MBOX_OK, "No Project Defined", "Create Project First")
         else
           ccdlg = Watobo::Gui::ClientCertDialog.new(self)
           if ccdlg.execute != 0
-          #puts "* New WWW-Authentication"
-          #puts @project.getWwwAuthentication().to_yaml
-          #@settings[:password_policy][:save_passwords] = ccdlg.savePasswords?
-          puts "* got client certificate settings"
-          #puts ccdlg.client_cert_settings.to_yaml
-        #  Watobo.project.client_certificates = ccdlg.client_certificates
-         # Watobo::Interceptor.proxy.client_certificates = ccdlg.client_certificates
-         # saveProjectSettings(@project)
-          Watobo::Gui.save_settings()
-          # Watobo::Gui.save_default_settings(@project)
+            #puts "* New WWW-Authentication"
+            #puts @project.getWwwAuthentication().to_yaml
+            #@settings[:password_policy][:save_passwords] = ccdlg.savePasswords?
+            puts "* got client certificate settings"
+            #puts ccdlg.client_cert_settings.to_yaml
+            #  Watobo.project.client_certificates = ccdlg.client_certificates
+            # Watobo::Interceptor.proxy.client_certificates = ccdlg.client_certificates
+            # saveProjectSettings(@project)
+            Watobo::Gui.save_settings()
+            # Watobo::Gui.save_default_settings(@project)
 
           end
-        # puts YAML.dump(@project.settings[:www_auth])
+          # puts YAML.dump(@project.settings[:www_auth])
         end
 
       end
 
       def openPWPolicyDialog()
         if @project.nil?
-        FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
+          FXMessageBox.information(self, MBOX_OK, "No Project Defined", "Create Project First")
         else
           auth_settings = {}
-          dlg = Watobo::Gui::PasswordPolicyDialog.new(self, @settings[:password_policy] )
+          dlg = Watobo::Gui::PasswordPolicyDialog.new(self, @settings[:password_policy])
           if dlg.execute != 0
-          @settings[:password_policy] = dlg.passwordPolicy
-         #Watobo::Gui.save_default_settings(@project)
-          #puts "* New WWW-Authentication"
-          #puts @project.getWwwAuthentication().to_yaml
-          #@settings[:password_policy][:save_passwords] = w3adlg.savePasswords?
-          #saveProjectSettings(@project)
-          Watobo::Gui.save_settings()
-          #@iproxy.www_auth = @project.settings[:www_auth]
+            @settings[:password_policy] = dlg.passwordPolicy
+            #Watobo::Gui.save_default_settings(@project)
+            #puts "* New WWW-Authentication"
+            #puts @project.getWwwAuthentication().to_yaml
+            #@settings[:password_policy][:save_passwords] = w3adlg.savePasswords?
+            #saveProjectSettings(@project)
+            Watobo::Gui.save_settings()
+            #@iproxy.www_auth = @project.settings[:www_auth]
           end
         end
 
@@ -478,30 +442,30 @@ module Watobo#:nodoc: all
           fuzzer.create
           fuzzer.show(Fox::PLACEMENT_SCREEN)
         rescue => bang
-        puts "!!! could not open fuzzer"
-        puts bang
+          puts "!!! could not open fuzzer"
+          puts bang
         end
       end
-      
+
       def open_plugin_sqlmap(chat)
         begin
           sqlmap = Watobo::Plugin::Sqlmap::Gui.new(FXApp.instance, @project, chat)
           sqlmap.create
           sqlmap.show(Fox::PLACEMENT_SCREEN)
         rescue => bang
-        puts "!!! could not open fuzzer"
-        puts bang
+          puts "!!! could not open fuzzer"
+          puts bang
         end
       end
-      
-       def open_plugin_crawler(chat)
+
+      def open_plugin_crawler(chat)
         begin
           plugin = Watobo::Plugin::Crawler::Gui.new(FXApp.instance, @project, chat)
           plugin.create
           plugin.show(Fox::PLACEMENT_SCREEN)
         rescue => bang
-        puts "!!! could not open fuzzer"
-        puts bang
+          puts "!!! could not open fuzzer"
+          puts bang
         end
       end
 
@@ -526,7 +490,7 @@ module Watobo#:nodoc: all
         begin
           @switcher.setCurrent(2, true)
         rescue
-        puts "no dashboard available yet!"
+          puts "no dashboard available yet!"
         end
       end
 
@@ -546,10 +510,10 @@ module Watobo#:nodoc: all
           puts "!!! PREVIEW PROBLEM !!"
           puts bang
           case bang
-          when /JSSH_CONNECT_ERROR/i
-            FXMessageBox.information(self, MBOX_OK, "JSSH Missing", "It seem that the Firefox JSSH extension is not installed,\nwhich is required in order to use the BrowserPreview.\nPlease read the installation instruction in the README\n or online at http://watobo.sourceforge.net.")
-          else
-          FXMessageBox.information(self, MBOX_OK, "Proxy Settings", "Your Browser does not use WATOBO (127.0.0.1:#{Watobo::Interceptor.proxy.port}) as its proxy.\nSo you can't use the Browser-View feature.\nPlease change your proxy settings and try it again!")
+            when /JSSH_CONNECT_ERROR/i
+              FXMessageBox.information(self, MBOX_OK, "JSSH Missing", "It seem that the Firefox JSSH extension is not installed,\nwhich is required in order to use the BrowserPreview.\nPlease read the installation instruction in the README\n or online at http://watobo.sourceforge.net.")
+            else
+              FXMessageBox.information(self, MBOX_OK, "Proxy Settings", "Your Browser does not use WATOBO (127.0.0.1:#{Watobo::Interceptor.proxy.port}) as its proxy.\nSo you can't use the Browser-View feature.\nPlease change your proxy settings and try it again!")
           end
         end
       end
@@ -581,31 +545,31 @@ module Watobo#:nodoc: all
           @switcher.setCurrent(4, true)
           @pluginboard.updateBoard()
         rescue => bang
-        puts bang
-        puts bang.backtrace if $DEBUG
+          puts bang
+          puts bang.backtrace if $DEBUG
         end
       end
 
       def useSmallIcons()
         unless @project.nil?
-        @findings_tree.useSmallIcons()
-        @sites_tree.useSmallIcons()
-        # @chatTable.setNewFont( "helvetica", GUI_SMALL_FONT_SIZE)
-        @chatTable.setNewFont("Segoe UI", GUI_SMALL_FONT_SIZE)
-        @request_viewer.setFontSize(GUI_SMALL_FONT_SIZE)
-        @response_viewer.setFontSize(GUI_SMALL_FONT_SIZE)
+          @findings_tree.useSmallIcons()
+          @sites_tree.useSmallIcons()
+          # @chatTable.setNewFont( "helvetica", GUI_SMALL_FONT_SIZE)
+          @chatTable.setNewFont("Segoe UI", GUI_SMALL_FONT_SIZE)
+          @request_viewer.setFontSize(GUI_SMALL_FONT_SIZE)
+          @response_viewer.setFontSize(GUI_SMALL_FONT_SIZE)
         else
         end
       end
 
       def useRegularIcons()
         unless @project.nil?
-        @findings_tree.useRegularIcons()
-        @sites_tree.useRegularIcons()
-        @chatTable.setNewFont("Segoe UI", GUI_REGULAR_FONT_SIZE)
-        #@chatTable.setNewFont("helvetica", GUI_REGULAR_FONT_SIZE)
-        @request_viewer.setFontSize(GUI_REGULAR_FONT_SIZE)
-        @response_viewer.setFontSize(GUI_REGULAR_FONT_SIZE)
+          @findings_tree.useRegularIcons()
+          @sites_tree.useRegularIcons()
+          @chatTable.setNewFont("Segoe UI", GUI_REGULAR_FONT_SIZE)
+          #@chatTable.setNewFont("helvetica", GUI_REGULAR_FONT_SIZE)
+          @request_viewer.setFontSize(GUI_REGULAR_FONT_SIZE)
+          @response_viewer.setFontSize(GUI_REGULAR_FONT_SIZE)
         else
         end
       end
@@ -619,50 +583,50 @@ module Watobo#:nodoc: all
       def refreshViewers()
         @findings_tree.reload()
         @sites_tree.reload()
-      #@chatTable.clearItems()
+        #@chatTable.clearItems()
       end
 
       def onOpenInterceptor(sender, sel, ptr)
         unless Watobo.project.nil?
-        interceptor = Watobo::Gui::InterceptorUI.new(self, :opts => DECOR_ALL)
-        Watobo::Interceptor.proxy.target = interceptor
-        puts "* Interceptor created"
-        #@project.interceptor = interceptor
-        interceptor.create
-        interceptor.show(Fox::PLACEMENT_SCREEN)
-        getApp().runModalWhileShown(interceptor)
-        interceptor.releaseAll()
-        puts "* Interceptor closed"
-        #iproxy.target = nil
-        #if interceptor.execute != 0 then
-        #  puts "interceptor finished"
-        #end
+          interceptor = Watobo::Gui::InterceptorUI.new(self, :opts => DECOR_ALL)
+          Watobo::Interceptor.proxy.target = interceptor
+          puts "* Interceptor created"
+          #@project.interceptor = interceptor
+          interceptor.create
+          interceptor.show(Fox::PLACEMENT_SCREEN)
+          getApp().runModalWhileShown(interceptor)
+          interceptor.releaseAll()
+          puts "* Interceptor closed"
+          #iproxy.target = nil
+          #if interceptor.execute != 0 then
+          #  puts "interceptor finished"
+          #end
         else
 
-        FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
+          FXMessageBox.information(self, MBOX_OK, "No Project Defined", "Create Project First")
         end
       end
 
       def update_status_bar()
-        unless Watobo.project.nil?          
-         @statusBar.projectName = Watobo.project_name
-         @statusBar.sessionName = Watobo.session_name
-         @dashboard.updateProjectInfo()
-         @scan_button.enable
-         @statusBar.statusInfoText = "Ready"
+        unless Watobo.project.nil?
+          @statusBar.projectName = Watobo.project_name
+          @statusBar.sessionName = Watobo.session_name
+          @dashboard.updateProjectInfo()
+          @scan_button.enable
+          @statusBar.statusInfoText = "Ready"
         end
         @statusBar.bindAddress= Watobo::Conf::Interceptor.bind_addr.to_s
         @statusBar.portNumber = Watobo::Conf::Interceptor.port.to_s
         @statusBar.forwardingProxy = "-"
-      #  puts Watobo::Conf::ForwardingProxy.default_proxy
-        
+        #  puts Watobo::Conf::ForwardingProxy.default_proxy
+
         #unless Watobo::Conf::ForwardingProxy.default_proxy.empty?
         #  default_proxy = Watobo::Conf::ForwardingProxy.default_proxy
         #  ps = Watobo::Conf::ForwardingProxy.to_h
         #  proxy = ps[default_proxy]
         #  @statusBar.forwardingProxy = "#{proxy[:name]} (#{proxy[:host]}:#{proxy[:port]})"
         #end
-        
+
         @statusBar.update_proxy_mode
       end
 
@@ -688,7 +652,6 @@ module Watobo#:nodoc: all
       end
 
 
-
       def closeProject()
         @project = nil
         Watobo::Chats.reset
@@ -711,38 +674,38 @@ module Watobo#:nodoc: all
       #
       # onNewProject
       #
-      def onNewProject(sender,sel,ptr)
+      def onNewProject(sender, sel, ptr)
 
         if @project then
-        response = FXMessageBox.question(self, MBOX_YES_NO, "New Project", "This will close the actual project!\nAre you sure?")
-        return 0 if not response == MBOX_CLICKED_YES
-        # clear old project
-        closeProject()
-        # stop interceptor
+          response = FXMessageBox.question(self, MBOX_YES_NO, "New Project", "This will close the actual project!\nAre you sure?")
+          return 0 if not response == MBOX_CLICKED_YES
+          # clear old project
+          closeProject()
+          # stop interceptor
         end
 
         puts "* Open Project Wizzard (#{Watobo::Conf::General.workspace_path})" if $DEBUG
-        newProjectWizzard = Watobo::Gui::NewProjectWizzard.new(self, Watobo::Conf::General.workspace_path )
+        newProjectWizzard = Watobo::Gui::NewProjectWizzard.new(self, Watobo::Conf::General.workspace_path)
         if newProjectWizzard.execute != 0
           # prepare project settings
           new_project_settings = {
-            :project_path => newProjectWizzard.selected_project_path,
-            :session_path => newProjectWizzard.selected_session_path,
-            :project_name => newProjectWizzard.project_name,
-            :session_name => newProjectWizzard.session_name
+              :project_path => newProjectWizzard.selected_project_path,
+              :session_path => newProjectWizzard.selected_session_path,
+              :project_name => newProjectWizzard.project_name,
+              :session_name => newProjectWizzard.session_name
           }
-        #  @settings[:general][:workspace_path] 
-        Watobo::Conf::General.workspace_path = newProjectWizzard.workspace_dir
-        Watobo.workspace_path = newProjectWizzard.workspace_dir
+          #  @settings[:general][:workspace_path]
+          Watobo::Conf::General.workspace_path = newProjectWizzard.workspace_dir
+          Watobo.workspace_path = newProjectWizzard.workspace_dir
 
-        project = Watobo.create_project(:project_name => newProjectWizzard.project_name, :session_name => newProjectWizzard.session_name)
-        
-        startProject(project)
-               
-        Watobo::Gui.history.add_entry(:project_name => new_project_settings[:project_name], :session_name => new_project_settings[:session_name])
-        #Watobo::Gui.save_default_settings project
-        Watobo::Gui.save_settings()
-        #puts @project.class
+          project = Watobo.create_project(:project_name => newProjectWizzard.project_name, :session_name => newProjectWizzard.session_name)
+
+          startProject(project)
+
+          Watobo::Gui.history.add_entry(:project_name => new_project_settings[:project_name], :session_name => new_project_settings[:session_name])
+          #Watobo::Gui.save_default_settings project
+          Watobo::Gui.save_settings()
+          #puts @project.class
         end
 
       end
@@ -757,11 +720,11 @@ module Watobo#:nodoc: all
 
         subscribeProject()
 
-        @project.subscribe(:update_progress){ |up|
+        @project.subscribe(:update_progress) { |up|
           begin
             @progress_window.update_progress(up)
           rescue => bang
-          puts bang
+            puts bang
           end
         }
 
@@ -772,63 +735,61 @@ module Watobo#:nodoc: all
         @findings_tree.hide
         #TODO: Disable Menu
 
-        Thread.new{
+        Thread.new {
           begin
             print "\n* setting up project ..."
             @project.setupProject()
             print "[OK]\n"
 
-                  
+
             Watobo::Gui.clear_plugins
             print "* load plugins ..."
             Watobo::Gui::Utils.load_plugins(@project)
             print "[OK]\n"
-       
+
             @sites_tree.project = @project
             @findings_tree.project = @project
             Watobo::Gui.project = @project
             puts "* finished, closing progress window" if $DEBUG
 
           rescue => bang
-          # puts "!!! Could not create project"
+            # puts "!!! Could not create project"
             puts bang
             puts bang.backtrace if $DEBUG
             puts "!!! Could not create project :("
           ensure
-          puts "* stop modal mode" if $DEBUG
-          @msg_lock.synchronize do
-          #getApp.stopModal
-          @msg_queue << :modal_finished
-          end
-
+            puts "* stop modal mode" if $DEBUG
+           # Watobo::Gui.application.runOnUiThread do
+            FXApp.instance.addChore do
+              getApp.stopModal
+            end
           end
-
         }
         getApp().runModal
-      
-      
-       update_conversation_table()
-       update_status_bar()
-       puts "* starting interceptor"
-       Watobo::Interceptor.start
-       puts "* starting passive scanner"
-       Watobo::PassiveScanner.start
-       @browserView = BrowserPreview.new(Watobo::Interceptor.proxy)
-       
-       #  be sure to hide the progress window      
-       @progress_window.destroy
-       
-       
-       @chatTable.show
-       @sites_tree.show
-       @sites_tree.reload
-       @findings_tree.show
-       @findings_tree.reload
-       
-       @chatTable.apply_filter(@conversation_table_ctrl.filter)
-       @conversation_table_ctrl.update_text
-       
-        
+
+
+        update_conversation_table()
+        update_status_bar()
+        puts "* starting interceptor"
+        Watobo::Interceptor.start
+        puts "* starting passive scanner"
+        Watobo::PassiveScanner.start
+        @browserView = BrowserPreview.new(Watobo::Interceptor.proxy)
+
+        #  be sure to hide the progress window
+        @progress_window.destroy
+
+
+        @chatTable.show
+        @sites_tree.show
+        @sites_tree.reload
+        @findings_tree.show
+        @findings_tree.reload
+
+        @chatTable.apply_filter(@conversation_table_ctrl.filter)
+        @conversation_table_ctrl.update_text
+
+
         puts "Project Started"
         puts "Active Modules: #{Watobo::ActiveModules.length}"
         puts "Passive Modules: #{Watobo::PassiveModules.length}"
@@ -844,13 +805,13 @@ module Watobo#:nodoc: all
           if @settings[:master_password].empty?
             note = ""
             message = case bad_pass_count
-            when 1
-              "Bad Password!!!\n"
-            when 2
-              "Wrong Password Again? Next time WATOBO will continue without loading stored passwords.\n"
-            else
-            "Please provide the master-password to decrypt passwords.\n"
-            end
+                        when 1
+                          "Bad Password!!!\n"
+                        when 2
+                          "Wrong Password Again? Next time WATOBO will continue without loading stored passwords.\n"
+                        else
+                          "Please provide the master-password to decrypt passwords.\n"
+                      end
             message << "If you hit 'cancel' the passwords will be deleted!\nYou can disable master-password in the settings menu.\nThe latter is not recommended!"
             dlg = MasterPWDialog.new(self, dlg_titel, :info => message, :retype => false)
             if dlg.execute != 0
@@ -859,22 +820,22 @@ module Watobo#:nodoc: all
                 dec_pw = Crypto.decryptPassword(enc_pw, master_pass)
                 @settings[:master_password] = master_pass
               rescue => bang
-              puts "! wrong password"
-              @settings[:master_password] = ''
-              bad_pass_count += 1
-              #FXMessageBox.information(self,MBOX_OK,"Wrong Password!", "Could not decrypt proxy passwords. Check proxy settings!")
+                puts "! wrong password"
+                @settings[:master_password] = ''
+                bad_pass_count += 1
+                #FXMessageBox.information(self,MBOX_OK,"Wrong Password!", "Could not decrypt proxy passwords. Check proxy settings!")
               end
             else
-            dlg_canceled = true
-            @settings[:master_password] = ''
+              dlg_canceled = true
+              @settings[:master_password] = ''
             end
           else
             begin
               dec_pw = Crypto.decryptPassword(enc_pw, @settings[:master_password])
-              #  @settings[:master_password] = master_pass
+                #  @settings[:master_password] = master_pass
             rescue => bang
-            @settings[:master_password] = ''
-            #FXMessageBox.information(self,MBOX_OK,"Wrong Password!", "Could not decrypt proxy passwords. Check proxy settings!")
+              @settings[:master_password] = ''
+              #FXMessageBox.information(self,MBOX_OK,"Wrong Password!", "Could not decrypt proxy passwords. Check proxy settings!")
             end
           end
         end
@@ -898,17 +859,17 @@ module Watobo#:nodoc: all
                 #  puts "* decrypting password for proxy #{proxies[k][:host]}"
                 dp = decryptPassword(proxy[:password], "Decrypt Proxy Passwords")
                 unless dp.nil?
-                proxy[:password] = dp
-                proxy[:encrypted] = false
+                  proxy[:password] = dp
+                  proxy[:encrypted] = false
                 else
-                proxy[:password] = ''
-                proxy[:encrypted] = false
-                decrypt_failed = true
-                FXMessageBox.information(self,MBOX_OK,"Wrong Master Password!", "Could not decrypt passwords. Please reconfigure proxy passwords!")
+                  proxy[:password] = ''
+                  proxy[:encrypted] = false
+                  decrypt_failed = true
+                  FXMessageBox.information(self, MBOX_OK, "Wrong Master Password!", "Could not decrypt passwords. Please reconfigure proxy passwords!")
                 end
               else
-              proxy[:password] = ''
-              proxy[:encrypted] = false
+                proxy[:password] = ''
+                proxy[:encrypted] = false
               end
             end
           end
@@ -923,17 +884,17 @@ module Watobo#:nodoc: all
               unless decrypt_failed
                 dp = decryptPassword(creds[:password], "Decrypt Server Password")
                 unless dp.nil?
-                creds[:password] = dp
-                creds[:encrypted] = false
+                  creds[:password] = dp
+                  creds[:encrypted] = false
                 else
-                creds[:password] = ''
-                creds[:encrypted] = false
-                decrypt_failed = true
-                FXMessageBox.information(self,MBOX_OK,"Wrong Master Password!", "Could not decrypt passwords. Please reconfigure server passwords!")
+                  creds[:password] = ''
+                  creds[:encrypted] = false
+                  decrypt_failed = true
+                  FXMessageBox.information(self, MBOX_OK, "Wrong Master Password!", "Could not decrypt passwords. Please reconfigure server passwords!")
                 end
               else
-              creds[:password] = ''
-              creds[:encrypted] = false
+                creds[:password] = ''
+                creds[:encrypted] = false
               end
 
             end
@@ -942,23 +903,23 @@ module Watobo#:nodoc: all
 
       end
 
-      def openSession( prefs = {} )
+      def openSession(prefs = {})
 #        puts "= Loading Session ="
 #        session_file = File.join( Watobo.workspace_path, prefs[:project_name], prefs[:session_name] )
 #        puts "SessionFile: #{session_file}"
         if @project then
-        response = FXMessageBox.question(self, MBOX_YES_NO, "New Project", "This will close the actual project!\nAre you sure?")
-        return false if not response == MBOX_CLICKED_YES
-        # clear old project
-        closeProject()
-        # stop interceptor
+          response = FXMessageBox.question(self, MBOX_YES_NO, "New Project", "This will close the actual project!\nAre you sure?")
+          return false if not response == MBOX_CLICKED_YES
+          # clear old project
+          closeProject()
+          # stop interceptor
         end
 
         session_settings = {}
 
 #        if File.exists?(session_file) then
 #        session_settings = Watobo::Utils.load_settings(session_file)
-        #updateistory(session_file)
+#updateistory(session_file)
 
 #        else
 #        puts "!!! Session file does not exist (#{session_file})."
@@ -969,8 +930,8 @@ module Watobo#:nodoc: all
         return false unless prefs.has_key? :session_name
 
         project = Watobo.create_project(
-        :project_name => prefs[:project_name],
-        :session_name => prefs[:session_name]
+            :project_name => prefs[:project_name],
+            :session_name => prefs[:session_name]
         )
 
         puts "* starting project"
@@ -1013,40 +974,40 @@ module Watobo#:nodoc: all
 =end
       end
 
-      def openScannerSettingsDialog(sender,sel,ptr)
-      #  if @project then
-         # settings = @project.getScanPreferences()
-          # puts settings.to_yaml
-         # dlg = Watobo::Gui::ScannerSettingsDialog.new(self, settings, LAYOUT_FILL_X|LAYOUT_FILL_Y)
-          dlg = Watobo::Gui::ScannerSettingsDialog.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-          if dlg.execute != 0 then
+      def openScannerSettingsDialog(sender, sel, ptr)
+        #  if @project then
+        # settings = @project.getScanPreferences()
+        # puts settings.to_yaml
+        # dlg = Watobo::Gui::ScannerSettingsDialog.new(self, settings, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        dlg = Watobo::Gui::ScannerSettingsDialog.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        if dlg.execute != 0 then
           # puts dlg.scanner_settings.to_yaml
-         # @project.updateSettings(YAML.load(YAML.dump(dlg.scanner_settings)))
-         # saveProjectSettings(@project)
+          # @project.updateSettings(YAML.load(YAML.dump(dlg.scanner_settings)))
+          # saveProjectSettings(@project)
           Watobo::Gui.save_settings()
 
-          end
-      #  else
-      #  FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First!")
-      #  end
+        end
+        #  else
+        #  FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First!")
+        #  end
       end
 
-      def openInterceptorSettingsDialog(sender,sel,ptr)
+      def openInterceptorSettingsDialog(sender, sel, ptr)
         dlg = Watobo::Gui::InterceptorSettingsDialog.new(self)
         if dlg.execute != 0 then
-        puts dlg.interceptor_settings.to_yaml if $DEBUG
-        Watobo::Conf::Interceptor.set dlg.interceptor_settings 
-        @statusBar.update_proxy_mode              
-        #@settings[:interceptor].update YAML.load(YAML.dump(dlg.interceptor_settings))
-        #@project.updateSettings(YAML.load(YAML.dump(dlg.scanner_settings)))
-        FXMessageBox.information(self, MBOX_OK, "Restart required!", "You must restart WATOBO in order your changes take effect.")
-        Watobo::Conf::Interceptor.save
-        Watobo::Gui.save_settings()
-        #Watobo::Gui.save_default_settings(@settings[:interceptor])
+          puts dlg.interceptor_settings.to_yaml if $DEBUG
+          Watobo::Conf::Interceptor.set dlg.interceptor_settings
+          @statusBar.update_proxy_mode
+          #@settings[:interceptor].update YAML.load(YAML.dump(dlg.interceptor_settings))
+          #@project.updateSettings(YAML.load(YAML.dump(dlg.scanner_settings)))
+          FXMessageBox.information(self, MBOX_OK, "Restart required!", "You must restart WATOBO in order your changes take effect.")
+          Watobo::Conf::Interceptor.save
+          Watobo::Gui.save_settings()
+          #Watobo::Gui.save_default_settings(@settings[:interceptor])
         end
       end
 
-      def openScopeDialog(sender,sel,ptr)
+      def openScopeDialog(sender, sel, ptr)
         dlg = Watobo::Gui::EditScopeDialog.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y)
         if dlg.execute != 0 then
           Watobo::Gui.save_settings()
@@ -1054,55 +1015,55 @@ module Watobo#:nodoc: all
         end
       end
 
-      def startFullScan(sender,sel,ptr)
+      def startFullScan(sender, sel, ptr)
         unless @scanner.nil?
-        #if @scan_button.icon == ICON_STOP
-           @scanner.cancel() if @scanner
-           @scan_button.icon = ICON_START
-           @scan_running = false
-           @scanner = nil
+          #if @scan_button.icon == ICON_STOP
+          @scanner.cancel() if @scanner
+          @scan_button.icon = ICON_START
+          @scan_running = false
+          @scanner = nil
         else
           dlg = Watobo::Gui::FullScanDialog.new(self, @project, LAYOUT_FILL_X|LAYOUT_FILL_Y)
           if dlg.execute != 0 then
 
             @scan_running = true
             @scan_button.icon = ICON_STOP
-           
+
             Watobo::Scope.set dlg.scope
 
-           
+
             selected_modules = dlg.activeModules
-            
+
             in_scope_chats = Watobo::Chats.in_scope()
-           
+
             puts "Chats in Scope: #{in_scope_chats.length}"
 
             confirm_dlg = Watobo::Gui::ConfirmScanDialog.new(self, in_scope_chats)
-            
+
             if confirm_dlg.execute == 0
               @scan_button.icon = ICON_START
               @scan_running = false
               return 0
             end
 
-           # scan_prefs = @project.getScanPreferences()
-           scan_prefs = Watobo::Conf::Scanner.to_h
+            # scan_prefs = @project.getScanPreferences()
+            scan_prefs = Watobo::Conf::Scanner.to_h
             scan_prefs[:scan_name] = "scan_" + Time.now.to_i.to_s + "_full"
 
-            @scanner = Watobo::Scanner3.new(in_scope_chats, selected_modules , [], scan_prefs)
+            @scanner = Watobo::Scanner3.new(in_scope_chats, selected_modules, [], scan_prefs)
 
             @scanner.subscribe(:progress) { |check|
-                 @dashboard.progress(check)
-            
+              @dashboard.progress(check)
+
             }
 
-            @scanner.subscribe(:module_finished) { |mod|              
-                 @dashboard.module_finished(mod)                
+            @scanner.subscribe(:module_finished) { |mod|
+              @dashboard.module_finished(mod)
             }
 
-            @scanner.subscribe(:logger){ |level, message|             
-               #@log_viewer.log(level, message)
-               Watobo.log(message, :sender=>'Scanner')              
+            @scanner.subscribe(:logger) { |level, message|
+              #@log_viewer.log(level, message)
+              Watobo.log(message, :sender => 'Scanner')
             }
 
 
@@ -1110,18 +1071,18 @@ module Watobo#:nodoc: all
               begin
                 @project.addFinding(finding)
               rescue => bang
-              puts bang
-              puts bang.backtrace if $DEBUG
+                puts bang
+                puts bang.backtrace if $DEBUG
               end
             }
 
 
-          @dashboard.setupScanProgressFrame(@scanner)
-            
-          @dashboard.setScanStatus("Running")
-          @statusBar.setStatusInfo(:text => "Full Scan Running", :color => 'red')
-          @scanner.run(:run_passive_checks => false, :update_sids => true, :update_session => true)
-           
+            @dashboard.setupScanProgressFrame(@scanner)
+
+            @dashboard.setScanStatus("Running")
+            @statusBar.setStatusInfo(:text => "Full Scan Running", :color => 'red')
+            @scanner.run(:run_passive_checks => false, :update_sids => true, :update_session => true)
+
           end
         end
       end
@@ -1129,17 +1090,17 @@ module Watobo#:nodoc: all
       def pauseScan(sender, sel, ptr)
         begin
           if @scanner.running?
-          @scanner.stop
-          @dashboard.setScanStatus("Scan Paused")
-          @statusBar.statusInfoText = "Scan Paused"
+            @scanner.stop
+            @dashboard.setScanStatus("Scan Paused")
+            @statusBar.statusInfoText = "Scan Paused"
           else
-          @scanner.continue
-          @dashboard.setScanStatus("Scan Running")
-          @statusBar.statusInfoText = "Full Scan Running"
+            @scanner.continue
+            @dashboard.setScanStatus("Scan Running")
+            @statusBar.statusInfoText = "Full Scan Running"
           end
         rescue => bang
-        puts "!!!ERROR: Could not pause scanner"
-        puts bang
+          puts "!!!ERROR: Could not pause scanner"
+          puts bang
         end
       end
 
@@ -1152,15 +1113,15 @@ module Watobo#:nodoc: all
 
         self.icon = ICON_WATOBO
         self.show(PLACEMENT_MAXIMIZED)
-        
+
         self.extend Watobo::Gui::Settings
-        
+
         self.connect(SEL_CLOSE, method(:onClose))
 
         @project = nil
 
         @scanner = nil
-      #  @iproxy = nil
+        #  @iproxy = nil
         @browserView = nil
 
         @scan_running = false
@@ -1176,7 +1137,7 @@ module Watobo#:nodoc: all
         # array for gui plugins. will be filled after project creation.
         @plugins = []
         @app = app
-        @progressWindow = nil             # reserved for simple progress Window
+        @progressWindow = nil # reserved for simple progress Window
         @switcher = nil
         @interceptor = nil
 
@@ -1185,7 +1146,6 @@ module Watobo#:nodoc: all
         @finding_lock = Mutex.new
         @chat_lock = Mutex.new
         @status_lock = Mutex.new
-        @msg_lock = Mutex.new
 
         @finding_queue = []
         @chat_queue = []
@@ -1194,39 +1154,39 @@ module Watobo#:nodoc: all
         # setup clipboard
         @clipboard_text = ""
         self.connect(SEL_CLIPBOARD_REQUEST) do
-        # setDNDData(FROM_CLIPBOARD, FXWindow.stringType, Fox.fxencodeStringData(@clipboard_text))
-          setDNDData(FROM_CLIPBOARD, FXWindow.stringType, @clipboard_text + "\x00" )
+          # setDNDData(FROM_CLIPBOARD, FXWindow.stringType, Fox.fxencodeStringData(@clipboard_text))
+          setDNDData(FROM_CLIPBOARD, FXWindow.stringType, @clipboard_text + "\x00")
         end
 
         menu_bar = FXMenuBar.new(self, :opts => LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
 
-@menu_items = []
+        @menu_items = []
         file_menu_pane = FXMenuPane.new(self)
-       
-        FXMenuTitle.new(menu_bar, "File" , :popupMenu => file_menu_pane)
-        @file_new_menu = FXMenuCommand.new(file_menu_pane, "New/Open" )
+
+        FXMenuTitle.new(menu_bar, "File", :popupMenu => file_menu_pane)
+        @file_new_menu = FXMenuCommand.new(file_menu_pane, "New/Open")
         @file_new_menu.connect(SEL_COMMAND, method(:onNewProject))
-        
-         export_menu = FXMenuCommand.new(file_menu_pane, "Export" )
+
+        export_menu = FXMenuCommand.new(file_menu_pane, "Export")
         #FXMenuCommand.new(file_menu_pane, "Exit", nil, getApp(), FXApp::ID_QUIT)
         export_menu.connect(SEL_COMMAND, method(:onExport))
 
 
-        exit_menu = FXMenuCommand.new(file_menu_pane, "Exit" )
+        exit_menu = FXMenuCommand.new(file_menu_pane, "Exit")
         #FXMenuCommand.new(file_menu_pane, "Exit", nil, getApp(), FXApp::ID_QUIT)
         exit_menu.connect(SEL_COMMAND, method(:onExit))
 
         FXMenuSeparator.new(file_menu_pane)
 
         submenu = FXMenuPane.new(self) do |session_menu|
-          Watobo::Gui.history.entries.sort_by{ |id, he| he[:last_used] }.reverse.each do |i,h|
+          Watobo::Gui.history.entries.sort_by { |id, he| he[:last_used] }.reverse.each do |i, h|
             hname = h[:project_name] + " - " + h[:session_name] + " (#{Time.at(h[:last_used]).strftime("%Y-%m-%d %H:%M")})"
-            history = FXMenuCommand.new(session_menu, hname )
+            history = FXMenuCommand.new(session_menu, hname)
             history.connect(SEL_COMMAND) do |sender, sel, item|
-            #     puts "open session #{h}"
-            #     puts "!!!ERROR Could not start session #{h}" if !openSession(h)
+              #     puts "open session #{h}"
+              #     puts "!!!ERROR Could not start session #{h}" if !openSession(h)
               if openSession(:project_name => h[:project_name], :session_name => h[:session_name])
-              Watobo::Gui.history.update_usage( :project_name => h[:project_name], :session_name => h[:session_name])
+                Watobo::Gui.history.update_usage(:project_name => h[:project_name], :session_name => h[:session_name])
               end
 
             end
@@ -1240,32 +1200,32 @@ module Watobo#:nodoc: all
         #  file_save_as_command = FXMenuCommand.new(file_menu_pane, "Save As..." )
 
         settings_menu_pane = FXMenuPane.new(self)
-       #  @menu_items << settings_menu_pane
-        FXMenuTitle.new(menu_bar, "Settings" , :popupMenu => settings_menu_pane)
-        @proxy_menu = FXMenuCommand.new(settings_menu_pane, "Forwarding Proxy..." )
-        @session_mgmt_menu = FXMenuCommand.new(settings_menu_pane, "Session Management..." )
+        #  @menu_items << settings_menu_pane
+        FXMenuTitle.new(menu_bar, "Settings", :popupMenu => settings_menu_pane)
+        @proxy_menu = FXMenuCommand.new(settings_menu_pane, "Forwarding Proxy...")
+        @session_mgmt_menu = FXMenuCommand.new(settings_menu_pane, "Session Management...")
         # @project ? menu_session.enable : menu_session.disable
 
-      #  menu_ca = FXMenuCommand.new(settings_menu_pane, "Create Certificate..." )
-      #  menu_ca.connect(SEL_COMMAND, method(:openCADialog))
+        #  menu_ca = FXMenuCommand.new(settings_menu_pane, "Create Certificate..." )
+        #  menu_ca.connect(SEL_COMMAND, method(:openCADialog))
 
-        @target_scope_menu = FXMenuCommand.new(settings_menu_pane, "Target Scope..." )
+        @target_scope_menu = FXMenuCommand.new(settings_menu_pane, "Target Scope...")
         @target_scope_menu.connect(SEL_COMMAND, method(:openScopeDialog))
 
-        @scanner_menu = FXMenuCommand.new(settings_menu_pane, "Scanner..." )
+        @scanner_menu = FXMenuCommand.new(settings_menu_pane, "Scanner...")
         @scanner_menu.connect(SEL_COMMAND, method(:openScannerSettingsDialog))
 
-        @interceptor_menu = FXMenuCommand.new(settings_menu_pane, "Interceptor..." )
+        @interceptor_menu = FXMenuCommand.new(settings_menu_pane, "Interceptor...")
         @interceptor_menu.connect(SEL_COMMAND, method(:openInterceptorSettingsDialog))
 
-        @www_auth_menu = FXMenuCommand.new(settings_menu_pane, "WWW-Auth..." )
-        @www_auth_menu .connect(SEL_COMMAND) { openWwwAuthDialog() }
+        @www_auth_menu = FXMenuCommand.new(settings_menu_pane, "WWW-Auth...")
+        @www_auth_menu.connect(SEL_COMMAND) { openWwwAuthDialog() }
 
-        @client_cert_menu = FXMenuCommand.new(settings_menu_pane, "Client Certificates..." )
+        @client_cert_menu = FXMenuCommand.new(settings_menu_pane, "Client Certificates...")
         @client_cert_menu.connect(SEL_COMMAND) { open_client_cert_dialog() }
 
-      #  pp_prefs = FXMenuCommand.new(settings_menu_pane, "Password Policy..." )
-      #  pp_prefs.connect(SEL_COMMAND) { openPWPolicyDialog() }
+        #  pp_prefs = FXMenuCommand.new(settings_menu_pane, "Password Policy..." )
+        #  pp_prefs.connect(SEL_COMMAND) { openPWPolicyDialog() }
         # intercept_enable = FXMenuCheck.new(settings_menu_pane, "Enable Interception")
 
         # file_menu_title = FXMenuTitle.new(menu_bar, "Settings" , :popupMenu => settings_menu_pane)
@@ -1274,18 +1234,18 @@ module Watobo#:nodoc: all
         @session_mgmt_menu.connect(SEL_COMMAND, method(:openSessionManagement))
 
         tools_menu_pane = FXMenuPane.new(self)
-        FXMenuTitle.new(menu_bar, "Tools" , :popupMenu => tools_menu_pane)
+        FXMenuTitle.new(menu_bar, "Tools", :popupMenu => tools_menu_pane)
         @transcoder_menu = FXMenuCommand.new(tools_menu_pane, "Transcoder")
         @interceptor_menu = FXMenuCommand.new(tools_menu_pane, "Interceptor")
-        
+
         @transcoder_menu.connect(SEL_COMMAND, method(:onOpenTranscoder))
         @interceptor_menu.connect(SEL_COMMAND, method(:onOpenInterceptor))
 
         view_menu_pane = FXMenuPane.new(self)
-        
-        FXMenuTitle.new(menu_bar, "View" , :popupMenu => view_menu_pane)
-        view_logs_command = FXMenuCommand.new(view_menu_pane, "Logs" )
-        view_dashboard_command = FXMenuCommand.new(view_menu_pane, "Dashboard" )
+
+        FXMenuTitle.new(menu_bar, "View", :popupMenu => view_menu_pane)
+        view_logs_command = FXMenuCommand.new(view_menu_pane, "Logs")
+        view_dashboard_command = FXMenuCommand.new(view_menu_pane, "Dashboard")
         view_findings_command = FXMenuCommand.new(view_menu_pane, "Chat-Table")
 
         view_dashboard_command.connect(SEL_COMMAND, method(:showDashboard))
@@ -1293,23 +1253,23 @@ module Watobo#:nodoc: all
         view_findings_command.connect(SEL_COMMAND, method(:showConversation))
 
         window_menu_pane = FXMenuPane.new(self)
-        
-        FXMenuTitle.new(menu_bar, "Window" , :popupMenu => window_menu_pane)
-        use_small_icons = FXMenuCheck.new(window_menu_pane, "Small Icons/Text" )
+
+        FXMenuTitle.new(menu_bar, "Window", :popupMenu => window_menu_pane)
+        use_small_icons = FXMenuCheck.new(window_menu_pane, "Small Icons/Text")
         use_small_icons.connect(SEL_COMMAND) {
           if use_small_icons.checked?
-          useSmallIcons()
+            useSmallIcons()
           else
-          useRegularIcons()
+            useRegularIcons()
           end
         }
 
         help_menu_pane = FXMenuPane.new(self)
-        FXMenuTitle.new(menu_bar, "Help" , :popupMenu => help_menu_pane)
+        FXMenuTitle.new(menu_bar, "Help", :popupMenu => help_menu_pane)
         #   menu_lic = FXMenuCommand.new(help_menu_pane, "License" )
-        menu_about = FXMenuCommand.new(help_menu_pane, "About" )
+        menu_about = FXMenuCommand.new(help_menu_pane, "About")
         menu_about.connect(SEL_COMMAND) {
-        #FXMessageBox.information(self,MBOX_OK,"About", "WATOBO Version 0.9.1!")
+          #FXMessageBox.information(self,MBOX_OK,"About", "WATOBO Version 0.9.1!")
           aboutDlg = AboutWatobo.new(self)
           aboutDlg.create
           aboutDlg.show(Fox::PLACEMENT_SCREEN)
@@ -1324,10 +1284,10 @@ module Watobo#:nodoc: all
         #  FXToolBarGrip.new(project_bar, :opts => TOOLBARGRIP_SINGLE)
         top_bar = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X|FRAME_SUNKEN, :padding => 0)
         project_bar = FXHorizontalFrame.new(top_bar, :opts => LAYOUT_FILL_X|PACK_UNIFORM_WIDTH|FRAME_NONE, :padding => 2)
-        @new_project_button = FXButton.new(project_bar, "\tNew Project\tNew Project." , :icon => ICON_ADD_PROJECT, :padding => 0)
+        @new_project_button = FXButton.new(project_bar, "\tNew Project\tNew Project.", :icon => ICON_ADD_PROJECT, :padding => 0)
         @new_project_button.connect(SEL_COMMAND, method(:onNewProject))
 
-        @scan_button = FXButton.new(project_bar, "\tStart Scan\tStart Scan." ,:opts => FRAME_RAISED|FRAME_THICK, :icon => ICON_START, :padding => 0)
+        @scan_button = FXButton.new(project_bar, "\tStart Scan\tStart Scan.", :opts => FRAME_RAISED|FRAME_THICK, :icon => ICON_START, :padding => 0)
         @scan_button.disable
         # @start_scan_button.tipText = "Start Scan"
         @scan_button.connect(SEL_COMMAND, method(:startFullScan))
@@ -1382,45 +1342,45 @@ module Watobo#:nodoc: all
         frame = FXVerticalFrame.new(tab_frame, :opts => LAYOUT_FILL_Y|LAYOUT_FILL_X|FRAME_SUNKEN, :padding => 0)
         @sites_tree = Watobo::Gui::SitesTree.new(frame, self, nil)
 
-         @treeTabbook.connect(SEL_COMMAND) { |sender, sel, item|
-            case item
-              when 0
-    #  @chatTable.apply_filter @conversation_table_ctrl.filter_settings
-                begin
-                  getApp().beginWaitCursor()
-                  update_conversation_table()
-                ensure
-                  getApp().endWaitCursor()
-                end
-  # if @project
-  #   @project.settings.delete(:site_filter)
-  #       updateRequestTable(@project)
-  #end
-            end
-          }
-        
+        @treeTabbook.connect(SEL_COMMAND) { |sender, sel, item|
+          case item
+            when 0
+              #  @chatTable.apply_filter @conversation_table_ctrl.filter_settings
+              begin
+                getApp().beginWaitCursor()
+                update_conversation_table()
+              ensure
+                getApp().endWaitCursor()
+              end
+            # if @project
+            #   @project.settings.delete(:site_filter)
+            #       updateRequestTable(@project)
+            #end
+          end
+        }
+
         subscribeFindingsTree()
         subscribeSitesTree()
-        
+
         # S W I T C H E R
-        @switcher = FXSwitcher.new(splitter,LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
+        @switcher = FXSwitcher.new(splitter, LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
 
         # R E Q U E S T I N F O
         requestInfo = FXVerticalFrame.new(@switcher, :opts => LAYOUT_FILL_X|LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         request_splitter = FXSplitter.new(requestInfo, :opts => LAYOUT_SIDE_TOP|SPLITTER_HORIZONTAL|LAYOUT_FILL_Y|LAYOUT_FILL_X|SPLITTER_TRACKING|SPLITTER_REVERSED)
-#request_splitter.connect(SEL_COMMAND){
-  #puts "Request Splitter Resized!"
-  #}
+        #request_splitter.connect(SEL_COMMAND){
+        #puts "Request Splitter Resized!"
+        #}
 
         # C H A T  T A B L E  C O N T R O L L E R
-       # @conversation_table_ctrl = ConversationTableCtrl.new(request_splitter,  :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
-        @conversation_table_ctrl = ConversationTableCtrl2.new(request_splitter,  :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
+        # @conversation_table_ctrl = ConversationTableCtrl.new(request_splitter,  :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
+        @conversation_table_ctrl = ConversationTableCtrl2.new(request_splitter, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
 
         # C H A T   T A B L E
-        @chatTable = ConversationTable.new(@conversation_table_ctrl )
+        @chatTable = ConversationTable.new(@conversation_table_ctrl)
         @conversation_table_ctrl.table = @chatTable
 
-        @chatTable.autoscroll =  true
+        @chatTable.autoscroll = true
 =begin
         @chatTable.connect(SEL_COMMAND) do |sender, sel, item|
           @findings_tree.killSelection()
@@ -1428,14 +1388,14 @@ module Watobo#:nodoc: all
           onTableClick(sender,sel,item)
         end
 =end
-        @chatTable.subscribe(:chat_selected){ |chat|
-           chat_selected(chat) unless chat.nil?
-          }
-          
-        @chatTable.subscribe(:chat_doubleclicked){ |chat|
+        @chatTable.subscribe(:chat_selected) { |chat|
+          chat_selected(chat) unless chat.nil?
+        }
+
+        @chatTable.subscribe(:chat_doubleclicked) { |chat|
           open_manual_request_editor(chat)
-          }
-          
+        }
+
 =begin          
         @chatTable.connect(SEL_DOUBLECLICKED) do |sender, sel, data|
           @findings_tree.killSelection()
@@ -1449,7 +1409,7 @@ module Watobo#:nodoc: all
           end
         end
 =end
-        
+
 =begin
         @chatTable.connect(SEL_CHANGED){ |sender, sel, item|
           #puts item.row
@@ -1478,33 +1438,33 @@ module Watobo#:nodoc: all
 
         }
 =end
-       @chatTable.subscribe(:edit_comment){|chat|
-         puts "#{self} EDIT COMMENT"
-         dlg = Watobo::Gui::EditCommentDialog.new(self, chat)
-               if dlg.execute != 0 then
-                 chat.comment = dlg.comment
-                 @chatTable.updateComment(@chatTable.currentRow, dlg.comment)
-                 Watobo::Utils.saveChat(chat, chat.file)
-               end
-         
-         }
-         
-        @chatTable.subscribe(:open_filter_dlg){|chat|
-         puts "#{self} Open Filter Dialog"
-         dlg = Watobo::Gui::ConversationFilterDialog.new(self, @conversation_table_ctrl.filter)
+        @chatTable.subscribe(:edit_comment) { |chat|
+          puts "#{self} EDIT COMMENT"
+          dlg = Watobo::Gui::EditCommentDialog.new(self, chat)
+          if dlg.execute != 0 then
+            chat.comment = dlg.comment
+            @chatTable.updateComment(@chatTable.currentRow, dlg.comment)
+            Watobo::Utils.saveChat(chat, chat.file)
+          end
+
+        }
+
+        @chatTable.subscribe(:open_filter_dlg) { |chat|
+          puts "#{self} Open Filter Dialog"
+          dlg = Watobo::Gui::ConversationFilterDialog.new(self, @conversation_table_ctrl.filter)
           if dlg.execute != 0
             #puts dlg.filter_settings.to_yaml
             filter = dlg.filter_settings
-            
+
             unless @chatTable.nil?
               getApp().beginWaitCursor do
-                @chatTable.apply_filter(filter)           
+                @chatTable.apply_filter(filter)
               end
             end
-                   
+
           end
-         
-         }
+
+        }
 
         @chatTable.connect(SEL_RIGHTBUTTONRELEASE) do |sender, sel, event|
           @findings_tree.killSelection()
@@ -1524,22 +1484,22 @@ module Watobo#:nodoc: all
 
               FXMenuPane.new(self) do |menu_pane|
 
-              # SEND TO SUBMENU
+                # SEND TO SUBMENU
                 submenu = FXMenuPane.new(self) do |sendto_menu|
 
-                  target = FXMenuCommand.new(sendto_menu, "Fuzzer..." )
+                  target = FXMenuCommand.new(sendto_menu, "Fuzzer...")
                   target.connect(SEL_COMMAND) {
                     openFuzzer(chat)
                   }
-                  target = FXMenuCommand.new(sendto_menu, "Manual Request..." )
+                  target = FXMenuCommand.new(sendto_menu, "Manual Request...")
                   target.connect(SEL_COMMAND) {
                     open_manual_request_editor(chat)
                   }
-                  target = FXMenuCommand.new(sendto_menu, "SQLmap..." )
+                  target = FXMenuCommand.new(sendto_menu, "SQLmap...")
                   target.connect(SEL_COMMAND) {
                     open_plugin_sqlmap(chat)
                   }
-                  target = FXMenuCommand.new(sendto_menu, "Crawler..." )
+                  target = FXMenuCommand.new(sendto_menu, "Crawler...")
                   target.connect(SEL_COMMAND) {
                     open_plugin_crawler(chat)
                   }
@@ -1551,22 +1511,22 @@ module Watobo#:nodoc: all
                 exclude_submenu = FXMenuPane.new(self) do |sub|
                   chat = Watobo::Chats.get_by_id(chatid)
 
-                  target = FXMenuCheck.new(sub, "Chat (#{chatid})" )
+                  target = FXMenuCheck.new(sub, "Chat (#{chatid})")
 
                   target.check = @project.scan_settings[:excluded_chats].include?(chatid) ? true : false
 
                   target.connect(SEL_COMMAND) {
                     if target.checked?()
-                    @project.scan_settings[:excluded_chats].push chatid
+                      @project.scan_settings[:excluded_chats].push chatid
                     else
-                    @project.scan_settings[:excluded_chats].delete(chatid)
+                      @project.scan_settings[:excluded_chats].delete(chatid)
                     end
 
                   }
-                #   target = FXMenuCommand.new(sub, "Path" )
-                #   target.connect(SEL_COMMAND) {
-                # ...
-                #   }
+                  #   target = FXMenuCommand.new(sub, "Path" )
+                  #   target.connect(SEL_COMMAND) {
+                  # ...
+                  #   }
 
                 end
                 FXMenuCascade.new(menu_pane, "Exclude from Scan", nil, exclude_submenu)
@@ -1576,53 +1536,53 @@ module Watobo#:nodoc: all
                   chat = Watobo::Chats.get_by_id(chatid)
                   url = chat.request.url.to_s
                   #  puts url
-                  url_string = "URL: #{url.slice(0,35)}"
+                  url_string = "URL: #{url.slice(0, 35)}"
                   url_string += "..." if url.length > 36
 
-                  target = FXMenuCommand.new(sub, url_string )
+                  target = FXMenuCommand.new(sub, url_string)
                   target.connect(SEL_COMMAND) {
-                    types = [ FXWindow.stringType ]
+                    types = [FXWindow.stringType]
                     if acquireClipboard(types)
-                    puts
-                    @clipboard_text = url
+                      puts
+                      @clipboard_text = url
                     end
 
                   }
-                  target = FXMenuCommand.new(sub, "Site: #{chat.request.site}" )
+                  target = FXMenuCommand.new(sub, "Site: #{chat.request.site}")
                   target.connect(SEL_COMMAND) {
                     site = Watobo::Chats.get_by_id(chatid).request.site
 
-                    types = [ FXWindow.stringType ]
+                    types = [FXWindow.stringType]
                     if acquireClipboard(types)
-                    @clipboard_text = site
+                      @clipboard_text = site
                     end
                   }
 
                 end
                 FXMenuCascade.new(menu_pane, "Copy", nil, copy_submenu)
 
-                addToLogin = FXMenuCommand.new(menu_pane, "Add to Login-Script" )
+                addToLogin = FXMenuCommand.new(menu_pane, "Add to Login-Script")
                 addToLogin.connect(SEL_COMMAND) {
                   @project.add_login_chat_id(chatid)
                   puts "Add to Login-Script ... saveSessionSettings (#{@project.class})"
                   Watobo::Gui.save_settings()
                 }
 
-                target = FXMenuCheck.new(menu_pane, "Tested" )
+                target = FXMenuCheck.new(menu_pane, "Tested")
                 target.check = chat.tested?
                 target.connect(SEL_COMMAND) {
                   chat.tested = target.checked?()
                   Watobo::Utils.saveChat(chat, chat.file)
                 }
 
-                FXMenuCommand.new(menu_pane, "Edit comment.." ).connect(SEL_COMMAND) {
-                #  puts row
+                FXMenuCommand.new(menu_pane, "Edit comment..").connect(SEL_COMMAND) {
+                  #  puts row
 
                   dlg = Watobo::Gui::EditCommentDialog.new(self, chat)
                   if dlg.execute != 0 then
-                  chat.comment = dlg.comment
-                  @chatTable.updateComment(row, dlg.comment)
-                  Watobo::Utils.saveChat(chat, chat.file)
+                    chat.comment = dlg.comment
+                    @chatTable.updateComment(row, dlg.comment)
+                    Watobo::Utils.saveChat(chat, chat.file)
                   end
                 }
                 #  copyRequest = FXMenuCommand.new(menu_pane, "copy Request(#{chatid})" )
@@ -1646,7 +1606,7 @@ module Watobo#:nodoc: all
         #===================================================================
         # CHAT VIEWER
         #===================================================================
-        chat_outer_frame = FXVerticalFrame.new(request_splitter, :opts => LAYOUT_FILL_Y|LAYOUT_FILL_X|FRAME_SUNKEN|LAYOUT_MIN_WIDTH, :padding => 0, :width=>400)
+        chat_outer_frame = FXVerticalFrame.new(request_splitter, :opts => LAYOUT_FILL_Y|LAYOUT_FILL_X|FRAME_SUNKEN|LAYOUT_MIN_WIDTH, :padding => 0, :width => 400)
         chat_frame = chat_outer_frame
         #          chat_frame = FXVerticalFrame.new(chat_outer_frame, :opts => LAYOUT_FILL_X|FRAME_SUNKEN, :padding => 0)
         #view_menu = FXVerticalFrame.new(chat_frame, :opts => LAYOUT_FILL_X, :padding => 0)
@@ -1674,10 +1634,10 @@ module Watobo#:nodoc: all
         @bv_button.connect(SEL_COMMAND) {
           begin
             if @lastViewed and @browserView then
-            openBrowser(@lastViewed.request, @lastViewed.response)
+              openBrowser(@lastViewed.request, @lastViewed.response)
             end
           rescue => bang
-          puts bang
+            puts bang
 
           end
         }
@@ -1685,32 +1645,32 @@ module Watobo#:nodoc: all
 
         #  FXHorizontalSeparator.new(chat_frame, :opts => SEPARATOR_GROOVE|LAYOUT_FILL_X)
         #  FXLabel.new(view_menu, "Source:")
-        @chat_frame_splitter =  FXSplitter.new(chat_outer_frame, :opts => LAYOUT_SIDE_TOP|SPLITTER_VERTICAL|LAYOUT_FILL_Y|LAYOUT_FILL_X|SPLITTER_TRACKING)
-        chat_frame = FXVerticalFrame.new(@chat_frame_splitter, :opts => LAYOUT_FILL_X|FRAME_SUNKEN|LAYOUT_MIN_WIDTH|LAYOUT_MIN_HEIGHT, :padding => 0, :width=>400, :height => 400)
+        @chat_frame_splitter = FXSplitter.new(chat_outer_frame, :opts => LAYOUT_SIDE_TOP|SPLITTER_VERTICAL|LAYOUT_FILL_Y|LAYOUT_FILL_X|SPLITTER_TRACKING)
+        chat_frame = FXVerticalFrame.new(@chat_frame_splitter, :opts => LAYOUT_FILL_X|FRAME_SUNKEN|LAYOUT_MIN_WIDTH|LAYOUT_MIN_HEIGHT, :padding => 0, :width => 400, :height => 400)
         #chat_frame = FXVerticalFrame.new(chat_frame_splitter, :opts => LAYOUT_FILL_X|FRAME_SUNKEN|LAYOUT_MIN_WIDTH, :padding => 0, :width=>400)
         title_frame = FXHorizontalFrame.new(chat_frame, :opts => LAYOUT_FILL_X)
-        FXLabel.new(title_frame, "Request").setFont(FXFont.new(getApp(), "helvetica", 9, FONTWEIGHT_BOLD, FONTENCODING_DEFAULT)) 
+        FXLabel.new(title_frame, "Request").setFont(FXFont.new(getApp(), "helvetica", 9, FONTWEIGHT_BOLD, FONTENCODING_DEFAULT))
 
         @request_viewer = Watobo::Gui::RequestViewer.new(chat_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         #  @request_viewer = Watobo::Gui::ChatViewer.new(chat_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         # @request_viewer.highlight_style = 1
-        
+
         #
         # SEL_CONFIGURE is fired when the window is resized
         #@request_viewer.connect(SEL_CONFIGURE){ |sender, sel, ptr|
-        @chat_frame_splitter.connect(SEL_COMMAND){
-         # puts sender.class
-        #  puts sender.width 
-        puts @request_viewer.height
-          }
+        @chat_frame_splitter.connect(SEL_COMMAND) {
+          # puts sender.class
+          #  puts sender.width
+          puts @request_viewer.height
+        }
 
         # FXHorizontalSeparator.new(chat_frame, :opts => SEPARATOR_GROOVE|LAYOUT_FILL_X)
-        chat_frame = FXVerticalFrame.new(@chat_frame_splitter, :opts => LAYOUT_FILL_X|FRAME_SUNKEN|LAYOUT_MIN_WIDTH, :padding => 0, :width=>400)
+        chat_frame = FXVerticalFrame.new(@chat_frame_splitter, :opts => LAYOUT_FILL_X|FRAME_SUNKEN|LAYOUT_MIN_WIDTH, :padding => 0, :width => 400)
         title_frame = FXHorizontalFrame.new(chat_frame, :opts => LAYOUT_FILL_X)
         FXLabel.new(title_frame, "Response").setFont(FXFont.new(getApp(), "helvetica", 9, FONTWEIGHT_BOLD, FONTENCODING_DEFAULT))
-        
+
         @save_response_btn = FXButton.new(title_frame, "Save", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT)
-        @save_response_btn.connect(SEL_COMMAND){ save_response }
+        @save_response_btn.connect(SEL_COMMAND) { save_response }
         #fxViewButton = FXButton.new(title_frame, "View", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT)
         #fxViewButton.connect(SEL_COMMAND, method(:onViewResponse))
 
@@ -1723,9 +1683,9 @@ module Watobo#:nodoc: all
         #===================================================================
         #logFrame = FXVerticalFrame.new(@switcher, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
         #FXLabel.new(logFrame, "Eventlist:", :opts => LAYOUT_FILL_X)
-       
-       # @log_viewer = Watobo::Gui::LogViewer.new(logFrame, :opts => FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-       @log_viewer = Watobo::Gui::LogFileViewer.new(@switcher, :opts => FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+        # @log_viewer = Watobo::Gui::LogViewer.new(logFrame, :opts => FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        @log_viewer = Watobo::Gui::LogFileViewer.new(@switcher, :opts => FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
         # DASHBOARD#
         @dashboard = Dashboard.new(@switcher)
@@ -1737,16 +1697,15 @@ module Watobo#:nodoc: all
         # PLUGIN-BOARD
         @pluginboard = PluginBoard.new(@switcher)
 
-    #    if @foption_nopix.checked? then @doctype_TableFilter.concat(@fext_pix);end
-    #    if @foption_nodocs.checked? then @doctype_TableFilter.concat(@fext_docs);end
-    #    if @foption_nojs.checked? then @doctype_TableFilter.concat(@fext_javascript);end
-    #    if @foption_nocss.checked? then @doctype_TableFilter.concat(@fext_style);end
-        
+        #    if @foption_nopix.checked? then @doctype_TableFilter.concat(@fext_pix);end
+        #    if @foption_nodocs.checked? then @doctype_TableFilter.concat(@fext_docs);end
+        #    if @foption_nojs.checked? then @doctype_TableFilter.concat(@fext_javascript);end
+        #    if @foption_nocss.checked? then @doctype_TableFilter.concat(@fext_style);end
+
         add_queue_timer(250)
         #disable_menu
         update_menu
-        
-         
+
 
       end
 
@@ -1755,8 +1714,9 @@ module Watobo#:nodoc: all
         # adjust splitters
         frame_height = (@chat_frame_splitter.getSplit(1) + @chat_frame_splitter.getSplit(0)) / 2
         @chat_frame_splitter.setSplit(0, frame_height)
-        @chat_frame_splitter.setSplit(1, frame_height )
+        @chat_frame_splitter.setSplit(1, frame_height)
       end
+
       # !!!
       #  TODO: FXRUBY-Bug???
       #  If splash screen is shown app will crash on close :(
@@ -1773,83 +1733,92 @@ module Watobo#:nodoc: all
 
       # end
       private
-      
+
       def chat_selected(chat)
         begin
           getApp().beginWaitCursor()
           # purge viewers
           @request_viewer.setText('')
           @response_viewer.setText('')
-       
-               showChat(chat)
-          
+
+          showChat(chat)
+
         rescue => bang
           puts "!!!ERROR: chat_selected"
           puts bang
           puts bang.backtrace
           puts "!!!"
         ensure
-        getApp().endWaitCursor()
+          getApp().endWaitCursor()
         end
       end
 
       def save_response
         unless @last_chat.nil?
-        dlg = SaveChatDialog.new(self, @last_chat)
-        if dlg.execute != 0
-          FXMessageBox.information(self,MBOX_OK,"Response Saved", "The response has been saved to #{dlg.filename}!")
-          
-        end
+          dlg = SaveChatDialog.new(self, @last_chat)
+          if dlg.execute != 0
+            FXMessageBox.information(self, MBOX_OK, "Response Saved", "The response has been saved to #{dlg.filename}!")
+
+          end
         else
           puts "NO CHAT SELECTED!"
         end
       end
-      
+
       def subscribeProject()
-        Watobo::Chats.subscribe(:new){ |c|
+        Watobo::Chats.subscribe(:new) { |c|
           # Thread.new { addChat(c)}
-        # puts "Got New Chat (#{c.id})"
-          @chat_lock.synchronize do
-          @chat_queue << c
-        end
+          # puts "Got New Chat (#{c.id})"
+          #@chat_lock.synchronize do
+          #  @chat_queue << c
+          #end
+
+            FXApp.instance.addChore do
+              addChat(c)
+            end
+
         }
-       
-        Watobo::Findings.subscribe(:new){ |f|
-          # Thread.new { addFinding(f) }
-          @finding_lock.synchronize do
-          @finding_queue << f
-          end
+
+        Watobo::Findings.subscribe(:new) { |f|
+
+
+            FXApp.instance.addChore do
+              addFinding(f)
+            end
+
         }
 
-       
+
       end
 
       def subscribeSitesTree()
-        @sites_tree.subscribe(:add_site_to_scope){ |site|
+        @sites_tree.subscribe(:add_site_to_scope) { |site|
           Watobo::Scope.add(site)
           Watobo::Gui.save_settings()
         }
 
-        @sites_tree.subscribe(:show_conversation){ |chat_list|
+        @sites_tree.subscribe(:show_conversation) { |chat_list|
           showConversation()
           @chatTable.showConversation(chat_list, :ignore_filter)
           @conversation_table_ctrl.text = "Selected Chats (#{chat_list.length}/#{Watobo::Chats.length})"
         }
 
-        @sites_tree.subscribe(:show_chat){ |chat|
+        @sites_tree.subscribe(:show_chat) { |chat|
           showChat(chat)
         }
-        
-         @sites_tree.subscribe(:vuln_click){ |v| showVulnerability(v) }
+
+        @sites_tree.subscribe(:vuln_click) { |v|
+          showVulnerability(v)
+        }
       end
 
       def subscribeFindingsTree()
-        @findings_tree.subscribe(:add_site_to_scope){ |site|
+        @findings_tree.subscribe(:add_site_to_scope) { |site|
           Watobo::Scope.add(site)
           Watobo::Gui.save_settings()
         }
 
-        @findings_tree.subscribe(:delete_domain_filter){ |df|
+        @findings_tree.subscribe(:delete_domain_filter) { |df|
           @project.settings[:domain_filters].delete(df)
           #  puts "Delete Domain-Filter #{df}"
           updateTreeLists()
@@ -1860,19 +1829,19 @@ module Watobo#:nodoc: all
           updateTreeLists()
         }
 
-        @findings_tree.subscribe(:vuln_click){ |v| showVulnerability(v) }
+        @findings_tree.subscribe(:vuln_click) { |v| showVulnerability(v) }
+
+        @findings_tree.subscribe(:finding_click) { |v| showFindingDetails(v) }
+
+        @findings_tree.subscribe(:show_finding_details) { |v| showFindingDetails(v) }
+
+        @findings_tree.subscribe(:open_manual_request) { |v| open_manual_request_editor(v) }
 
-        @findings_tree.subscribe(:finding_click){ |v| showFindingDetails(v) }
+        @findings_tree.subscribe(:purge_findings) { |f| purge_findings(f) }
 
-        @findings_tree.subscribe(:show_finding_details){ |v| showFindingDetails(v) }
+        @findings_tree.subscribe(:set_false_positive) { |f| set_false_positive(f) }
 
-        @findings_tree.subscribe(:open_manual_request){ |v| open_manual_request_editor(v) }
-        
-        @findings_tree.subscribe(:purge_findings){ |f| purge_findings(f) }
-        
-        @findings_tree.subscribe(:set_false_positive){ |f| set_false_positive(f) }
-        
-        @findings_tree.subscribe(:unset_false_positive){ |f| unset_false_positive(f) }
+        @findings_tree.subscribe(:unset_false_positive) { |f| unset_false_positive(f) }
 
       end
 
@@ -1884,7 +1853,7 @@ module Watobo#:nodoc: all
           # puts "Num. Threads: #{Thread.list.length}"
           getApp().exit(0)
         else
-         1
+          1
         end
       end
 
@@ -1894,11 +1863,11 @@ module Watobo#:nodoc: all
           begin
             settings = Hash.new
             settings = Watobo::Utils.load_settings(filename)
-            #            puts settings.to_yaml
+              #            puts settings.to_yaml
           rescue => bang
-          puts "!!!ERROR: could not update project settings"
-          puts bang
-          return false
+            puts "!!!ERROR: could not update project settings"
+            puts bang
+            return false
           end
         end
         return settings
@@ -1911,41 +1880,41 @@ module Watobo#:nodoc: all
           begin
             settings = Watobo::Utils.load_settings(filename)
           rescue => bang
-          puts "!!!ERROR: could not load session settings"
-          puts bang
-          return false
+            puts "!!!ERROR: could not load session settings"
+            puts bang
+            return false
           end
         else
-        puts "! SessionSettings file #{filename} does not exist!"
+          puts "! SessionSettings file #{filename} does not exist!"
         end
         return settings
       end
-      
-      def onExport(sender,sel, item)
-          ccdlg = Watobo::Gui::ExportDialog.new(self)
-          if ccdlg.execute != 0
-            
-          end
-      
+
+      def onExport(sender, sel, item)
+        ccdlg = Watobo::Gui::ExportDialog.new(self)
+        if ccdlg.execute != 0
+
+        end
+
       end
 
       def onExit(sender, sel, item)
         response = FXMessageBox.question(self, MBOX_YES_NO, "Finished?", "Are you sure?")
         if response == MBOX_CLICKED_YES
-        getApp().exit(0)
+          getApp().exit(0)
         end
       end
 
-     # def onApplyFilterClick(sender,sel,item)
-    #    applyFilter()
-     # end
+      # def onApplyFilterClick(sender,sel,item)
+      #    applyFilter()
+      # end
 
       def onClear(sender, sel, item)
         @table_filter.value =""
         @tableFilterFX.handle(self, FXSEL(SEL_UPDATE, 0), nil)
       end
 
-      def onTableClick(sender,sel,item)
+      def onTableClick(sender, sel, item)
         begin
           getApp().beginWaitCursor()
           # purge viewers
@@ -1958,75 +1927,75 @@ module Watobo#:nodoc: all
           # @logText.appendText("selected ID: (#{chatid})\n")
           chat = Watobo::Chats.get_by_id chatid
           showChat(chat) unless chat.nil?
-            
+
         rescue => bang
           puts "!!!ERROR: onTableClick"
           puts bang
           puts "!!!"
         ensure
-        getApp().endWaitCursor()
+          getApp().endWaitCursor()
         end
       end
 
-      def onMenuProxy(sender,sel,item)
-          proxy_dialog = Watobo::Gui::ProxyDialog.new(self)
-          if proxy_dialog.execute != 0 then
+      def onMenuProxy(sender, sel, item)
+        proxy_dialog = Watobo::Gui::ProxyDialog.new(self)
+        if proxy_dialog.execute != 0 then
           proxy_prefs = proxy_dialog.getProxyPrefs
           Watobo::Conf::ForwardingProxy.set proxy_prefs
-        # Watobo::Gui.save_settings()
-         #Watobo::Conf::ForwardingProxy.save
-         
-         Watobo.save_proxy_settings
+          # Watobo::Gui.save_settings()
+          #Watobo::Conf::ForwardingProxy.save
+
+          Watobo.save_proxy_settings
           update_status_bar()
-          end
-       
+        end
+
         #FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
-       
+
       end
-      
+
       def update_menu
-        [@client_cert_menu, @www_auth_menu, @target_scope_menu ].each do |m|
-        Watobo.project.nil? ? m.disable : m.enable
+        [@client_cert_menu, @www_auth_menu, @target_scope_menu].each do |m|
+          Watobo.project.nil? ? m.disable : m.enable
         end
       end
-      
+
       def disable_menu_UNUSED
-         @menu_items.each do |e|
-           e.disable if e.respond_to? :disable
-           if e.respond_to? :each_child
-             e.each_child do |c|
-               c.disable if c.respond_to? :disable
-             end
-           end
-         end
-      end
-      
+        @menu_items.each do |e|
+          e.disable if e.respond_to? :disable
+          if e.respond_to? :each_child
+            e.each_child do |c|
+              c.disable if c.respond_to? :disable
+            end
+          end
+        end
+      end
+
       def enable_menu_UNUSED
-         @menu_items.each do |e|
-           e.enable if e.respond_to? :enable
-           if e.respond_to? :each_child
-             e.each_child do |c|
-               c.enable if c.respond_to? :enable
-             end
-           end
-         end
-        
-      end
-      
+        @menu_items.each do |e|
+          e.enable if e.respond_to? :enable
+          if e.respond_to? :each_child
+            e.each_child do |c|
+              c.enable if c.respond_to? :enable
+            end
+          end
+        end
+
+      end
+
       def purge_findings(findings)
         findings.each do |f|
           Watobo::Findings.delete(f)
         end
         @findings_tree.reload
       end
-      
+
       def set_false_positive(findings)
         findings.each do |f|
           Watobo::Findings.set_false_positive(f)
         end
         @findings_tree.reload
       end
-      
+
       def unset_false_positive(findings)
         findings.each do |f|
           Watobo::Findings.unset_false_positive(f)