watobo 0.9.21 → 0.9.23

data/lib/watobo/core/passive_checks.rb

@@ -1,60 +1,51 @@
-#.
-# passive_checks.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
-  class PassiveModules
-    @checks = []
-    
-    def self.each(&block)
-      if block_given?
-        @checks.map{|c| yield c }
-      end
-      
-    end
-    
-    def self.to_a
-      @checks
-    end
-    
-    def self.length
-      @checks.length  
-    end
-    
-    def self.init
-      passive_modules = []
-
-      Dir["#{Watobo.passive_module_path}/*.rb"].each do |mod_file|
-        begin
-          mod = File.basename(mod_file)
-
-          load mod_file
-        rescue => bang
-          puts "!!!"
-          puts bang
-        end
-      end
-
-      Watobo::Modules::Passive.constants.each do |m|
-        begin
-          class_constant = Watobo::Modules::Passive.const_get(m)
-          pc = class_constant.new(self)
-          print "."
-          @checks << pc
-
-        rescue => bang
-          puts "!!!"
-          puts bang
-        end
+module Watobo#:nodoc: all
+  class PassiveModules
+    @checks = []
+    
+    def self.each(&block)
+      if block_given?
+        @checks.map{|c| yield c }
+      end
+      
+    end
+    
+    def self.to_a
+      @checks
+    end
+    
+    def self.length
+      @checks.length  
+    end
+    
+    def self.init
+      passive_modules = []
+
+      Dir["#{Watobo.passive_module_path}/*.rb"].each do |mod_file|
+        begin
+          mod = File.basename(mod_file)
+
+          load mod_file
+        rescue => bang
+          puts "!!!"
+          puts bang
+        end
+      end
+
+      Watobo::Modules::Passive.constants.each do |m|
+        begin
+          class_constant = Watobo::Modules::Passive.const_get(m)
+          pc = class_constant.new(self)
+          print "."
+          @checks << pc
+
+        rescue => bang
+          puts "!!!"
+          puts bang
+        end
       end
-      
-      passive_modules
-    end
-  end
+      
+      passive_modules
+    end
+  end
 end

data/lib/watobo/core/passive_scanner.rb

@@ -1,57 +1,56 @@
-#.
-# passive_scanner.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 PassiveScanner
-    @queue = Queue.new
-    @max_threads = 1
-    @scanners = []
-    class Engine
-      def initialize
-        @t = nil
-      end
-
-      def run
-        @t = Thread.new{
-          loop do
-            chat = Watobo::PassiveScanner.pop
-            unless chat.nil?
-              Watobo::PassiveModules.each do |test_module|
-                begin
-                  test_module.do_test(chat)
-                rescue => bang
-                  puts bang
-                  puts bang.backtrace #if $DEBUG
-                  #return false
-                end
-              end
-            end
-         end
-        }
-      end
-    end
-
-    def self.pop
-      return @queue.pop
-    end
-
-    def self.start
-      @max_threads.times do |i|
-        e = Engine.new
-        e.run
-      end
-    end
-
-    def self.add(chat)
-      @queue.push chat
-    end
-
-  end
+module Watobo #:nodoc: all
+  module PassiveScanner
+    @queue = Queue.new
+    @max_threads = 1
+    @scanners = []
+    class Engine
+      def initialize
+        @t = nil
+      end
+
+      def run
+        @t = Thread.new {
+          loop do
+            if Watobo::PassiveScanner.queue.size > 0
+              chat = Watobo::PassiveScanner.pop
+              unless chat.nil?
+                Watobo::PassiveModules.each do |test_module|
+                  begin
+                    test_module.do_test(chat)
+                  rescue => bang
+                    puts bang
+                    puts bang.backtrace #if $DEBUG
+                    #return false
+                  end
+                end
+              end
+            else
+              sleep 0.5
+            end
+          end
+        }
+      end
+    end
+
+    def self.queue
+      @queue
+    end
+
+    def self.pop
+      return @queue.pop
+    end
+
+    def self.start
+     #@max_threads.times do |i|
+        e = Engine.new
+        e.run
+     #end
+    end
+
+    def self.add(chat)
+      @queue.push chat
+    end
+
+  end
 end

