watobo 0.9.21 → 0.9.23

data/lib/watobo/gui/utils/save_default_settings.rb

@@ -1,129 +1,120 @@
-#.
-# save_default_settings.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
-    def self.save_settings()
+module Watobo#:nodoc: all
+
+  module Gui
+    def self.save_settings()
       begin
-        puts "SAVE SETTINGS"
-
-        mp = ''
-        save_pws = false
-
-        #   puts "= Master Password Settings ="
-        #   puts Watobo::Gui::MasterPW.settings.to_yaml
-
-        if Watobo::Gui::MasterPW.save_passwords?
-          save_pws = true
-          unless Watobo::Gui::MasterPW.set?
-            save_pws = false unless Watobo::Gui::MasterPW.save_without_master?
-          end
-        end
-
-        Watobo.save_proxy_settings( :save_passwords => save_pws, :key => mp )
-
+        puts "SAVE SETTINGS"
+
+        mp = ''
+        save_pws = false
+
+        #   puts "= Master Password Settings ="
+        #   puts Watobo::Gui::MasterPW.settings.to_yaml
+
+        if Watobo::Gui::MasterPW.save_passwords?
+          save_pws = true
+          unless Watobo::Gui::MasterPW.set?
+            save_pws = false unless Watobo::Gui::MasterPW.save_without_master?
+          end
+        end
+
+        Watobo.save_proxy_settings( :save_passwords => save_pws, :key => mp )
+
         Watobo::Gui.save_scanner_settings
-        
+        
         unless Watobo.project.nil?
          # puts "- save project settings"
-         # puts Watobo::Conf::General.dump.to_yaml
-          Watobo::Conf::General.save_project
-          Watobo::Conf::Interceptor.save_project
-          Watobo::Conf::SidCache.save_project
-        end
+         # puts Watobo::Conf::General.dump.to_yaml
+          Watobo::Conf::General.save_project
+          Watobo::Conf::Interceptor.save_project
+          Watobo::Conf::SidCache.save_project
+        end
         # also save global settings here
        # puts "- save global settings"
