watobo 0.9.8.724 → 0.9.9.pre1

data/lib/watobo/gui/log_viewer.rb

@@ -22,75 +22,83 @@
 module Watobo
   module Gui
     class LogViewer < FXVerticalFrame
-     
+
       include Watobo::Constants
-      
       def purge
         @lock.synchronize do
-           @log_viewer.text = ''
+          @log_viewer.text = ''
         end
       end
 
       def log(sender=nil, log_level, msg )
         puts "#{sender.class} => #{msg}" if $DEBUG
         begin
-        t = Time.now
-        now = t.strftime("%m/%d/%Y @ %H:%M:%S")
+          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
+          begin
+            log_text = case log_level
+            when LOG_INFO
+              "#{now}: #{msg}\n"
+            else
             ""
+            end
+          rescue => bang
+            puts bang
+            puts bang.backtrace if $DEBUG
+          end
+          @lock.synchronize do
+            log_text << @log_message unless @log_message.nil?
+            @log_message = log_text
           end
         rescue => bang
-        puts bang
-        puts bang.backtrace if $DEBUG
+          puts bang
+          puts bang.backtrace
         end
-       @lock.synchronize do
-         log_text << @log_message unless @log_message.nil?          
-          @log_message = log_text
-       end
-         rescue => bang
-           puts bang
-           puts bang.backtrace
-         end
-        
+
       end
 
       def start_update_timer
