watobo 0.9.14 → 0.9.15

data/lib/watobo/gui/client_cert_dialog.rb

@@ -19,24 +19,252 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-# @private 
+# @private
 module Watobo#:nodoc: all
   module Gui
     class ClientCertDialog < FXDialogBox
+      class PEMFrame < FXVerticalFrame
+        def cert
+          client_cert = {}
+
+          begin
+            if File.exist?(@client_cert_dt.value)
+              client_cert[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(@client_cert_dt.value))
+            end
+
+            if File.exist?(@client_key_dt.value)
+              client_cert[:ssl_client_key] = OpenSSL::PKey::RSA.new(File.read(@client_key_dt.value), @password_dt.value)
+            end
+
+            return client_cert
+          rescue => bang
+            puts bang
+            puts bang.backtrace
+          end
+          return nil
+        end
+
+        def settings
+          s = {
+            :certificate_file => @client_cert_dt.value,
+            :password => @password_dt.value,
+            :key_file => @client_key_dt.value
+          }
+        end
+
+        def settings_valid?
+          unless @password_dt.value.empty?
+            puts "* password is set"
+            if @password_dt.value != @retype_dt.value
+              FXMessageBox.information(self, MBOX_OK, "Passwords", "Passwords don't match!")
+            return false
+            end
+          password = @password_dt.value
+          end
+
+          unless File.exist?(@client_cert_dt.value)
+            FXMessageBox.information(self, MBOX_OK, "File not found", "#{@client_cert_dt.value} does not exist!")
+          return false
+          end
+
+          unless File.exist?(@client_key_dt.value)
+            FXMessageBox.information(self, MBOX_OK, "File not found", "#{@client_key_dt.value} does not exist!")
+          return false
+
+          end
+          # last but not least check if private key can be accessed
+          begin
+            key = OpenSSL::PKey::RSA.new(File.open(@client_key_dt.value), password)
+          rescue => bang
+            FXMessageBox.information(self, MBOX_OK, "Wrong Password", "Could not open private key file. Wrong password?")
+          return false
+          end
+          true
+        end
+
+        def initialize(owner)
+          @client_cert_dt = FXDataTarget.new('')
+          @client_key_dt = FXDataTarget.new('')
+          @password_dt = FXDataTarget.new('')
+          @retype_dt = FXDataTarget.new('')
+
+          super owner, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED
+          matrix = FXMatrix.new(self, 3, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+          FXLabel.new(matrix, "Certificate File:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+          @client_cert_txt = FXTextField.new(matrix,  25,
+        :target => @client_cert_dt, :selector => FXDataTarget::ID_VALUE,
+        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
+
+          FXButton.new(matrix, "Select").connect(SEL_COMMAND){ select_cert_file }
+
+          FXLabel.new(matrix, "Key File:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+          @client_key_txt = FXTextField.new(matrix, 25,
+        :target => @client_key_dt, :selector => FXDataTarget::ID_VALUE,
+        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
+          FXButton.new(matrix, "Select").connect(SEL_COMMAND){ select_key_file }
+
+          #  matrix = FXMatrix.new(main_frame, 2, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+          FXLabel.new(matrix, "Password:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+          @password_txt = FXTextField.new(matrix, 25,
+        :target => @password_dt, :selector => FXDataTarget::ID_VALUE,
+        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+
+          FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
+
+          FXLabel.new(matrix, "Retype:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+          @retype_txt = FXTextField.new(matrix, 25,
+        :target => @retype_dt, :selector => FXDataTarget::ID_VALUE,
+        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+
+          FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
+
+        end
+
+        private
+
+        def select_cert_file()
+          cert_filename = FXFileDialog.getOpenFilename(self, "Select Certificate File", @cert_path, "*.pem\n*")
+          if cert_filename != "" then
+            if File.exists?(cert_filename) then
+              @client_cert_dt.value = cert_filename
+              @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+              @cert_path = File.dirname(cert_filename)
+            end
+          end
+        end
+
+        def select_key_file()
+
+          key_filename = FXFileDialog.getOpenFilename(self, "Select Key File", @cert_path, "*.key\n*")
+          if key_filename != "" then
+            if File.exists?(key_filename) then
+              @client_key_dt.value = key_filename
+              @client_key_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+              @cert_path = File.dirname(key_filename)
+            end
+          end
+        end
+
+      end
+
+      class PKCS12Frame < FXVerticalFrame
+        def cert
+          client_cert = {}
+          password = @password_dt.value
+
+          begin
+
+            if File.exist?(@client_cert_dt.value)
+              p12_data = nil
+              File.open(@client_cert_dt.value, "rb"){|fh|
+                p12_data = fh.read
+              }
+              p12 = OpenSSL::PKCS12.new( p12_data, password)
+              client_cert[:ssl_client_cert] = p12.certificate
+              client_cert[:ssl_client_key] = p12.key
+              client_cert[:extra_chain_certs] =  p12.ca_certs
+
+            end
+
+            return client_cert
+          rescue => bang
+            puts bang
+            puts bang.backtrace
+          end
+          return nil
+        end
+
+        def settings_valid?
+          unless @password_dt.value.empty?
+            puts "* password is set"
+            if @password_dt.value != @retype_dt.value
+              FXMessageBox.information(self, MBOX_OK, "Passwords", "Passwords don't match!")
+            return false
+            end
+          password = @password_dt.value
+          end
+
+          unless File.exist?(@client_cert_dt.value)
+            FXMessageBox.information(self, MBOX_OK, "File not found", "#{@client_cert_dt.value} does not exist!")
+          return false
+          end
+
+          true
+        end
+
+        def settings
+          s = {
+            :certificate_file => @client_cert_dt.value,
+            :password => @password_dt.value
+          }
+        end
+
+        def initialize(owner)
+          @client_cert_dt = FXDataTarget.new('')
+          @client_key_dt = FXDataTarget.new('')
+          @password_dt = FXDataTarget.new('')
+          @retype_dt = FXDataTarget.new('')
+
+          super owner, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED
+          matrix = FXMatrix.new(self, 3, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+          FXLabel.new(matrix, "PKCS12 File:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+          @client_cert_txt = FXTextField.new(matrix,  25,
+        :target => @client_cert_dt, :selector => FXDataTarget::ID_VALUE,
+        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
+
+          FXButton.new(matrix, "Select").connect(SEL_COMMAND){ select_cert_file }
+
+          FXLabel.new(matrix, "Password:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+          @password_txt = FXTextField.new(matrix, 25,
+        :target => @password_dt, :selector => FXDataTarget::ID_VALUE,
+        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+
+          FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
+
+          FXLabel.new(matrix, "Retype:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
+          @retype_txt = FXTextField.new(matrix, 25,
+        :target => @retype_dt, :selector => FXDataTarget::ID_VALUE,
+        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+
+          FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
+
+        end
+
+        private
+
+        def select_cert_file()
+          cert_filename = FXFileDialog.getOpenFilename(self, "Select Certificate File", @cert_path, "*.p12,*.pfx\n*")
+          if cert_filename != "" then
+            if File.exists?(cert_filename) then
+              @client_cert_dt.value = cert_filename
+              @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+              @cert_path = File.dirname(cert_filename)
+            end
+          end
+        end
+
+      end
+
+      class StoreFrame < FXVerticalFrame
+
+      end
 
       NO_SELECTION = "no site selected"
 
       attr :client_certificates
+
       def savePasswords?()
         return false
-        #@save_pws_cbt.checked?
+      #@save_pws_cbt.checked?
       end
 
       include Responder
 
       def initialize(owner, prefs={})
 
-        super(owner, "Client Certificates", :opts => DECOR_ALL)     
+        super(owner, "Client Certificates", :opts => DECOR_ALL)
         FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
 
         @password_policy = {
@@ -45,17 +273,13 @@ module Watobo#:nodoc: all
 
         @cert_path = nil
         @client_certificates = {}
-        
+
         current_certs = Watobo.project.getClientCertificates
         @client_certificates = current_certs unless current_certs.nil?
-      
+
         @password_policy.update prefs[:password_policy] if prefs.has_key? :password_policy
 
         @site_dt = FXDataTarget.new('')
-        @client_cert_dt = FXDataTarget.new('')
-        @client_key_dt = FXDataTarget.new('')
-        @password_dt = FXDataTarget.new('')
-        @retype_dt = FXDataTarget.new('')
 
         main_frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
 
@@ -75,40 +299,18 @@ module Watobo#:nodoc: all
         updateSitesCombo()
 
         @sites_combo.connect(SEL_COMMAND, method(:update_fields))
-        matrix = FXMatrix.new(main_frame, 3, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-
-        FXLabel.new(matrix, "Certificate File:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
-        @client_cert_txt = FXTextField.new(matrix,  25,
-        :target => @client_cert_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
-
-        FXButton.new(matrix, "Select").connect(SEL_COMMAND){ select_cert_file }
-
-        FXLabel.new(matrix, "Key File:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
-        @client_key_txt = FXTextField.new(matrix, 25,
-        :target => @client_key_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
-        FXButton.new(matrix, "Select").connect(SEL_COMMAND){ select_key_file }
 
-      #  matrix = FXMatrix.new(main_frame, 2, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-        FXLabel.new(matrix, "Password:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
-        @password_txt = FXTextField.new(matrix, 25,
-        :target => @password_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
-        
-         FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
-
-        FXLabel.new(matrix, "Retype:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
-        @retype_txt = FXTextField.new(matrix, 25,
-        :target => @retype_dt, :selector => FXDataTarget::ID_VALUE,
-        :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
-        
-        FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
+        # @save_pws_cbt = FXCheckButton.new(matrix, "save passwords")
+        #  @save_pws_cbt.checkState = false
+        #  @save_pws_cbt.checkState = true if @password_policy[:save_passwords] == true
+        #  note_label = FXLabel.new(matrix, "This setting affects all passwords!!!")
+        @cert_settings = []
+        @tabBook = FXTabBook.new(main_frame, nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+        res_tab = FXTabItem.new(@tabBook, "PEM", nil)
+        @cert_settings << PEMFrame.new(@tabBook)
 
-      # @save_pws_cbt = FXCheckButton.new(matrix, "save passwords")
-      #  @save_pws_cbt.checkState = false
-      #  @save_pws_cbt.checkState = true if @password_policy[:save_passwords] == true
-      #  note_label = FXLabel.new(matrix, "This setting affects all passwords!!!")
+        res_tab = FXTabItem.new(@tabBook, "PKCS12", nil)
+        @cert_settings << PKCS12Frame.new(@tabBook)
 
         buttons = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH,
         :padLeft => 40, :padRight => 40, :padTop => 20, :padBottom => 20)
@@ -128,7 +330,7 @@ module Watobo#:nodoc: all
         @sites_combo.appendItem(NO_SELECTION, nil)
         @site_dt.value = NO_SELECTION
         Watobo::Chats.sites(:in_scope => @scope_only_cb.checked? ){ |site|
-          #puts "Site: #{site}"
+        #puts "Site: #{site}"
           @sites_combo.appendItem(site, site)
         }
         @sites_combo.numVisible = @sites_combo.numItems >= 20 ? 20 : @sites_combo.numItems
@@ -148,18 +350,6 @@ module Watobo#:nodoc: all
         end
       end
 
-      def select_key_file()
-
-        key_filename = FXFileDialog.getOpenFilename(self, "Select Key File", @cert_path)
-        if key_filename != "" then
-          if File.exists?(key_filename) then
-            @client_key_dt.value = key_filename
-            @client_key_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-            @cert_path = File.dirname(key_filename)
-          end
-        end
-      end
-
       def updateFields()
         # @sites_combo.handle(self, FXSEL(SEL_UPDATE, 1), nil)
         @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
@@ -169,16 +359,16 @@ module Watobo#:nodoc: all
       def update_fields(sender, sel, item)
         @site_dt.value = item
         if @client_certificates.has_key? item
-          puts "* certs found"
-          c = @client_certificates[item]
-          @client_cert_dt.value = c[:certificate_file]
-          @client_key_dt.value = c[:key_file]
-          @password_dt.value = c[:password]
-          @retype_dt.value = c[:password]
-          @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-          @client_key_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-          @password_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-          @retype_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+          #puts "* certs found"
+          #c = @client_certificates[item]
+         # @client_cert_dt.value = c[:certificate_file]
+         # @client_key_dt.value = c[:key_file]
+         # @password_dt.value = c[:password]
+         # @retype_dt.value = c[:password]
+         # @client_cert_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+         # @client_key_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+         # @password_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+         # @retype_txt.handle(self, FXSEL(SEL_UPDATE, 0), nil)
         end
       end
 
@@ -187,47 +377,21 @@ module Watobo#:nodoc: all
         password = nil
         if @site_dt.value.empty? or @site_dt.value == NO_SELECTION
           FXMessageBox.information(self, MBOX_OK, "No Site Selected", "You must select a site from the drop down list.")
-          return 0
-        end
-
-        unless @password_dt.value.empty?
-          puts "* password is set"
-          if @password_dt.value != @retype_dt.value
-            FXMessageBox.information(self, MBOX_OK, "Passwords", "Passwords don't match!")
-            return 0
-          end
-          password = @password_dt.value
+        return 0
         end
 
-        unless File.exist?(@client_cert_dt.value)
-          FXMessageBox.information(self, MBOX_OK, "File not found", "#{@client_cert_dt.value} does not exist!")
-          return 0
-
+        index = @tabBook.current
+        unless @cert_settings[index].settings_valid?
+          puts "Wrong settings"
+        return 0
         end
-        unless File.exist?(@client_key_dt.value)
-          FXMessageBox.information(self, MBOX_OK, "File not found", "#{@client_key_dt.value} does not exist!")
-          return 0
 
-        end
-        # last but not least check if private key can be accessed
-        begin
-          key = OpenSSL::PKey::RSA.new(File.open(@client_key_dt.value), password)
-        rescue => bang
-          FXMessageBox.information(self, MBOX_OK, "Wrong Password", "Could not open private key file. Wrong password?")
-          return 0
-        end
-        #  puts @auth_table.settings.to_yaml
-        @client_certificates[@site_dt.value] = {
-          :certificate_file => @client_cert_dt.value,
-          :key_file => @client_key_dt.value,
-          :password => password.nil? ? "" : password
-        }
+        Watobo::ClientCertStore.set(@site_dt.value, @cert_settings[index].cert)
 
         getApp().stopModal(self, 1)
         self.hide()
         return 1
       end
     end
-
   end
 end

data/lib/watobo/gui/conversation_table.rb

@@ -518,7 +518,8 @@ module Watobo#:nodoc: all
                 FXMenuSeparator.new(menu_pane)
                 [ "G - Goto",
                   "<ctrl-n> - Goto Next",
-                  "<ctrl-N> - Goto Prev"
+                  "<ctrl-N> - Goto Prev",
+                  "<space>  - Edit Comment"
                 ].each do |hk|
                   FXMenuCaption.new(menu_pane, hk).backColor = 'yellow'
                 end
@@ -544,6 +545,8 @@ module Watobo#:nodoc: all
               show_next
             when KEY_N
               show_prev
+            when KEY_f
+              notify(:open_filter_dlg)
             end
             cont = false
           end
@@ -571,6 +574,7 @@ module Watobo#:nodoc: all
         if i >= 0
         selectRow(i, false) 
          setCurrentItem(i, 2)
+         makePositionVisible(i,2)
          end
       end
       
@@ -579,6 +583,7 @@ module Watobo#:nodoc: all
         if i >= 0
         selectRow(i, false) 
          setCurrentItem(i, 2)
+         makePositionVisible(i,2)
          end
       end
       
@@ -601,6 +606,7 @@ module Watobo#:nodoc: all
         selectRow(sel, false)
        
        setCurrentItem(sel, 2)
+       makePositionVisible(i,2)
         
         end
         false

data/lib/watobo/gui/conversation_table_ctrl2.rb

@@ -172,6 +172,15 @@ module Watobo#:nodoc: all
       
         
         @text_filter = FXTextField.new(pattern_frame, 40, nil, 0, FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X)
+        @text_filter.setFocus()
+        @text_filter.setDefault()
+       
+        @text_filter.connect(SEL_COMMAND){
+           @accept_btn.setFocus()
+           @accept_btn.setDefault()
+        #  self.handle(self, FXSEL(SEL_COMMAND, ID_ACCEPT), nil)
+          true
+        }
         
         [ :url_pattern, :request_pattern, :response_pattern ].each do |k|
           if filter.has_key? k
@@ -179,23 +188,23 @@ module Watobo#:nodoc: all
           end
         end
         # filterOptionsFrame =FXHorizontalFrame.new(fbox, LAYOUT_FILL_X)
-        @foption_url = FXCheckButton.new(pattern_frame, "URL", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
+        @foption_url = FXCheckButton.new(pattern_frame, "&URL", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
         state = ( filter.has_key?(:url_pattern) and not filter[:url_pattern].empty? )
         @foption_url.setCheck(state)
        # @foption_url.connect(SEL_COMMAND){ update_text_filter }
-        @foption_req = FXCheckButton.new(pattern_frame, "Request", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
+        @foption_req = FXCheckButton.new(pattern_frame, "Re&quest", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
         state = ( filter.has_key?(:request_pattern) and not filter[:request_pattern].empty? )
         @foption_req.setCheck state
        # @foption_req .connect(SEL_COMMAND){ update_text_filter }
-        @foption_res = FXCheckButton.new(pattern_frame, "Response", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
+        @foption_res = FXCheckButton.new(pattern_frame, "Res&ponse", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
         state = ( filter.has_key?(:response_pattern) and not filter[:response_pattern].empty? )
         @foption_res.setCheck state
        # @foption_res.connect(SEL_COMMAND){ update_text_filter }
          
        buttons = FXHorizontalFrame.new(main, :opts => LAYOUT_FILL_X)
-          accept = FXButton.new(buttons, "&Apply", nil, self, ID_ACCEPT,
+          @accept_btn = FXButton.new(buttons, "&Apply", nil, self, ID_ACCEPT,
         FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)
-        accept.enable
+        @accept_btn.enable
         # Cancel
         FXButton.new(buttons, "&Cancel", nil, self, ID_CANCEL,
         FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT|LAYOUT_CENTER_Y)

data/lib/watobo/gui/edit_comment.rb

@@ -29,7 +29,7 @@ module Watobo#:nodoc: all
 
       def initialize(owner, chat)
         #super(owner, "Edit Target Scope", DECOR_TITLE|DECOR_BORDER, :width => 300, :height => 425)
-        super(owner, "Edit Comment", DECOR_ALL, :width => 300, :height => 150)
+        super(owner, "Edit Comment - Chat #{chat.id}", DECOR_ALL, :width => 300, :height => 150)
 
         base_frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
 

data/lib/watobo/gui/main_window.rb

@@ -450,9 +450,9 @@ module Watobo#:nodoc: all
           #puts @project.getWwwAuthentication().to_yaml
           #@settings[:password_policy][:save_passwords] = ccdlg.savePasswords?
           puts "* got client certificate settings"
-          puts ccdlg.client_certificates.to_yaml
-          Watobo.project.client_certificates = ccdlg.client_certificates
-          Watobo::Interceptor.proxy.client_certificates = ccdlg.client_certificates
+          #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)
@@ -504,6 +504,17 @@ module Watobo#:nodoc: all
         puts bang
         end
       end
+      
+       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
+        end
+      end
 
       def addChat(chat)
         # addChatToTable(chat) if chatIsFiltered?(chat) == false
@@ -1146,6 +1157,7 @@ module Watobo#:nodoc: all
         super(app, "WATOBO by siberas (Version: #{Watobo.version})", :opts => DECOR_ALL, :width => 1000, :height => 600)
         #FXToolTip.new(app)
         #app.disableThreads
+        @app = app
 
         self.icon = ICON_WATOBO
         self.show(PLACEMENT_MAXIMIZED)
@@ -1481,6 +1493,23 @@ request_splitter.connect(SEL_COMMAND){
                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)           
+              end
+            end
+                   
+          end
+         
+         }
 
         @chatTable.connect(SEL_RIGHTBUTTONRELEASE) do |sender, sel, event|
           @findings_tree.killSelection()
@@ -1515,6 +1544,10 @@ request_splitter.connect(SEL_COMMAND){
                   target.connect(SEL_COMMAND) {
                     open_plugin_sqlmap(chat)
                   }
+                  target = FXMenuCommand.new(sendto_menu, "Crawler..." )
+                  target.connect(SEL_COMMAND) {
+                    open_plugin_crawler(chat)
+                  }
 
                 end
                 FXMenuCascade.new(menu_pane, "Send to", nil, submenu)
@@ -1849,9 +1882,11 @@ request_splitter.connect(SEL_COMMAND){
         #  puts "! #{Thread.list.length} Threads running"
         response = FXMessageBox.question(self, MBOX_YES_NO, "Finished?", "Are you sure?")
         if response == MBOX_CLICKED_YES
-        return 0
+          @app.handleTimeouts
+          # puts "Num. Threads: #{Thread.list.length}"
+          getApp().exit(0)
         else
-        return 1
+         1
         end
       end
 

data/lib/watobo/gui/manual_request_editor.rb

@@ -145,7 +145,6 @@ module Watobo#:nodoc: all
             end
 
             if dlg.execute != 0 then
-              puts "* Dialog Finished"
                scan_modules = []
                sender.text = "Cancel"
                quick_scan_options = dlg.options
@@ -210,8 +209,13 @@ module Watobo#:nodoc: all
                csrf_requests = []
 
                if quick_scan_options[:update_csrf_tokens] == true
+                 unless csrf_requests.empty?
                   csrf_requests = Watobo::OTTCache.requests(req)
-                  puts "* Got No CSRF Requests!!" if csrf_requests.empty?
+                 else
+                  puts "* No CSRF requests defined for request:"
+                  puts request
+                  puts "---"
+                 end 
                end
 
                run_prefs = {
@@ -482,6 +486,7 @@ module Watobo#:nodoc: all
 
                req_tab = FXTabItem.new(@tabBook, "Request", nil)
                @request_viewer = Watobo::Gui::RequestViewer.new(@tabBook, FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+              
 
                diff_tab = FXTabItem.new(@tabBook, "Differ", nil)
 
@@ -493,7 +498,7 @@ module Watobo#:nodoc: all
 
                @btn_send.connect(SEL_COMMAND, method(:onBtnSendClick))
 
-               add_update_timer(50)
+               add_update_timer(250)
 
             rescue => bang
                puts bang
@@ -510,11 +515,7 @@ module Watobo#:nodoc: all
       @scan_status_lock.synchronize do
 
       if @pbar.total > 0
-        sum_progress = 0
-        @scanner.progress.each_value do |v|
-          sum_progress += v[:progress]
-        end
-        @pbar.progress = sum_progress
+        @pbar.progress = @scanner.sum_progress
       end
       
       if @scanner.finished?
@@ -578,6 +579,7 @@ module Watobo#:nodoc: all
             prefs = Watobo::Conf::Scanner.to_h
           #  puts "= SCANNER PREFS ="
           #  puts prefs[:csrf_patterns]
+          puts prefs.to_yaml
             
 
             current_prefs = {:run_login => @updateSession.checked? ? @runLogin.checked? : false,