watobo 0.9.9.pre3 → 0.9.9

data/lib/watobo/gui/main_window.rb

@@ -346,19 +346,22 @@ module Watobo
       end
 
       def openSessionManagement(sender, sel, item)
-        smdlg = SessionManagementDialog.new(self, @project)
+        smdlg = SessionManagementDialog.new(self)
         if smdlg.execute != 0 then
-          ids = smdlg.getLoginScriptIds()
+         
           sidpatterns = smdlg.getSidPatterns()
           logout_signatures = smdlg.getLogoutSignatures()
-          if @project
-          @project.setLoginChatIds(ids)
-          @project.setSidPatterns(sidpatterns)
-          @project.setLogoutSignatures(logout_signatures)
+          unless Watobo.project.nil?
+             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::Scanner.sid_patterns = sidpatterns
         Watobo::Gui.save_settings()
         end
       end
@@ -392,11 +395,11 @@ module Watobo
       end
 
       def openWwwAuthDialog()
-        if @project.nil?
-        FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
-        else
+       # if @project.nil?
+       # FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
+       # else
           auth_settings = {}
-          w3adlg = Watobo::Gui::WwwAuthDialog.new(self, @project, Watobo::Conf::General.dump )
+          w3adlg = Watobo::Gui::WwwAuthDialog.new(self )
           if w3adlg.execute != 0
           #puts "* New WWW-Authentication"
           #puts @project.getWwwAuthentication().to_yaml
@@ -404,11 +407,12 @@ module Watobo
          # saveProjectSettings(@project)
          # Watobo::Gui.save_default_settings(@project)
          Watobo::Gui.save_settings()
-          @iproxy.www_auth = @project.getWwwAuthentication()
+          #@iproxy.www_auth = @project.getWwwAuthentication()
+          Watobo::Interceptor.proxy.refresh_www_auth
           end
-        puts "* new www_auth settings"
+        #puts "* new www_auth settings"
         # puts YAML.dump(@project.settings[:www_auth])
-        end
+        #end
 
       end
 
@@ -424,7 +428,7 @@ module Watobo
           puts "* got client certificate settings"
           puts ccdlg.client_certificates.to_yaml
           @project.client_certificates = ccdlg.client_certificates
-          @iproxy.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)
@@ -465,6 +469,17 @@ module Watobo
         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
+        end
+      end
 
       def addChat(chat)
         # addChatToTable(chat) if chatIsFiltered?(chat) == false
@@ -509,7 +524,7 @@ module Watobo
           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:#{@iproxy.port}) as its proxy.\nSo you can't use the Browser-View feature.\nPlease change your proxy settings and try it again!")
+          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
@@ -583,9 +598,9 @@ module Watobo
       end
 
       def onOpenInterceptor(sender, sel, ptr)
-        if @project then
-        interceptor = Watobo::Gui::InterceptorUI.new(self, @iproxy, :opts => DECOR_ALL)
-        iproxy.target = interceptor
+        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
@@ -593,7 +608,7 @@ module Watobo
         getApp().runModalWhileShown(interceptor)
         interceptor.releaseAll()
         puts "* Interceptor closed"
-        iproxy.target = nil
+        #iproxy.target = nil
         #if interceptor.execute != 0 then
         #  puts "interceptor finished"
         #end
@@ -603,18 +618,26 @@ module Watobo
         end
       end
 
-      def update_status_bar(project)
-        @statusBar.projectName = project.projectName
-        @statusBar.sessionName = project.sessionName
+      def update_status_bar(project=nil)
+        unless Watobo.project.nil?          
+         @statusBar.projectName = Watobo.project_name
+         @statusBar.sessionName = Watobo.session_name
+         @dashboard.updateProjectInfo(Watobo.project)
+         @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 = "-"
-        proxy = project.getCurrentProxy()
-        unless proxy.nil?
-        @statusBar.forwardingProxy = "#{proxy[:name]} (#{proxy[:host]}:#{proxy[:port]})"
+      #  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.statusInfoText = "Ready"
-        @scan_button.enable
-        @dashboard.updateProjectInfo(project)
+        
+        @statusBar.update_proxy_mode
       end
 
       def setupProgressWindow(title, numTotal)
@@ -650,8 +673,9 @@ module Watobo
         @lastViewed = nil
         @last_request = nil
         @last_response = nil
-        @iproxy.stop if @iproxy
-        disable_menu
+        #@iproxy.stop if @iproxy
+        Watobo::Interceptor.stop
+        #disable_menu
 
       end
 
@@ -696,7 +720,7 @@ module Watobo
       def startProject(project)
 
         return false unless project.is_a? Project
-        enable_menu
+        update_menu
 
         puts "DEBUG: starting project" if $DEBUG
         @project = project
@@ -726,20 +750,8 @@ module Watobo
 
             #puts "= SETTINGS ="
             #puts @settings.to_yaml