data/lib/watobo/core/plugin.rb

@@ -1,21 +1,12 @@
-#.
-# plugin.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 Plugin
-    def self.each
-      constants.each do |c|
-        yield c if block_given?
-      end
-    end
-  end
-
-end
+module Watobo#:nodoc: all
+
+  module Plugin
+    def self.each
+      constants.each do |c|
+        yield c if block_given?
+      end
+    end
+  end
+
+end

data/lib/watobo/core/project.rb

@@ -1,12 +1,3 @@
-#.
-# project.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
 
@@ -334,6 +325,9 @@ module Watobo#:nodoc: all
       begin
         puts "DEBUG: Setup Project" if $DEBUG and $debug_project
         importSession()
+        puts "* initialize egress handlers ..."
+        Watobo::EgressHandlers.init
+
 
       rescue => bang
         puts bang

data/lib/watobo/core/proxy.rb

@@ -1,54 +1,45 @@
-#.
-# proxy.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
-  class Proxy
-      include Watobo::Constants
-      
-      attr :login
-      
-      def method_missing(name, *args, &block)
-          # puts "* instance method missing (#{name})"
-          if @settings.has_key? name.to_sym
-            return @settings[name.to_sym]
-          else
-            super
-          end
-        end
-        
-      def to_yaml
-        @settings.to_yaml
-      end
-
-
-      def has_login?
-       # puts @settings.to_yaml
-        return false if @settings[:auth_type] == AUTH_TYPE_NONE
-        return true
-      end
-
-      def initialize(prefs)
-        @login = nil
-        raise ArgumentError, "Proxy needs host, port and name" unless prefs.has_key? :host
-        raise ArgumentError, "Proxy needs host, port and name" unless prefs.has_key? :port
-        raise ArgumentError, "Proxy needs host, port and name" unless prefs.has_key? :name
-        
-        @settings = { 
-          :auth_type => AUTH_TYPE_NONE, 
-          :username => '', 
-          :password => '',
-          :domain => '',
-          :workstation => ''}
-        
-        @settings.update prefs
-
-      end
-    end
+module Watobo#:nodoc: all
+  class Proxy
+      include Watobo::Constants
+      
+      attr :login
+      
+      def method_missing(name, *args, &block)
+          # puts "* instance method missing (#{name})"
+          if @settings.has_key? name.to_sym
+            return @settings[name.to_sym]
+          else
+            super
+          end
+        end
+        
+      def to_yaml
+        @settings.to_yaml
+      end
+
+
+      def has_login?
+       # puts @settings.to_yaml
+        return false if @settings[:auth_type] == AUTH_TYPE_NONE
+        return true
+      end
+
+      def initialize(prefs)
+        @login = nil
+        raise ArgumentError, "Proxy needs host, port and name" unless prefs.has_key? :host
+        raise ArgumentError, "Proxy needs host, port and name" unless prefs.has_key? :port
+        raise ArgumentError, "Proxy needs host, port and name" unless prefs.has_key? :name
+        
+        @settings = { 
+          :auth_type => AUTH_TYPE_NONE, 
+          :username => '', 
+          :password => '',
+          :domain => '',
+          :workstation => ''}
+        
+        @settings.update prefs
+
+      end
+    end
 end

data/lib/watobo/core/request.rb

@@ -1,112 +1,104 @@
-#.
-# request.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.create_request(url, prefs={})
-    unless url =~ /^https?:\/\//
-      u = "http://#{url}"
-    else
-    u = url
-    end
-
-    uri = URI.parse u
-    r = "GET #{uri.to_s} HTTP/1.1\n"
+module Watobo #:nodoc: all
+  def self.create_request(url, prefs={})
+    unless url =~ /^https?:\/\//
+      u = "http://#{url}"
+    else
+      u = url
+    end
+
+    uri = URI.parse u
+    r = "GET #{uri.to_s} HTTP/1.1\n"
     r << "Host: #{uri.host}\n"
     r << "User-Agent: WATOBO\n"