-       #   puts Watobo::Conf::General.dump.to_yaml
-        Watobo::Conf::General.save
-        Watobo::Conf::Interceptor.save
-
-        return true
-      rescue => bang
-        puts bang
-        puts bang.backtrace if $DEBUG
-      end
-      return false
-    end
-
-    def self.save_default_settings_UNUSED(project)
-      mp = ''
-      save_pws = false
-
-      #  puts "= Master Password Settings ="
-      #  puts Watobo::Gui::MasterPW.settings.to_yaml
-
-      if Watobo::Gui::MasterPW.save_passwords?
-        save_pws = true
-        unless Watobo::Gui::MasterPW.set?
-          save_pws = false unless Watobo::Gui::MasterPW.save_without_master?
-        end
-      end
-
-      Watobo.save_proxy_settings( :save_passwords => save_pws, :key => mp )
-
-      Watobo::Conf::General.save
-      Watobo::Conf::Interceptor.save
-
-      return true
-=begin
-    proxy_has_credentials = false
-
-    settings[:forwarding_proxy].each_key do |p|
-    next if p == :default_proxy
-    proxy = settings[:forwarding_proxy][p]
-
-    if proxy.has_key? :password and proxy[:password] != ''
-    #       puts " - proxy #{p} has password #{proxy_list[p][:credentials][:password]}"
-    proxy_has_credentials = true
-    end
-    end
-    end
-
-    if proxy_has_credentials == true
-    if settings[:password_policy][:save_passwords] == true
-    if settings[:password_policy][:save_without_master] == false
-    if Watobo::Gui.master_password.empty?
-    # puts "* need master password for proxy"
-    dlg = MasterPWDialog.new(self)
-    if dlg.execute != 0
-    Watobo::Gui.master_password = dlg.masterPassword
-    end
-    end
-    unless Watobo::Gui.master_password.empty?
-    settings[:forwarding_proxy].each_key do |p|
-    #creds = settings[:forwarding_proxy][p][:credentials]
-    #pass = "$$WPE$$" + creds[:password]
-    pass = settings[:forwarding_proxy][p][:password]
-    unless pass.empty?
-    creds[:password] = Crypto.encryptPassword(pass, Watobo::Gui.master_password)
-    creds[:encrypted] = true
-    end
-    end
-    else
-    cleanCredentials(settings)
-    FXMessageBox.information(self,MBOX_OK,"No MasterPassword", "Could not encrypt proxy passwords. No Passwords have been saved!")
-    end
-    else
-    puts "* saving passwords without protection!!!!"
-    end
-    else
-    cleanCredentials(settings)
-    end
-    # puts "=== DEFAULT SETTINGS PASSWORD POLICY"
-    # puts YAML.dump(settings)
-    Watobo::Utils.save_settings(@default_settings_file, settings )
-=end
-
-    end
-
-  end
-
-end
+       #   puts Watobo::Conf::General.dump.to_yaml
+        Watobo::Conf::General.save
+        Watobo::Conf::Interceptor.save
+
+        return true
+      rescue => bang
+        puts bang
+        puts bang.backtrace if $DEBUG
+      end
+      return false
+    end
+
+    def self.save_default_settings_UNUSED(project)
+      mp = ''
+      save_pws = false
+
+      #  puts "= Master Password Settings ="
+      #  puts Watobo::Gui::MasterPW.settings.to_yaml
+
+      if Watobo::Gui::MasterPW.save_passwords?
+        save_pws = true
+        unless Watobo::Gui::MasterPW.set?
+          save_pws = false unless Watobo::Gui::MasterPW.save_without_master?
+        end
+      end
+
+      Watobo.save_proxy_settings( :save_passwords => save_pws, :key => mp )
+
+      Watobo::Conf::General.save
+      Watobo::Conf::Interceptor.save
+
+      return true
+=begin
+    proxy_has_credentials = false
+
+    settings[:forwarding_proxy].each_key do |p|
+    next if p == :default_proxy
+    proxy = settings[:forwarding_proxy][p]
+
+    if proxy.has_key? :password and proxy[:password] != ''
+    #       puts " - proxy #{p} has password #{proxy_list[p][:credentials][:password]}"
+    proxy_has_credentials = true
+    end
+    end
+    end
+
+    if proxy_has_credentials == true
+    if settings[:password_policy][:save_passwords] == true
+    if settings[:password_policy][:save_without_master] == false
+    if Watobo::Gui.master_password.empty?
+    # puts "* need master password for proxy"
+    dlg = MasterPWDialog.new(self)
+    if dlg.execute != 0
+    Watobo::Gui.master_password = dlg.masterPassword
+    end
+    end
+    unless Watobo::Gui.master_password.empty?
+    settings[:forwarding_proxy].each_key do |p|
+    #creds = settings[:forwarding_proxy][p][:credentials]
+    #pass = "$$WPE$$" + creds[:password]
+    pass = settings[:forwarding_proxy][p][:password]
+    unless pass.empty?
+    creds[:password] = Crypto.encryptPassword(pass, Watobo::Gui.master_password)
+    creds[:encrypted] = true
+    end
+    end
+    else
+    cleanCredentials(settings)
+    FXMessageBox.information(self,MBOX_OK,"No MasterPassword", "Could not encrypt proxy passwords. No Passwords have been saved!")
+    end
+    else
+    puts "* saving passwords without protection!!!!"
+    end
+    else
+    cleanCredentials(settings)
+    end
+    # puts "=== DEFAULT SETTINGS PASSWORD POLICY"
+    # puts YAML.dump(settings)
+    Watobo::Utils.save_settings(@default_settings_file, settings )
+=end
+
+    end
+
+  end
+
+end

data/lib/watobo/gui/utils/save_project_settings.rb

@@ -1,9 +0,0 @@
-#.
-# save_project_settings.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
-

data/lib/watobo/gui/utils/save_proxy_settings.rb

@@ -1,12 +1,3 @@
-#.
-# save_proxy_settings.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
   def self.save_proxy_settings(prefs={})
@@ -50,47 +41,47 @@ module Watobo#:nodoc: all
     end
 
   end
-  
+  
   def self.save_proxy_settings_UNUSED(prefs={})
     