-            @iproxy = Watobo::InterceptProxy.new()
-            @iproxy.subscribe(:new_interception) { |chat|
-              Thread.new(chat) { |c|
-                @project.addChat(c)
-              }
-            }
-            @iproxy.run()
-            puts "DEBUG: Proxy running" if $DEBUG
-            #   puts "* set www_auth for interceptor"
-            #   puts YAML.dump(@project.settings[:www_auth])
-            @iproxy.www_auth = @project.settings[:www_auth]
-
-            @browserView = BrowserPreview.new(@iproxy)
-
+            
+          
            
             Watobo::Gui.clear_plugins
             Watobo::Gui::Utils.load_plugins(@project)
@@ -768,10 +780,19 @@ module Watobo
        update_conversation_table(@project)
 
             update_status_bar(@project)
+            
+            
+            Watobo::Interceptor.start
+
+            @browserView = BrowserPreview.new(Watobo::Interceptor.proxy)
+
+
         @progress_window.hide
         @chatTable.show
         @sites_tree.show
+        @sites_tree.reload
         @findings_tree.show
+        @findings_tree.reload
       end
 
       def decryptPassword(enc_pw=nil, dlg_titel="Encrypted Password")
@@ -952,20 +973,21 @@ module Watobo
       end
 
       def openScannerSettingsDialog(sender,sel,ptr)
-        if @project then
-          settings = @project.getScanPreferences()
+      #  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, 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)))
+         # @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
+      #  else
+      #  FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First!")
+      #  end
       end
 
       def openInterceptorSettingsDialog(sender,sel,ptr)
@@ -973,15 +995,18 @@ module Watobo
         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])
         end
       end
 
       def openScopeDialog(sender,sel,ptr)
+        unless Watobo.project.nil?
         dlg = Watobo::Gui::EditScopeDialog.new(self, @project, LAYOUT_FILL_X|LAYOUT_FILL_Y)
         if dlg.execute != 0 then
         @project.scope = YAML.load(YAML.dump(dlg.scope))
@@ -989,6 +1014,9 @@ module Watobo
         Watobo::Gui.save_settings()
         refreshViewers()
         end
+        else
+          FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First!")
+        end
       end
 
       def startFullScan(sender,sel,ptr)
@@ -1124,7 +1152,7 @@ module Watobo
         @project = nil
 
         @scanner = nil
-        @iproxy = nil
+      #  @iproxy = nil
         @browserView = nil
 
         @scan_running = false
@@ -1197,49 +1225,49 @@ module Watobo
         #  file_save_as_command = FXMenuCommand.new(file_menu_pane, "Save As..." )
 
         settings_menu_pane = FXMenuPane.new(self)
-         @menu_items << settings_menu_pane
+       #  @menu_items << settings_menu_pane
         FXMenuTitle.new(menu_bar, "Settings" , :popupMenu => settings_menu_pane)
-        menu_proxy = FXMenuCommand.new(settings_menu_pane, "Forwarding Proxy..." )
-        menu_session = FXMenuCommand.new(settings_menu_pane, "Session Management..." )
+        @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))
 
-        menu_preferences = FXMenuCommand.new(settings_menu_pane, "Target Scope..." )
-        menu_preferences.connect(SEL_COMMAND, method(:openScopeDialog))
+        @target_scope_menu = FXMenuCommand.new(settings_menu_pane, "Target Scope..." )
+        @target_scope_menu.connect(SEL_COMMAND, method(:openScopeDialog))
 
-        menu_preferences = FXMenuCommand.new(settings_menu_pane, "Scanner..." )
-        menu_preferences.connect(SEL_COMMAND, method(:openScannerSettingsDialog))
+        @scanner_menu = FXMenuCommand.new(settings_menu_pane, "Scanner..." )
+        @scanner_menu.connect(SEL_COMMAND, method(:openScannerSettingsDialog))
 
-        menu_preferences = FXMenuCommand.new(settings_menu_pane, "Interceptor..." )
-        menu_preferences.connect(SEL_COMMAND, method(:openInterceptorSettingsDialog))
+        @interceptor_menu = FXMenuCommand.new(settings_menu_pane, "Interceptor..." )
+        @interceptor_menu.connect(SEL_COMMAND, method(:openInterceptorSettingsDialog))
 
-        www_auth_prefs = FXMenuCommand.new(settings_menu_pane, "WWW-Auth..." )
-        www_auth_prefs.connect(SEL_COMMAND) { openWwwAuthDialog() }
+        @www_auth_menu = FXMenuCommand.new(settings_menu_pane, "WWW-Auth..." )
+        @www_auth_menu .connect(SEL_COMMAND) { openWwwAuthDialog() }
 