-         @timer = FXApp.instance.addTimeout( 50, :repeat => true) {
+        @timer = FXApp.instance.addTimeout( 50, :repeat => true) {
            @lock.synchronize do
              unless @log_message.nil?
-             @log_viewer.insertText(0,@log_message) unless @log_message.empty? 
+               unless @log_message.empty?
+                 case @mode
+                 when :insert
+             @log_viewer.insertText(0,@log_message)
+             when :append
+               @log_viewer.appendText(@log_message)
+             end
+             end
              @log_message = nil
              end
             end
           }
       end
-      
+
       def destroy
         getApp().removeTimeout(@timer) unless @timer.nil?
         super
         1
       end
-      
-      def initialize(parent, opts)
+
+      def initialize(parent, mode = :insert, opts)
         opts[:padding] = 0
         super(parent, opts)
 
+        @mode = mode
+
         @log_message = nil
         @lock = Mutex.new
         @timer = nil
-        
+
         #self.connect(SEL_CLOSE, method(:onClose))
 
         @log_viewer = FXText.new(self,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
         @log_viewer.editable = false
         start_update_timer
       end
-      
+
     end
 
   end

data/lib/watobo/gui/main_window.rb

@@ -165,89 +165,108 @@ module Watobo
         Watobo::Utils.save_settings(@default_settings_file, settings )
 =end
       end
+      
+       
 
-      def saveSessionSettings(project=nil)
-        return
-        puts "- saveSessionSettings -"
-        ss = YAML.load(YAML.dump(project.settings))
-        unless project.nil?
-          puts "* saving session settings to #{project.sessionSettingsFile}"
-          settings = Hash.new
-          [:logout_signatures, :non_unique_parms, :login_chat_ids, :excluded_chats, :project_name, :session_name, :csrf_request_ids ].each do |k|
-            settings[k] = Hash.new
-            settings[k] = ss[k] if ss.has_key?(k)
-          end
-
-        Watobo::Utils.save_settings(project.sessionSettingsFile, settings)
+      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
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
         end
+        return false
+#        puts "- saveSessionSettings -"
+#        ss = YAML.load(YAML.dump(project.settings))
+#        unless project.nil?
+#          puts "* saving session settings to #{project.sessionSettingsFile}"
+#          settings = Hash.new
+#          [:logout_signatures, :non_unique_parms, :login_chat_ids, :excluded_chats, :project_name, :session_name, :csrf_request_ids ].each do |k|
+#            settings[k] = Hash.new
+#            settings[k] = ss[k] if ss.has_key?(k)
+#          end#
+#
+#        Watobo::Utils.save_settings(project.sessionSettingsFile, settings)
+#        end
       end
 
-      def saveProjectSettings(project=nil)
-        return
-        unless project.nil?
-          ps = YAML.load(YAML.dump(project.scan_settings))
-          settings = { :scanner => Hash.new }
-          [:policy, :scope, :www_auth ].each do |k|
-            settings[:scanner][k] = Hash.new
-            settings[:scanner][k].update ps[k] if ps.has_key?(k)
-          end
-
-          settings[:scanner][:custom_error_patterns] = ps[:custom_error_patterns]
-          settings[:scanner][:csrf_patterns] = ps[:csrf_patterns] unless ps[:csrf_patterns].nil?
+      def saveProjectSettings_UNUSED(project=nil)
+        begin
+       # 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 }
+#          [:policy, :scope, :www_auth ].each do |k|
+#            settings[:scanner][k] = Hash.new
+#            settings[:scanner][k].update ps[k] if ps.has_key?(k)
+#          end
+#
+#          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
-          settings[:forwarding_proxy] = project.forward_proxy_settings
+#          settings[:forwarding_proxy] = project.forward_proxy_settings
 
-          settings[:project_name] = project.project_name
+#          settings[:project_name] = project.project_name
           #   puts "==== WWW AUTH ==="
           #   puts YAML.dump( settings[:www_auth] )
 
           #     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
-            password_set = true unless settings[:www_auth][p][:password] == ''
-            end
-          end
-          if @settings[:password_policy][:save_passwords] == true
-            unless settings[:www_auth].empty?
-              if @settings[:password_policy][:save_without_master] == false
-                if password_set and @settings[:master_password].empty?
-                  puts "* need master password for server auth encryption"
-                  dlg = MasterPWDialog.new(self)
-                  if dlg.execute != 0
-                  @settings[:master_password] = dlg.masterPassword
-                  end
-                end
-                unless @settings[:master_password].empty?
-                  settings[:www_auth].each_key do |p|
-                    creds = settings[:www_auth][p]
-                    #pass = "$$WPE$$" + creds[:password]
-                    pass = creds[:password]
-                    if pass != ''
-                    creds[:password] = Crypto.encryptPassword(pass, @settings[:master_password])
-                    creds[:encrypted] = true
-                    end
-                  end
-                else
-                cleanCredentials(settings)
-                FXMessageBox.information(self,MBOX_OK,"No MasterPassword", "Could not encrypt www_auth passwords. No Passwords have been saved!")
-                end
-
-              else
-              puts "* saving passwords without protection!!!!"
-              end
-            end
-          else
-          cleanCredentials(settings)
-          end
+#          password_set = false
+#          settings[:www_auth].each_key do |p|
+#            if settings[:www_auth][p].has_key? :password
+#            password_set = true unless settings[:www_auth][p][:password] == ''
+#            end
+#          end
+#          if @settings[:password_policy][:save_passwords] == true
+#            unless settings[:www_auth].empty?
+#              if @settings[:password_policy][:save_without_master] == false
+#                if password_set and @settings[:master_password].empty?
+#                  puts "* need master password for server auth encryption"
+#                  dlg = MasterPWDialog.new(self)
+#                  if dlg.execute != 0
+#                  @settings[:master_password] = dlg.masterPassword
+#                  end
+#                end
+#                unless @settings[:master_password].empty?
+#                  settings[:www_auth].each_key do |p|
+#                    creds = settings[:www_auth][p]
+#                    #pass = "$$WPE$$" + creds[:password]
+#                    pass = creds[:password]
+#                    if pass != ''
+#                    creds[:password] = Crypto.encryptPassword(pass, @settings[:master_password])
+#                    creds[:encrypted] = true
+#                    end
+#                  end
+#                else
+#                cleanCredentials(settings)
+#                FXMessageBox.information(self,MBOX_OK,"No MasterPassword", "Could not encrypt www_auth passwords. No Passwords have been saved!")
+#                end#
+
+#              else
+#              puts "* saving passwords without protection!!!!"
+#              end
+#            end
+#          else
+#          cleanCredentials(settings)
+#          end
 
         #   puts "* saving www_auth settings ..."
         #   puts YAML.dump( settings[:www_auth])
-        Watobo::Utils.save_settings(project.projectSettingsFile, settings)
-        end
+#        Watobo::Utils.save_settings(project.projectSettingsFile, settings)
+#        end
       end
 
       def update_conversation_table(project)
@@ -336,8 +355,9 @@ module Watobo
           @project.setLogoutSignatures(logout_signatures)
           end
         # save settings
-        saveProjectSettings(@project)
-        saveSessionSettings(@project)
+        #saveProjectSettings(@project)
+        #saveSessionSettings(@project)
+        Watobo::Gui.save_settings()
         end
       end
 
@@ -379,8 +399,9 @@ module Watobo
           #puts "* New WWW-Authentication"
           #puts @project.getWwwAuthentication().to_yaml
           Watobo::Conf::General.save_passwords = w3adlg.savePasswords?
-          saveProjectSettings(@project)
-          Watobo::Gui.save_default_settings(@project)
+         # saveProjectSettings(@project)
+         # Watobo::Gui.save_default_settings(@project)
+         Watobo::Gui.save_settings()
           @iproxy.www_auth = @project.getWwwAuthentication()
           end
         puts "* new www_auth settings"
@@ -419,11 +440,12 @@ module Watobo
           dlg = Watobo::Gui::PasswordPolicyDialog.new(self, @settings[:password_policy] )
           if dlg.execute != 0
           @settings[:password_policy] = dlg.passwordPolicy
-          Watobo::Gui.save_default_settings(@project)
+         #Watobo::Gui.save_default_settings(@project)
           #puts "* New WWW-Authentication"
           #puts @project.getWwwAuthentication().to_yaml
           #@settings[:password_policy][:save_passwords] = w3adlg.savePasswords?
-          saveProjectSettings(@project)
+          #saveProjectSettings(@project)
+          Watobo::Gui.save_settings()
           #@iproxy.www_auth = @project.settings[:www_auth]
           end
         end
@@ -660,8 +682,9 @@ module Watobo
         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
-        puts @project.class
+        #Watobo::Gui.save_default_settings project
+        Watobo::Gui.save_settings()
+        #puts @project.class
         end
 
       end
@@ -867,7 +890,7 @@ module Watobo
         session_settings = {}
 
 #        if File.exists?(session_file) then
-#        session_settings = Watobo::Utils.loadSettings(session_file)
+#        session_settings = Watobo::Utils.load_settings(session_file)
         #updateistory(session_file)
 
 #        else
@@ -888,7 +911,7 @@ module Watobo
 =begin
       project_file = File.expand_path(File.join(File.dirname(session_file), "..", session_settings[:project_name] + ".wps"))
       if File.exists?(project_file) then
-      project_settings = Watobo::Utils.loadSettings(project_file)
+      project_settings = Watobo::Utils.load_settings(project_file)
       if not project_settings.is_a? Hash then
       project_settings = Hash.new
       end
@@ -1303,15 +1326,17 @@ 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
+        @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
-        #   }
+             end
+           }
         subscribeFindingsTree()
         subscribeSitesTree()
         
@@ -1440,10 +1465,11 @@ module Watobo
                 addToLogin = FXMenuCommand.new(menu_pane, "Add to Login-Script" )
                 addToLogin.connect(SEL_COMMAND) {
                   @project.add_login_chat_id(chatid)
-                  saveSessionSettings(@project)
+                  puts "Add to Login-Script ... saveSessionSettings (#{@project.class})"
+                  Watobo::Gui.save_settings()
                 }
 
-                target = FXMenuCheck.new(menu_pane, "Mark as tested" )
+                target = FXMenuCheck.new(menu_pane, "Tested" )
                 target.check = chat.tested?
                 target.connect(SEL_COMMAND) {
                   chat.tested = target.checked?()
@@ -1634,7 +1660,8 @@ module Watobo
 
         @sites_tree.subscribe(:show_conversation){ |chat_list|
           showConversation()
-          @chatTable.showConversation(chat_list)
+          puts "SHOW_CONVERSATION: #{chat_list.length} chats"
+          @chatTable.showConversation(chat_list, :ignore_filter)
         }
 
         @sites_tree.subscribe(:show_chat){ |chat|
@@ -1684,12 +1711,12 @@ module Watobo
         end
       end
 
-      def loadProjectSettings(filename=nil)
+      def loadProjectSettings_UNUSED(filename=nil)
         settings = nil
         if filename then
           begin
             settings = Hash.new
-            settings = Watobo::Utils.loadSettings(filename)
+            settings = Watobo::Utils.load_settings(filename)
             #            puts settings.to_yaml
           rescue => bang
           puts "!!!ERROR: could not update project settings"
@@ -1700,12 +1727,12 @@ module Watobo
         return settings
       end
 
-      def loadSessionSettings(filename=nil)
+      def loadSessionSettings_UNUSED(filename=nil)
         settings = {}
         return settings if filename.nil?
         if File.exist?(filename) then
           begin
-            settings = Watobo::Utils.loadSettings(filename)
+            settings = Watobo::Utils.load_settings(filename)
           rescue => bang
           puts "!!!ERROR: could not load session settings"
           puts bang
@@ -1770,9 +1797,10 @@ module Watobo
           @project.setProxyOptions(YAML.load(YAML.dump(proxy_prefs)))
           puts "* current proxy:\n> #{@project.getCurrentProxy()}" if $DEBUG
           
-          Watobo::Gui.save_default_settings(@project)
+         # Watobo::Gui.save_default_settings(@project)
           
-          saveProjectSettings(@project)
+         # saveProjectSettings(@project)
+         Watobo::Gui.save_settings()
          
           update_status_bar(@project)
           #puts "* current proxy:\n> #{@project.getCurrentProxy().to_yaml}"

data/lib/watobo/gui/manual_request_editor.rb

@@ -400,10 +400,10 @@ module Watobo
                   second_request = Watobo::Utils.copyObject(@second_selection.request)
                   second_response = Watobo::Utils.copyObject(@second_selection.response)
 
-                  orig = Watobo::Chat.new(first_request, first_response, :id => 0)
-                  new = Watobo::Chat.new(second_request, second_response, :id => 0)
+                  chat_one = Watobo::Chat.new(first_request, first_response, :id => 0)
+                  chat_two = Watobo::Chat.new(second_request, second_response, :id => 0)
                   project = nil
-                  diffViewer = ChatDiffViewer.new(FXApp.instance, orig, new)
+                  diffViewer = ChatDiffViewer.new(FXApp.instance, chat_one, chat_two)
                   diffViewer.create
                   diffViewer.show(Fox::PLACEMENT_SCREEN)
                end
@@ -684,6 +684,10 @@ module Watobo
                @responseFilter = FXDataTarget.new("")
 
                @chat = chat
+               
+               if chat.respond_to? :request
+                 self.title = "Manual Request Toolkit - #{chat.request.url}"
+               end
 
                @original_request = chat.copyRequest