-    puts "* save proxy settings"
-
-    c_prefs = {
-      :save_passwords => false,
-      :key => ""
-    }
-
-    c_prefs.update prefs
-
-    unless Watobo.project.nil?
-      Watobo::Conf::ForwardingProxy.save_project() do |s|
-        s.each do |name, proxy|
-          next unless proxy.is_a? Hash
-          unless c_prefs[:save_passwords] == false
-            unless c_prefs[:key].empty?
-            #asdfa
-            end
-          else
-            proxy[:password] = ''
-          end
-        end
-      end
-    else
-
-      Watobo::Conf::ForwardingProxy.save do |s|
-        s.each do |name, proxy|
-          next unless proxy.is_a? Hash
-          unless c_prefs[:save_passwords] == false
-            unless c_prefs[:key].empty?
-            #asdfa
-            end
-          else
-            proxy[:password] = ''
-          end
-        end
-      end
-    end
-
-  end
-
+    puts "* save proxy settings"
+
+    c_prefs = {
+      :save_passwords => false,
+      :key => ""
+    }
+
+    c_prefs.update prefs
+
+    unless Watobo.project.nil?
+      Watobo::Conf::ForwardingProxy.save_project() do |s|
+        s.each do |name, proxy|
+          next unless proxy.is_a? Hash
+          unless c_prefs[:save_passwords] == false
+            unless c_prefs[:key].empty?
+            #asdfa
+            end
+          else
+            proxy[:password] = ''
+          end
+        end
+      end
+    else
+
+      Watobo::Conf::ForwardingProxy.save do |s|
+        s.each do |name, proxy|
+          next unless proxy.is_a? Hash
+          unless c_prefs[:save_passwords] == false
+            unless c_prefs[:key].empty?
+            #asdfa
+            end
+          else
+            proxy[:password] = ''
+          end
+        end
+      end
+    end
+
+  end
+
 end

data/lib/watobo/gui/utils/save_scanner_settings.rb

@@ -1,33 +1,24 @@
-#.
-# save_scanner_settings.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
+module Watobo#:nodoc: all
+  module Gui
     def self.save_scanner_settings()
       #puts "* saving scanner settings ..."
       #puts Watobo::Conf::Scanner.settings.to_yaml
-      
-      unless Watobo.project.nil?
-
-        Watobo::Conf::Scanner.save_project(){ |s|
+      
+      unless Watobo.project.nil?
+
+        Watobo::Conf::Scanner.save_project(){ |s|
        #  puts s.to_yaml
-          s.delete(:scan_name)
-          s
-        }
-
-        session_filter = [ :sid_patterns, :logout_signatures, :custom_error_patterns, :max_parallel_checks, :excluded_parms, :non_unique_parms ]
-        Watobo::Conf::Scanner.save_session(session_filter)
-      return true
-      else
-        Watobo::Conf::Scanner.save
-      end
-    end
-  end
+          s.delete(:scan_name)
+          s
+        }
+
+        session_filter = [ :sid_patterns, :logout_signatures, :custom_error_patterns, :max_parallel_checks, :excluded_parms, :non_unique_parms ]
+        Watobo::Conf::Scanner.save_session(session_filter)
+      return true
+      else
+        Watobo::Conf::Scanner.save
+      end
+    end
+  end
 end

data/lib/watobo/gui/utils/session_history.rb