-        client_cert_prefs = FXMenuCommand.new(settings_menu_pane, "Client Certificates..." )
-        client_cert_prefs.connect(SEL_COMMAND) { open_client_cert_dialog() }
+        @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)
 
-        menu_proxy.connect(SEL_COMMAND, method(:onMenuProxy))
-        menu_session.connect(SEL_COMMAND, method(:openSessionManagement))
+        @proxy_menu.connect(SEL_COMMAND, method(:onMenuProxy))
+        @session_mgmt_menu.connect(SEL_COMMAND, method(:openSessionManagement))
 
         tools_menu_pane = FXMenuPane.new(self)
         FXMenuTitle.new(menu_bar, "Tools" , :popupMenu => tools_menu_pane)
-        transcoder = FXMenuCommand.new(tools_menu_pane, "Transcoder")
-        interceptor = FXMenuCommand.new(tools_menu_pane, "Interceptor")
-         @menu_items << interceptor
-        transcoder.connect(SEL_COMMAND, method(:onOpenTranscoder))
-        interceptor.connect(SEL_COMMAND, method(:onOpenInterceptor))
+        @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)
-         @menu_items << view_menu_pane
+        
         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" )
@@ -1250,7 +1278,7 @@ module Watobo
         view_findings_command.connect(SEL_COMMAND, method(:showConversation))
 
         window_menu_pane = FXMenuPane.new(self)
-          @menu_items << window_menu_pane
+        
         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) {
@@ -1339,17 +1367,23 @@ module Watobo
         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
-               update_conversation_table(@project)
-        # 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(@project)
+                ensure
+                  getApp().endWaitCursor()
+                end
+  # if @project
+  #   @project.settings.delete(:site_filter)
+  #       updateRequestTable(@project)
+  #end
+            end
+          }
+        
         subscribeFindingsTree()
         subscribeSitesTree()
         
@@ -1417,6 +1451,10 @@ module Watobo
                   target.connect(SEL_COMMAND) {
                     open_manual_request_editor(chat)
                   }
+                  target = FXMenuCommand.new(sendto_menu, "SQLmap..." )
+                  target.connect(SEL_COMMAND) {
+                    open_plugin_sqlmap(chat)
+                  }
 
                 end
                 FXMenuCascade.new(menu_pane, "Send to", nil, submenu)
