watobo 0.9.12 → 0.9.13

data/lib/watobo/gui/tagless_viewer.rb

@@ -1,7 +1,7 @@
 # .
 # tagless_viewer.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -20,7 +20,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
 require 'watobo/gui/request_editor'
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class TaglessViewer < SimpleTextView
       def normalizeText(text)

data/lib/watobo/gui/templates/plugin.rb

@@ -1,7 +1,7 @@
 # .
 # plugin.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Template
     class Plugin < FXDialogBox
       attr :plugin_name

data/lib/watobo/gui/templates/plugin2.rb

@@ -1,7 +1,7 @@
 # .
 # plugin2.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   class Plugin2 < FXDialogBox
     attr :plugin_name
     # attr :icon
@@ -45,7 +46,7 @@ module Watobo
 
     def load_icon
       icon = self.class.get_icon
-      puts "* loading icon > #{icon}"
+     # puts "* loading icon > #{icon}"
       self.icon = Watobo::Gui.load_icon(icon) unless icon.nil?
     end
 

data/lib/watobo/gui/templates/plugin_base.rb

@@ -0,0 +1,168 @@
+# .
+# plugin_base.rb
+# 
+# Copyright 2013 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
+  class PluginBase
+    def self.inherited(subclass)
+      %w( plugin_name plugin_path description version author output_path config_path lib_path ).each do |cvar|
+        define_method(cvar){ self.class.instance_variable_get("@#{cvar}")}
+        define_singleton_method("get_#{cvar}"){ 
+          return nil unless instance_variable_defined?("@#{cvar}")
+          instance_variable_get("@#{cvar}")
+          }
+        define_singleton_method("#{cvar}"){ |val| instance_variable_set("@#{cvar}",val)}
+      end
+      path = File.join(File.dirname(caller[0]))      
+      subclass.plugin_path path if File.exist?(path)
+      lpath = File.join(path, "lib" )       
+      subclass.lib_path lpath if File.exist?(lpath)
+    end
+    
+    def self.load_libs(*order)
+      lpath = get_lib_path
+      if order.empty?
+        libs = Dir.glob("#{lpath}/*")
+      else
+        libs = order
+      end
+      libs.each do |lib|
+        puts "> #{lib.to_s}"
+      require File.join(lib.to_s)
+      end      
+    end
+    
+    def self.gui
+      @gui
+    end
+
+   
+    def self.create_gui()
+      if self.const_defined? :Gui
+        gui = self.class_eval("Gui")
+        @gui = gui.new()
+        return @gui
+      end
+      puts "No GUI available for #{self}!"
+      return nil
+
+    end
+    
+    def self.load_gui(*order)
+      # load if WATOBO is in GUI mode
+      if Watobo.const_defined? :Gui
+      # gui_path = File.join(File.dirname(caller[0]), "gui")
+      gui_path = File.join(get_plugin_path, "gui")
+      if order.empty?
+        libs = Dir.glob("#{gui_path}/*")
+      else
+        libs = order
+      end
+      libs.each do |lib|
+        puts "loading gui-lib #{lib} ..."
+      require File.join(gui_path, lib.to_s)
+      end
+      else
+        puts "WATOBO NOT IN GUI MODE!"
+      end
+    end
+
+    def self.has_gui?
+      puts self
+      return true
+    end
+  end
+
+  class PluginGui < FXDialogBox
+
+    include Watobo::Gui
+    include Watobo::Gui::Icons
+
+    extend Watobo::Subscriber
+    
+    def self.inherited(subclass)
+      %w( icon_file icons_path window_title width height config_path ).each do |cvar|
+        define_method(cvar){ self.class.instance_variable_get("@#{cvar}")}
+        define_singleton_method("get_#{cvar}"){ 
+          return nil unless instance_variable_defined?("@#{cvar}")
+          instance_variable_get("@#{cvar}")
+          }
+        define_singleton_method("#{cvar}"){ |val| instance_variable_set("@#{cvar}",val)}
+      end
+      
+      base_class = class_eval( subclass.to_s.gsub(/::Gui/,''))
+      plugin_path = base_class.get_plugin_path
+      ipath = File.join(plugin_path, "icons")
+      if File.exist?(ipath)
+        # define_singleton_method("icons_path"){ "#{ipath}" }
+        subclass.icons_path ipath
+      end
+      
+    end
+    
+    
+    def updateView()
+      raise "!!! updateView not defined"
+    end
+
+    def initialize( opts = {} )
+     # _width = instance_variable_get("@width")
+     # puts _width
+     # puts _width.class
+     copts = { :opts => DECOR_ALL,:width=>800, :height=>600 }
+     copts.update opts
+      title = self.class.instance_variable_defined?("@window_title") ? window_title : "#{self}"
+      super(Watobo::Gui.application, title, copts)
+
+      @timer_lock = Mutex.new
+      load_icon
+
+    end
+
+    private
+
+    def load_icon
+      ipath = icons_path
+      ifile = icon_file
+      return false if ipath.nil? or ifile.nil?
+      
+      myicon = File.join(ipath, ifile)
+      if File.exist? myicon
+      #puts "* loading icon > #{myicon}"
+      self.icon = Watobo::Gui.load_icon(myicon) unless myicon.nil?
+      else
+        self.icon = nil
+      end
+    end
+
+    def update_timer(ms=50, &block)
+      update_timer = FXApp.instance.addTimeout( ms, :repeat => true) {
+        @timer_lock.synchronize do
+          if block_given?
+            block.call if block.respond_to? :call
+          end
+        end
+      }
+    end
+
+  end
+end
+