-    r << "Accept: */*\n"
-    r.extend Watobo::Mixins::RequestParser
-    r.to_request
-  end
-
-  class Request < Array
-
-    attr :data
-    attr :url
-    attr :header
+    r << "Accept: */*\n"
+    r.extend Watobo::Mixins::RequestParser
+    r.to_request
+  end
+
+  class Request < Array
+
+    attr :data
+    attr :url
+    attr :header
     # attr :cookies
 
     include Watobo::HTTP::Cookies::Mixin
-    include Watobo::HTTP::Xml::Mixin
-    def self.create request
-      request.extend Watobo::Mixin::Parser::Url
-      request.extend Watobo::Mixin::Parser::Web10
-      request.extend Watobo::Mixin::Shaper::Web10
-    # request = Request.new(request)
-    end
-
-    def copy
-      c = Watobo::Utils.copyObject self
-      Watobo::Request.new c
-    end
-
-    def uniq_hash()
-      begin
-        settings = Watobo::Conf::Scanner.to_h
-        hashbase = site + method + path
-
-        get_parm_names.sort.each do |p|
-          hashbase << p
-          hashbase << get_parm_value(p) if settings[:non_unique_parms].include?(p)
-        end
-
-        post_parm_names.sort.each do |p|
-
-          hashbase << p
-          hashbase << post_parm_value(p) if settings[:non_unique_parms].include?(p)
-        end
-        # puts hashbase
-        return Digest::MD5.hexdigest(hashbase)
-      rescue => bang
-        puts bang
-        puts bang.backtrace if $DEBUG
-        return nil
-      end
-    end
+    include Watobo::HTTP::Xml::Mixin
+
+    def self.create request
+      request.extend Watobo::Mixin::Parser::Url
+      request.extend Watobo::Mixin::Parser::Web10
+      request.extend Watobo::Mixin::Shaper::Web10
+      # request = Request.new(request)
+    end
+
+    def copy
+      c = Watobo::Utils.copyObject self
+      Watobo::Request.new c
+    end
+
+    def uniq_hash()
+      begin
+        settings = Watobo::Conf::Scanner.to_h
+        hashbase = site + method + path
+
+        get_parm_names.sort.each do |p|
+          hashbase << p
+          hashbase << get_parm_value(p) if settings[:non_unique_parms].include?(p)
+        end
+
+        post_parm_names.sort.each do |p|
+
+          hashbase << p
+          hashbase << post_parm_value(p) if settings[:non_unique_parms].include?(p)
+        end
+        # puts hashbase
+        return Digest::MD5.hexdigest(hashbase)
+      rescue => bang
+        puts bang
+        puts bang.backtrace if $DEBUG
+        return nil
+      end
+    end
 
     def parameters(*locations, &block)
-      param_locations = [ :url, :data, :wwwform, :xml, :cookies, :json ]
+      param_locations = [:url, :data, :wwwform, :xml, :cookies, :json]
       unless locations.empty?
-        param_locations.select!{ |loc| locations.include? loc }
+        param_locations.select! { |loc| locations.include? loc }
       end
-
+
       parms = []
       parms.concat @url.parameters if param_locations.include?(:url)
-      parms.concat cookies.parameters if param_locations.include?(:cookies)
-      parms.concat @data.parameters if !@data.nil? and self.is_wwwform? and ( param_locations.include?(:data) or param_locations.include?(:wwwform) )
-      parms.concat @json.parameters if !@json.nil? and self.is_json? and ( param_locations.include?(:data) or param_locations.include?(:json) )
+      parms.concat cookies.parameters if param_locations.include?(:cookies)
+      parms.concat @data.parameters if !@data.nil? and self.is_wwwform? and (param_locations.include?(:data) or param_locations.include?(:wwwform))
+      parms.concat @json.parameters if !@json.nil? and self.is_json? and (param_locations.include?(:data) or param_locations.include?(:json))
 
       parms.concat xml.parameters if self.is_xml? and param_locations.include?(:xml)
       if block_given?
         parms.each do |p|
           yield p
         end