@@ -1588,7 +1626,8 @@ module Watobo
         #===================================================================
         logFrame = FXVerticalFrame.new(@switcher, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
         FXLabel.new(logFrame, "Eventlist:", :opts => LAYOUT_FILL_X)
-        @log_viewer = LogViewer.new(logFrame, :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)
 
         # DASHBOARD#
         @dashboard = Dashboard.new(@switcher)
@@ -1606,7 +1645,8 @@ module Watobo
     #    if @foption_nocss.checked? then @doctype_TableFilter.concat(@fext_style);end
         
         add_queue_timer(50)
-        disable_menu
+        #disable_menu
+        update_menu
       end
 
       def create
@@ -1671,6 +1711,7 @@ module Watobo
       def subscribeSitesTree()
         @sites_tree.subscribe(:add_site_to_scope){ |site|
           @project.addToScope(site)
+          Watobo::Gui.save_settings()
         }
 
         @sites_tree.subscribe(:show_conversation){ |chat_list|
@@ -1687,6 +1728,7 @@ module Watobo
       def subscribeFindingsTree()
         @findings_tree.subscribe(:add_site_to_scope){ |site|
           @project.addToScope(site)
+          Watobo::Gui.save_settings()
         }
 
         @findings_tree.subscribe(:delete_domain_filter){ |df|
@@ -1766,10 +1808,9 @@ module Watobo
         end
       end
 
-      def onApplyFilterClick(sender,sel,item)
-        applyFilter()
-
-      end
+     # def onApplyFilterClick(sender,sel,item)
+    #    applyFilter()
+     # end
 
       def onClear(sender, sel, item)
         @table_filter.value =""
@@ -1802,31 +1843,36 @@ module Watobo
       end
 
       def onMenuProxy(sender,sel,item)
-        if @project
-          # puts @project.settings.to_yaml
-          # puts @settings[:password_policy].to_yaml
-          proxy_dialog = Watobo::Gui::ProxyDialog.new(self, @project.forward_proxy_settings, Watobo::Conf::Gui.dump )
+          proxy_dialog = Watobo::Gui::ProxyDialog.new(self)
           if proxy_dialog.execute != 0 then
           proxy_prefs = proxy_dialog.getProxyPrefs
           Watobo::Conf::ForwardingProxy.set proxy_prefs
-          @project.setProxyOptions(YAML.load(YAML.dump(proxy_prefs)))
+          #@project.setProxyOptions(YAML.load(YAML.dump(proxy_prefs)))
           puts "* current proxy:\n> #{@project.getCurrentProxy()}" if $DEBUG
           
-         # Watobo::Gui.save_default_settings(@project)
-          
-         # saveProjectSettings(@project)
-         Watobo::Gui.save_settings()
+        # Watobo::Gui.save_settings()
+         #Watobo::Conf::ForwardingProxy.save
          
+         Watobo.save_proxy_settings
           update_status_bar(@project)
-          #puts "* current proxy:\n> #{@project.getCurrentProxy().to_yaml}"
-          #puts @settings[:password_policy].to_yaml
           end
-        else
-        FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
-        end
+       
+        #FXMessageBox.information(self,MBOX_OK,"No Project Defined", "Create Project First")
+       
       end
-
-      def disable_menu
+      
+      def update_menu
+        [@client_cert_menu, @www_auth_menu, @target_scope_menu ].each do |m|
+        Watobo.project.nil? ? m.disable : m.enable
+        end 
+
+       # @scanner_menu
+       # @interceptor_menu 
+       # @transcoder_menu
+        
+      end
+      
+      def disable_menu_UNUSED
          @menu_items.each do |e|
            e.disable if e.respond_to? :disable
            if e.respond_to? :each_child
@@ -1837,7 +1883,7 @@ module Watobo
          end
       end
       
-      def enable_menu
+      def enable_menu_UNUSED
          @menu_items.each do |e|
            e.enable if e.respond_to? :enable
            if e.respond_to? :each_child

data/lib/watobo/gui/manual_request_editor.rb

@@ -553,10 +553,13 @@ module Watobo
 
             unless scan_chats.empty? then
                # we only need array of selected class names
-               scan_modules = dlg.selectedModules().map{ |m| m.class.to_s }
-               acc = @project.active_checks.select do |ac|
-                  scan_modules.include? ac.class.to_s
-               end
+              # scan_modules = dlg.selectedModules().map{ |m| m.class.to_s }
+               
+              # acc = @project.active_checks.select do |ac|
+              #    scan_modules.include? ac.class.to_s
+              # end
+               
+               acc = dlg.selectedModules
 
                scan_prefs = @project.getScanPreferences
                # we don't want logout detection during a QuickScan
@@ -593,6 +596,9 @@ module Watobo
                @scanner.subscribe(:new_finding) { |f|
                   @project.addFinding(f)
                }
+               
+               @scanner.subscribe(:module_started){ |m| logger("Module #{m} started")}
+               @scanner.subscribe(:module_finished){ |m| logger("Module #{m} finished")}
 
                csrf_requests = []
 
@@ -686,7 +692,7 @@ module Watobo
                @chat = chat
                
                if chat.respond_to? :request
-                 self.title = "Manual Request Toolkit - #{chat.request.url}"
+                 self.title = "#{chat.request.method} #{chat.request.url}"
                end
 
                @original_request = chat.copyRequest

data/lib/watobo/gui/mixins/subscriber.rb

@@ -0,0 +1,47 @@
+# .
+# subscriber.rb
+# 
+# Copyright 2012 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
+# .
+module Watobo
+  module Gui
+    module Subscriber
+      def subscribe(event, &callback)
+        @event_dispatcher_listeners ||= Hash.new
+        (@event_dispatcher_listeners[event] ||= []) << callback
+      end
+
+      def clearEvents(event)
+        @event_dispatcher_listeners ||= Hash.new
+        @event_dispatcher_listeners[event] ||= []
+        @event_dispatcher_listeners[event].clear
+      end
+
+      def notify(event, *args)
+        @event_dispatcher_listeners ||= Hash.new
+        if @event_dispatcher_listeners[event]
+          puts "NOTIFY: #{self}(:#{event}) [#{@event_dispatcher_listeners[event].length}]" if $DEBUG
+          @event_dispatcher_listeners[event].each do |m|
+            m.call(*args) if m.respond_to? :call
+          end
+        end
+      end
+    end
+  end
+end

data/lib/watobo/gui/project_wizzard.rb

@@ -56,7 +56,8 @@ module Watobo
         
         if File.exists?(workspace_dt) then
           Dir.foreach(workspace_dt) do |file|
-            if not file =~ /^\.{1,2}$/ and File.ftype(File.join(workspace_dt,file)) == 'directory' then
+            #puts file
+            if not file =~ /^\.{1,2}/ and File.ftype(File.join(workspace_dt,file)) == 'directory' then
               @projectList.appendItem(file)
             end
           end
@@ -67,9 +68,8 @@ module Watobo
       
       def updateSessionList(project_dir)
         @sessionList.clearItems
-        
         Dir.foreach(project_dir) do |file|
-          if not file =~ /^\.{1,2}$/ and File.ftype(File.join(project_dir,file)) == 'directory' then
+          if not file =~ /^\.{1,2}/ and File.ftype(File.join(project_dir,file)) == 'directory' then
             @sessionList.appendItem(file)
           end
         end