@@ -1,123 +1,114 @@
-#.
-# session_history.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
-
-# Watobo::Gui::History
-=begin
-    Class for managing history entries
-    entries are organised as a hash.
-    each entry consists of a hash.
-    the key of an entry is based on its session filename
-
-    @history_entry[session_file] = {
-    :last_used
-    :created
-    :project_name
-    :session_name
-    :description
-    }
-=end
-    class SessionHistory
-
-      attr_accessor :max_entries
-      def save()
-        begin
-          File.open(@history_file,"w") { |fh| fh.write YAML.dump(@history_entries) }
-        rescue => bang
-        puts bang
-        puts bang.backtrace if $DEBUG
-        end
-      end
-
-      def entries
-        @history_entries
-      end
-
-      def add_entry(prefs = {})
-        t_now = Time.now.to_i
-        return false unless prefs.has_key? :session_name or prefs.has_key? :project_name
-        puts "#"
-        hid = history_id(prefs[:project_name], prefs[:session_name])
-        @history_entries[hid] ||= {
-          :created => t_now
-        }
-        @history_entries[hid][:last_used] = t_now
-
-        [ :description, :project_name, :session_name ].each do |k|
-          @history_entries[hid][k] = prefs[k] if prefs.has_key? k
-        end
-
-        while @history_entries.length > @max_entries do
-          oid, ov = @history_entries.min_by{ |id,v| v[:last_used] }
-          @history_entries.delete oid
-        end
-
-        save()
-      end
-
-      def delete_entry(project_name, session_name)
-        @history_entries.delete history_id(project_name, session_name)
-      end
-
-      def update_usage(prefs)
-        t_now = Time.now.to_i
-        return false unless prefs.has_key? :session_name or prefs.has_key? :project_name
-        hid = history_id(prefs[:project_name], prefs[:session_name])
-        return false unless @history_entries.has_key? hid
-        @history_entries[hid][:last_used] = t_now
-        save()
-      end
-
-      def each(&b)
-        @history_entries.each_key{ |k|
-          yield @history_entries[k] if block_given?
-        }
-      end
-
-      def load(history_file)
-        if File.exist? history_file
-        @history_entries = YAML.load_file(history_file)
-        end
-      end
-
-      def initialize(filename)
-
-        @max_entries = 8
-        @history_entries = Hash.new
-        @history_file = filename
-
-        if File.exist? @history_file
-        load(@history_file)
-        else
-          begin
-            File.open(@history_file,"w") { |fh| fh.write YAML.dump(@history_entries) }
-          rescue => bang
-          puts bang
-          puts bang.backtrace if $DEBUG
-          end
-        end
-
-      end
-
-      private
-
-      def history_id(project_name, session_name)
-        text = [ project_name, session_name ].join("$")
-        return Digest::MD5.hexdigest(text)
-      end
-
-    end
-
-  end
-
+module Watobo#:nodoc: all
+
+  module Gui
+
+# Watobo::Gui::History
+=begin
+    Class for managing history entries
+    entries are organised as a hash.
+    each entry consists of a hash.
+    the key of an entry is based on its session filename
+
+    @history_entry[session_file] = {
+    :last_used
+    :created
+    :project_name
+    :session_name
+    :description
+    }
+=end
+    class SessionHistory
+
+      attr_accessor :max_entries
+      def save()
+        begin
+          File.open(@history_file,"w") { |fh| fh.write YAML.dump(@history_entries) }
+        rescue => bang
+        puts bang
+        puts bang.backtrace if $DEBUG
+        end
+      end
+
+      def entries
+        @history_entries
+      end
+
+      def add_entry(prefs = {})
+        t_now = Time.now.to_i
+        return false unless prefs.has_key? :session_name or prefs.has_key? :project_name
+        puts "#"
+        hid = history_id(prefs[:project_name], prefs[:session_name])
+        @history_entries[hid] ||= {
+          :created => t_now
+        }
+        @history_entries[hid][:last_used] = t_now
+
+        [ :description, :project_name, :session_name ].each do |k|
+          @history_entries[hid][k] = prefs[k] if prefs.has_key? k
+        end
+
+        while @history_entries.length > @max_entries do
+          oid, ov = @history_entries.min_by{ |id,v| v[:last_used] }
+          @history_entries.delete oid
+        end
+
+        save()
+      end
+
+      def delete_entry(project_name, session_name)
+        @history_entries.delete history_id(project_name, session_name)
+      end
+
+      def update_usage(prefs)
+        t_now = Time.now.to_i
+        return false unless prefs.has_key? :session_name or prefs.has_key? :project_name
+        hid = history_id(prefs[:project_name], prefs[:session_name])
+        return false unless @history_entries.has_key? hid
+        @history_entries[hid][:last_used] = t_now
+        save()
+      end
+
+      def each(&b)
+        @history_entries.each_key{ |k|
+          yield @history_entries[k] if block_given?
+        }
+      end
+
+      def load(history_file)
+        if File.exist? history_file
+        @history_entries = YAML.load_file(history_file)
+        end
+      end
+
+      def initialize(filename)
+
+        @max_entries = 8
+        @history_entries = Hash.new
+        @history_file = filename
+
+        if File.exist? @history_file
+        load(@history_file)
+        else
+          begin
+            File.open(@history_file,"w") { |fh| fh.write YAML.dump(@history_entries) }
+          rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+          end
+        end
+
+      end
+
+      private
+
+      def history_id(project_name, session_name)
+        text = [ project_name, session_name ].join("$")
+        return Digest::MD5.hexdigest(text)
+      end
+
+    end
+
+  end
+
 end