-      end
-      parms
-    end
-
-    def set(parm)
-      case parm.location
-      when :data
-        #
-        # replace_post_parm(parm.name, parm.value)
-        @data.set parm
-      when :url
-        @url.set parm
-      when :xml
-        xml.set parm
-      when :cookie
-        cookies.set parm
-      when :json
-        @json.set parm
-      end
-      true
+      end
+      parms
+    end
+
+    def set(parm)
+      case parm.location
+        when :data
+          #
+          # replace_post_parm(parm.name, parm.value)
+          @data.set parm
+        when :url
+          @url.set parm
+        when :xml
+          xml.set parm
+        when :cookie
+          cookies.set parm
+        when :json
+          @json.set parm
+      end
+      true
     end
 
     def to_s
@@ -115,39 +107,49 @@ module Watobo#:nodoc: all
         data << "\r\n" unless data =~ /\r\n\r\n$/
       end
       data
-    end
-
-    def initialize(r)
-      if r.respond_to? :concat
-      #puts "Create REQUEST from ARRAY"
-      self.concat r
-      elsif r.is_a? String
-        if r =~ /^http/
-          uri = URI.parse r
-          self << "GET #{uri.to_s} HTTP/1.1\r\n"
-          self << "Host: #{uri.host}\r\n"
-        else
-          r.extend Watobo::Mixins::RequestParser
-        self.concat r.to_request
-        end
-
-      end
-      self.extend Watobo::Mixin::Parser::Url
-      self.extend Watobo::Mixin::Parser::Web10
+    end
+
+    def initialize(r)
+      if r.respond_to? :concat
+        #puts "Create REQUEST from ARRAY"
+        self.concat r
+      elsif r.is_a? String
+        if r =~ /^http/
+          uri = URI.parse r
+          self << "GET #{uri.to_s} HTTP/1.1\r\n"
+          self << "Host: #{uri.host}\r\n"
+        else
+          r.extend Watobo::Mixins::RequestParser
+          self.concat r.to_request
+        end
+
+      end
+      self.extend Watobo::Mixin::Parser::Url
+      self.extend Watobo::Mixin::Parser::Web10
       self.extend Watobo::Mixin::Shaper::Web10
-      
-      @url = Watobo::HTTP::Url.new(self)
+      self.extend Watobo::Mixin::Shaper::HttpResponse
+
+      @url = Watobo::HTTP::Url.new(self)
+      ct = content_type
+
+      if ct =~ /\+zlib/
+        dec_body = Zlib.inflate body
+        setData dec_body
+        set_content_type content_type.gsub(/\+zlib/, '')
+        fix_content_length
+      end
+
       case self.content_type
-      when /www-form/i
-        @data = Watobo::HTTPData::WWW_Form.new(self)
-      when /application\/json/i
-        @json = Watobo::HTTPData::JSONData.new(self)
-      else
-      #puts "UNKONWN CONTENT-TYPE"
-      @data = Watobo::HTTPData::WWW_Form.new(self)
+        when /www-form/i
+          @data = Watobo::HTTPData::WWW_Form.new(self)
+        when /application\/json/i
+          @json = Watobo::HTTPData::JSONData.new(self)
+        else
+          #puts "UNKONWN CONTENT-TYPE"
+          @data = Watobo::HTTPData::WWW_Form.new(self)
       end
-
-      @cookies = Watobo::HTTP::Cookies.new(self)
-    end
-  end
+
+      @cookies = Watobo::HTTP::Cookies.new(self)
+    end
+  end
 end