data/lib/watobo/gui/text_viewer.rb

@@ -1,7 +1,7 @@
 # .
 # text_viewer.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class TextView2 < FXText
 
@@ -59,6 +60,43 @@ module Watobo
         new_font.create
         self.font = new_font
       end
+      
+      def highlight_code(pattern=nil)
+        # remove all styles
+        self.changeStyle(0, self.length-1, 0)
+        mark = pattern.nil? ? @code_pattern : pattern
+        sindex = nil
+        pos = 0
+        match = []
+        text = self.to_s
+        mark = "%%"
+
+        loop do
+          sindex = text.index(mark, pos)
+          nli = text.index("\n", pos)
+          break if sindex.nil?
+          puts pos
+          
+          unless nli.nil?
+            match = [] if nli < sindex
+          end
+          
+          match << sindex
+          
+          if match.length == 2          
+            start = match[0]
+            len = match[1] - match[0] + mark.length
+            
+            self.changeStyle(start, len, @code_style)
+            match = []
+            pos = sindex + mark.length - 1
+          else
+            pos = sindex + mark.length            
+          end
+          
+          break if pos >= self.length-1 + mark.length
+        end
+      end
 
       def initialize(owner, opts)
 
@@ -66,8 +104,10 @@ module Watobo
         @raw_text = ""
         @match_index = 0
         @event_dispatcher_listeners = Hash.new
+        @parse_code = true
+        @code_pattern = "%%"
+        @code_style = 1
 
-puts opts.to_yaml
         super(owner, opts)
 
         # Construct some hilite styles
@@ -89,6 +129,12 @@ puts opts.to_yaml
         self.editable = false
 
         self.textStyle |= TEXT_WORDWRAP
+        
+        self.connect(SEL_CHANGED){
+          if @parse_code
+            highlight_code()
+          end
+        }
 
       end
 

data/lib/watobo/gui/transcoder_window.rb

@@ -1,7 +1,7 @@
 # .
 # transcoder_window.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
    module Gui
 
 

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

@@ -1,7 +1,7 @@
 # .
 # gui_utils.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     module Utils
       
@@ -40,14 +41,14 @@ module Watobo
 
       def cleanupHTTP(text)
 
-        if text.class.to_s =~ /Array/i then
+        if text.is_a?(Request) or text.is_a?(Response)
           dummy = []
           text.each do |line|
             chunk = line.gsub(/\r/,'').strip
             dummy.push chunk.gsub("\x00","")
           end
           return dummy.join("\n")
-        elsif text.class.to_s =~ /String/i then
+        elsif text.is_a? String
           chunk = text.gsub(/\r/,'').strip
           return chunk.gsub("\x00","")
           #return text.gsub(/\r/,"")

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

@@ -1,7 +1,7 @@
 # .
 # init_icons.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     module Icons
       WATOBO_LOGO = Watobo::Gui.load_gui_icon("watobo-logo.png")
@@ -59,6 +60,7 @@ module Watobo
 
       # Findings Tree Icons
       ICON_VULN = Watobo::Gui.load_gui_icon("Mr. Bomb_24x24.ico")
+      ICON_VULN_BP = Watobo::Gui.load_gui_icon("BestPractice_24x24.ico")
       ICON_VULN_LOW = Watobo::Gui.load_gui_icon("Yellow Ball_24x24.ico")
       ICON_VULN_MEDIUM = Watobo::Gui.load_gui_icon("Orange Ball_24x24.ico")
       ICON_VULN_HIGH = Watobo::Gui.load_gui_icon("Red Ball_24x24.ico")
@@ -72,6 +74,7 @@ module Watobo
       # small
       ICON_PROJECT_SMALL = Watobo::Gui.load_gui_icon("Web Browser_16x16.ico")
       ICON_VULN_SMALL = Watobo::Gui.load_gui_icon("Mr. Bomb_16x16.ico")
+      ICON_VULN_BP_SMALL = Watobo::Gui.load_gui_icon("BestPractice_16x16.ico")
       ICON_VULN_LOW_SMALL = Watobo::Gui.load_gui_icon("Yellow Ball_16x16.ico")
       ICON_VULN_MEDIUM_SMALL = Watobo::Gui.load_gui_icon("Orange Ball_16x16.ico")
       ICON_VULN_HIGH_SMALL = Watobo::Gui.load_gui_icon("Red Ball_16x16.ico")

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

@@ -1,7 +1,7 @@
 # .
 # load_icons.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     
     def self.load_gui_icon(name)

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

@@ -1,7 +1,7 @@
 # .
 # load_plugins.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     @plugin_list = []
     def self.add_plugin(p)
@@ -44,8 +45,6 @@ module Watobo
             if File.exist? pgf
               puts "Loading Plugin GUI #{pgf} ..."
 
-              
-
               group = File.basename(sub)
               plugin = File.basename(pgf).sub(/\.rb/,'')
               # load "#{@settings[:module_path]}/#{modules}/#{check}"
@@ -76,7 +75,7 @@ module Watobo
 
                   Watobo::Gui.add_plugin class_constant.new(Watobo::Gui.application, project)
                 rescue => bang
-                  puts bang
+                  puts bang if $DEBUG
                   puts bang.backtrace if $DEBUG
                 #   notify(:logger, LOG_INFO, "problems loading plugin: #{plugin_file}")
                 end
@@ -99,12 +98,30 @@ module Watobo
                   class_constant = Watobo.class_eval(class_name)
 
                   Watobo::Gui.add_plugin class_constant.new(Watobo::Gui.application, project)
+                  
                 rescue => bang
                   puts bang
                   puts bang.backtrace if $DEBUG
                 #   notify(:logger, LOG_INFO, "problems loading plugin: #{plugin_file}")
                 end
               end
+              #
+
+              Watobo::Plugin.constants.each do |pc|
+                puts ">> PLUGIN >> #{pc.to_s}"
+                
+                pclass = Watobo::Plugin.class_eval(pc.to_s)
+                
+                if pclass.respond_to? :create_gui
+                  puts "ADD NEW PLUGIN #{pc.upcase}"
+                  # TODO: In later versions - if all plugins are switched to the new style - this will not be necessary here
+                  gui = pclass.create_gui()
+                  # puts gui.class
+                  Watobo::Gui.add_plugin pclass
+
+                # exit
+                end
+              end
             end
           end
         end

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

@@ -1,7 +1,7 @@
 # .
 # master_password.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     module MasterPW
       @master_password = ''

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

@@ -1,7 +1,7 @@
 # .
 # save_default_settings.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
 
   module Gui
     def self.save_settings()
@@ -40,10 +41,11 @@ module Watobo
 
         Watobo.save_proxy_settings( :save_passwords => save_pws, :key => mp )
 
-        Watobo::Gui.save_scanner_settings()
+        Watobo::Gui.save_scanner_settings
         unless Watobo.project.nil?
-          Watobo::Conf::General.save_project(Watobo.project.session_store)
-          Watobo::Conf::Interceptor.save_project(Watobo.project.session_store)
+          Watobo::Conf::General.save_project
+          Watobo::Conf::Interceptor.save_project
+          Watobo::Conf::SidCache.save_project
         end
         # also save global settings here
         Watobo::Conf::General.save

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

@@ -1,7 +1,7 @@
 # .
 # save_project_settings.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com

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

@@ -1,7 +1,7 @@
 # .
 # save_proxy_settings.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   def self.save_proxy_settings(prefs={})
 
     c_prefs = {
@@ -30,7 +31,7 @@ module Watobo
     c_prefs.update prefs
 
     unless Watobo.project.nil?
-      Watobo::Conf::ForwardingProxy.save_project(Watobo.project.session_store) do |s|
+      Watobo::Conf::ForwardingProxy.save_project() do |s|
         s.each do |name, proxy|
           next unless proxy.is_a? Hash
           unless c_prefs[:save_passwords] == false

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

@@ -1,7 +1,7 @@
 # .
 # save_scanner_settings.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,18 +19,19 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     def self.save_scanner_settings()
       unless Watobo.project.nil?
 
-        Watobo::Conf::Scanner.save_project(Watobo.project.session_store ){ |s|
+        Watobo::Conf::Scanner.save_project(){ |s|
         # puts s.to_yaml
           x
         }
 
         session_filter = [ :sid_patterns, :logout_signatures, :custom_error_patterns, :max_parallel_checks, :excluded_parms, :non_unique_parms ]
-        Watobo::Conf::Scanner.save_session(Watobo.project.session_store)
+        Watobo::Conf::Scanner.save_session()
       return true
       else
         Watobo::Conf::Scanner.save

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

@@ -1,7 +1,7 @@
 # .
 # session_history.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
 
   module Gui
 

data/lib/watobo/gui/workspace_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # workspace_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
    module Gui
       class WorkspaceDialog < FXDialogBox
 

data/lib/watobo/gui/www_auth_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # www_auth_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class AuthTable < FXTable
       include Watobo::Constants
@@ -294,7 +295,7 @@ module Watobo
         @sites_combo.clearItems
         @sites_combo.appendItem(NO_SELECTION, nil)
         unless Watobo.project.nil?
-        Watobo.project.listSites(:in_scope => Watobo.project.has_scope? ){ |site|
+        Watobo::Chats.sites(:in_scope => Watobo::Scope.exist? ){ |site|
         #puts "Site: #{site}"
           @sites_combo.appendItem(site, site)
         }