watobo 0.9.19 → 0.9.20

data/lib/watobo/core/cert_store.rb

@@ -1,57 +1,45 @@
-# .
+#.
 # cert_store.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
-  module CertStore
-    @fake_certs = Hash.new
-    def self.acquire_ssl_ctx(target, cn)
-      ctx = OpenSSL::SSL::SSLContext.new()
-
-      unless @fake_certs.has_key? target
-        cert_prefs = {
-          :hostname => cn,
-          :type => 'server',
-          :user => 'watobo',
-          :email => 'watobo@localhost',
-        }
-        cert_file, key_file = Watobo::CA.create_cert cert_prefs
-        fake_cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
-        fake_key = OpenSSL::PKey::RSA.new(File.read(key_file))
-
-        #ctx = OpenSSL::SSL::SSLContext.new('SSLv23_server')
-        @fake_certs[target] = { :cert => fake_cert, :key => fake_key }
+#.
+# 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
 
-      end
-      fc = @fake_certs[target]
-      ctx.cert = fc[:cert]
-      ctx.key = fc[:key]
-
-      ctx.tmp_dh_callback = proc { |*args|
-        Watobo::CA.dh_key
-      }
-
-      ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      ctx.timeout = 10
-      return ctx
-    end
-  end
+# @private 
+module Watobo#:nodoc: all
+  module CertStore
+    @fake_certs = Hash.new
+    def self.acquire_ssl_ctx(target, cn)
+      ctx = OpenSSL::SSL::SSLContext.new()
+
+      unless @fake_certs.has_key? target
+        cert_prefs = {
+          :hostname => cn,
+          :type => 'server',
+          :user => 'watobo',
+          :email => 'watobo@localhost',
+        }
+        cert_file, key_file = Watobo::CA.create_cert cert_prefs
+        fake_cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+        fake_key = OpenSSL::PKey::RSA.new(File.read(key_file))
+
+        #ctx = OpenSSL::SSL::SSLContext.new('SSLv23_server')
+        @fake_certs[target] = { :cert => fake_cert, :key => fake_key }
+
+      end
+      fc = @fake_certs[target]
+      ctx.cert = fc[:cert]
+      ctx.key = fc[:key]
+
+      ctx.tmp_dh_callback = proc { |*args|
+        Watobo::CA.dh_key
+      }
+
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      ctx.timeout = 10
+      return ctx
+    end
+  end
 end

data/lib/watobo/core/chat.rb

@@ -1,90 +1,78 @@
-# .
+#.
 # chat.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 Chat < Conversation
-    attr :request
-    attr :response
-    attr :settings
-
-    @@numChats = 0
-    @@max_id = 0
-
-    @@lock = Mutex.new
-
-    public
-    def resetCounters()
-      @@numChats = 0
-      @@max_id = 0
-    end
-
-    def tested?()
-      return false unless @settings.has_key?(:tested)
-      return @settings[:tested]
-    end
-
-    def tested=(truefalse)
-      @settings[:tested] = truefalse
-    end
-
-    def tstart()
-      @settings[:tstart]
-    end
-
-    def tstop()
-      @settings[:tstop]
-    end
-
-    def id()
-      @settings[:id]
-    end
-
-    def comment=(c)
-      @settings[:comment] = c
-    end
-
-    def comment()
-      @settings[:comment]
-    end
-    
-    def use_ssl?
-      request.proto =~ /https/
-    end
+#.
+# 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
 
-    def source()
-      @settings[:source]
-    end
-
-
-    # INITIALIZE ( request, response, prefs )
-    # prefs:
-    #   :source - source of request/response CHAT_SOURCE
-    #   :id     - an initial id, if no id is given it will be set to the @@max_id, if id == 0 counters will be ignored.
-    #   :start  - starting time of request format is Time.now.to_f
-    #   :stop   - time of loading response has finished
-    #   :
-    def initialize(request, response, prefs = {})
-
-      begin
+# @private 
+module Watobo#:nodoc: all
+  class Chat < Conversation
+    attr :request
+    attr :response
+    attr :settings
+
+    @@numChats = 0
+    @@max_id = 0
+
+    @@lock = Mutex.new
+
+    public
+    def resetCounters()
+      @@numChats = 0
+      @@max_id = 0
+    end
+
+    def tested?()
+      return false unless @settings.has_key?(:tested)
+      return @settings[:tested]
+    end
+
+    def tested=(truefalse)
+      @settings[:tested] = truefalse
+    end
+
+    def tstart()
+      @settings[:tstart]
+    end
+
+    def tstop()
+      @settings[:tstop]
+    end
+
+    def id()
+      @settings[:id]
+    end
+
+    def comment=(c)
+      @settings[:comment] = c
+    end
+
+    def comment()
+      @settings[:comment]
+    end
+    
+    def use_ssl?
+      request.proto =~ /https/
+    end
+
+    def source()
+      @settings[:source]
+    end
+
+
+    # INITIALIZE ( request, response, prefs )
+    # prefs:
+    #   :source - source of request/response CHAT_SOURCE
+    #   :id     - an initial id, if no id is given it will be set to the @@max_id, if id == 0 counters will be ignored.
+    #   :start  - starting time of request format is Time.now.to_f
+    #   :stop   - time of loading response has finished
+    #   :
+    def initialize(request, response, prefs = {})
+
+      begin
         @settings = {
           :source => CHAT_SOURCE_UNDEF,
           :id => -1,
@@ -94,31 +82,31 @@ module Watobo#:nodoc: all
           :tested => false
         }
         
-        super(request, response)
-
-       
-
-        @settings.update prefs
-        #  puts @settings[:id].to_s
-
-        @@lock.synchronize{
-        # enter critical section here ???
-          if @settings[:id] > @@max_id
-            @@max_id = @settings[:id]
-          elsif @settings[:id] < 0
-            @@max_id += 1
-            @settings[:id] = @@max_id
-          end
-          @@numChats += 1
-        # @comment = ''
-        # leafe critical section here ???
-        }
-
-      rescue => bang
-        puts bang
-        puts bang.backtrace if $DEBUG
-      end
-    end
-
-  end
+        super(request, response)
+
+       
+
+        @settings.update prefs
+        #  puts @settings[:id].to_s
+
+        @@lock.synchronize{
+        # enter critical section here ???
+          if @settings[:id] > @@max_id
+            @@max_id = @settings[:id]
+          elsif @settings[:id] < 0
+            @@max_id += 1
+            @settings[:id] = @@max_id
+          end
+          @@numChats += 1
+        # @comment = ''
+        # leafe critical section here ???
+        }
+
+      rescue => bang
+        puts bang
+        puts bang.backtrace if $DEBUG
+      end
+    end
+
+  end
 end

data/lib/watobo/core/chats.rb

@@ -1,301 +1,297 @@
-# .
+#.
 # chats.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 Chats
-    @chats = []
-    @chats_lock = Mutex.new
-    @event_dispatcher_listeners = Hash.new
-    def self.subscribe(event, &callback)
-      (@event_dispatcher_listeners[event] ||= []) << callback
-    end
+#.
+# 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
 
-    def self.clearEvents(event)
-      @event_dispatcher_listeners[event] ||= []
-      @event_dispatcher_listeners[event].clear
-    end
+# @private
+module Watobo#:nodoc: all
+  class Chats
+    @chats = []
+    @chats_lock = Mutex.new
+    @event_dispatcher_listeners = Hash.new
+    def self.subscribe(event, &callback)
+      (@event_dispatcher_listeners[event] ||= []) << callback
+    end
 
-    def self.notify(event, *args)
-      if @event_dispatcher_listeners[event]
-        @event_dispatcher_listeners[event].each do |m|
-          m.call(*args) if m.respond_to? :call
-        end
-      end
-    end
-
-    def self.reset
-      @chats = []
-      @event_dispatcher_listeners = Hash.new
-    end
+    def self.clearEvents(event)
+      @event_dispatcher_listeners[event] ||= []
+      @event_dispatcher_listeners[event].clear
+    end
 
-    def self.load
+    def self.notify(event, *args)
+      if @event_dispatcher_listeners[event]
+        @event_dispatcher_listeners[event].each do |m|
+          m.call(*args) if m.respond_to? :call
+        end
+      end
+    end
 
-    end
+    def self.reset
+      @chats = []
+      @event_dispatcher_listeners = Hash.new
+    end
 
-    def self.select(site, opts={}, &block)
-      o = {
-        :dir => "",
-        #:file => nil,
-        :method => nil,
-        :max_count => 0
-      }
-      o.update opts
-      o[:dir].strip!
-      o[:dir].gsub!(/^\//,"")
-
-      matches = []
-      @chats.each do |c|
-        if c.request.site == site then
-          matches.push c if o[:dir] == c.request.dir
-        end
-        return matches if o[:max_count] > 0 and matches.length >= o[:max_count]
-      end
-      return matches
+    def self.load
+
+    end
 
-    end
+    def self.select(site, opts={}, &block)
+      o = {
+        :dir => "",
+        #:file => nil,
+        :method => nil,
+        :max_count => 0
+      }
+      o.update opts
+      o[:dir].strip!
+      o[:dir].gsub!(/^\//,"")
+
+      matches = []
+      @chats.each do |c|
+        if c.request.site == site then
+          matches.push c if o[:dir] == c.request.dir
+        end
+        return matches if o[:max_count] > 0 and matches.length >= o[:max_count]
+      end
+      return matches
+
+    end
 
-    def self.sites(prefs={}, &block)
-      list = Hash.new
+    def self.sites(prefs={}, &block)
+      list = Hash.new
+
+      cprefs = { :in_scope => false,
+        :ssl => false
+      }
+      cprefs.update prefs
+
+      Watobo::Chats.each do |chat|
+        next if list.has_key?(chat.request.site)
+        site = chat.request.site
+        next if cprefs[:in_scope] == true and not Watobo::Scope.match_site?(site)
+        next if cprefs[:ssl] and not chat.use_ssl?
+
+        yield site if block_given?
+        list[site] = nil
+
+      end
+      return list.keys
+    end
 
-      cprefs = { :in_scope => false,
-        :ssl => false
-      }
-      cprefs.update prefs
+    def self.dirs(site, list_opts={}, &block)
+      opts = { :base_dir => "",
+        :include_subdirs => true
+      }
+      opts.update(list_opts) if list_opts.is_a? Hash
+      list = Hash.new
+      @chats.each do |chat|
+        next if chat.request.site != site
+        next if list.has_key?(chat.request.path)
+        next if opts[:base_dir] != "" and chat.request.path !~ /^#{Regexp.quote(opts[:base_dir])}/
+        subdirs = chat.request.subDirs
+        subdirs.each do |dir|
+          next if dir.nil?
+          next if list.has_key?(dir)
+          list[dir] = :path
+          if opts[:include_subdirs] == true then
+            yield dir if block_given?
+          else
+            d = dir.gsub(/#{Regexp.quote(opts[:base_dir])}/,"")
+            yield dir unless d =~ /\// and block_given?
+          # otherwise it is a subdir of base_dir
+          end
+        end
+      end
+    end
 
-      Watobo::Chats.each do |chat|
-        next if list.has_key?(chat.request.site)
-        site = chat.request.site
-        next if cprefs[:in_scope] == true and not Watobo::Scope.match_site?(site)
-        next if cprefs[:ssl] and not chat.use_ssl?
+    def self.get_by_id(chatid)
+      @chats_lock.synchronize do
+        @chats.each do |c|
+          if c.id.to_s == chatid.to_s then
+          return c
+          end
+        end
+      end
+      return nil
+    end
 
-        yield site if block_given?
-        list[site] = nil
+    def self.each(&block)
+      if block_given?
+        @chats_lock.synchronize do
+          @chats.map{|c| yield c }
+        end
+      end
+    end
 
-      end
-      return list.keys
-    end
-
-    def self.dirs(site, list_opts={}, &block)
-      opts = { :base_dir => "",
-        :include_subdirs => true
-      }
-      opts.update(list_opts) if list_opts.is_a? Hash
-      list = Hash.new
-      @chats.each do |chat|
-        next if chat.request.site != site
-        next if list.has_key?(chat.request.path)
-        next if opts[:base_dir] != "" and chat.request.path !~ /^#{Regexp.quote(opts[:base_dir])}/
-        subdirs = chat.request.subDirs
-        subdirs.each do |dir|
-          next if dir.nil?
-          next if list.has_key?(dir)
-          list[dir] = :path
-          if opts[:include_subdirs] == true then
-            yield dir if block_given?
-          else
-            d = dir.gsub(/#{Regexp.quote(opts[:base_dir])}/,"")
-            yield dir unless d =~ /\// and block_given?
-          # otherwise it is a subdir of base_dir
-          end
-        end
-      end
-    end
+    def self.to_a
+      @chats
+    end
 
-    def self.get_by_id(chatid)
-      @chats_lock.synchronize do
-        @chats.each do |c|
-          if c.id.to_s == chatid.to_s then
-          return c
-          end
-        end
-      end
-      return nil
-    end
+    def self.length
+      l = 0
+      @chats_lock.synchronize do
+        l = @chats.length
+      end
+      l
+    end
 
-    def self.each(&block)
-      if block_given?
-        @chats_lock.synchronize do
-          @chats.map{|c| yield c }
-        end
-      end
-    end
-    
-    def self.to_a
-      @chats
-    end
+    def self.in_scope(&block)
+      scan_prefs = Watobo::Conf::Scanner.to_h
+      #puts scan_prefs.to_yaml
+      unique_list = Hash.new
+      cis = []
+
+      @chats.each do |chat|
+        next if scan_prefs[:excluded_chats].include?(chat.id)
+        uch = chat.request.uniq_hash
+
+        next if unique_list.has_key?(uch) and scan_prefs[:smart_scan] == true
+        unique_list[uch] = nil
+        if Watobo::Scope.match_chat? chat
+          cis << chat
+          yield chat if block_given?
+        end
+      end
+      cis
+    end
 
-    def self.length
-      l = 0
-      @chats_lock.synchronize do
-        l = @chats.length
-      end
-      l
-    end
+    # only returns/yields chats wich match filter
+    #
+    #
+    def self.filtered(filter, &block)
+      #puts filter.to_yaml
+      @uniq_chats = {}
+      filtered_chats = []
+      @chats.each do |chat|
+        if match?(chat, filter)
+          yield chat if block_given?
+        filtered_chats << chat
+        end
+      end
+
+      filtered_chats
+    end
 
-    def self.in_scope(&block)
-      scan_prefs = Watobo::Conf::Scanner.to_h
-      #puts scan_prefs.to_yaml
-      unique_list = Hash.new
-      cis = []
+    def self.add(chat, prefs={})
+      @chats_lock.synchronize do
+        begin
+          if chat.request.host then
+            @chats << chat
+
+            options = {
+              :run_passive_checks => true,
+              :notify => true
+            }
+            options.update prefs
+
+            Watobo::PassiveScanner.add(chat) if options[:run_passive_checks] == true
+            # puts "[#{self}] add"
+
+            #@interface.addChat(self, chat) if @interface
+            notify(:new, chat) if options[:notify] == true
+
+            if chat.id != 0 then
+              Watobo::DataStore.add_chat(chat)
+            else
+              puts "!!! Could not add chat #{chat.id}"
+            end
+          end
+
+          # p "!P!"
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      end
+    end
+
+    private
 
-      @chats.each do |chat|
-        next if scan_prefs[:excluded_chats].include?(chat.id)
-        uch = chat.request.uniq_hash
+    def self.match?(chat, filter)
+      begin
+        
+        filtered = false
+      # return false if filter[:ok_only] == true and chat.response.responseCode !~ /200/
+
+        if filter[:unique]
+          uniq_hash = chat.request.uniq_hash
+          return false if @uniq_chats.has_key? uniq_hash
+          @uniq_chats[uniq_hash] = nil
+        end
+        #puts "scope"
+        if filter[:scope_only]
+          return false unless Watobo::Scope.match_site?(chat.request.site)
+        end
+        # puts "* passed scope"
+        if filter[:hide_tested]
+        return false if chat.tested?
+        end
 
-        next if unique_list.has_key?(uch) and scan_prefs[:smart_scan] == true
-        unique_list[uch] = nil
-        if Watobo::Scope.match_chat? chat
-          cis << chat
-          yield chat if block_given?
-        end
-      end
-      cis
-    end
-    
-    # only returns/yields chats wich match filter
-    #
-    #
-    def self.filtered(filter, &block)
-      #puts filter.to_yaml
-      @uniq_chats = {}
-      filtered_chats = []
-      @chats.each do |chat|
-        if match?(chat, filter)
-          yield chat if block_given?
-          filtered_chats << chat
+        if filter.has_key?(:status_codes) and not filter[:status_codes].empty?
+          return false if filter[:status_codes].find_index{|i| chat.response.status =~ /#{i}/}.nil?
         end
-      end
-      
-      filtered_chats      
-    end
-    
-    
-
-    def self.add(chat, prefs={})
-      @chats_lock.synchronize do
-        begin
-          if chat.request.host then
-            @chats << chat
-
-            options = {
-              :run_passive_checks => true,
-              :notify => true
-            }
-            options.update prefs
-
-            Watobo::PassiveScanner.add(chat) if options[:run_passive_checks] == true
-            # puts "[#{self}] add"
+
+        if filter.has_key?(:mime_types) and not filter[:mime_types].empty?
+          match = false
+          filter[:mime_types].each do |mt|
+            if chat.response.content_type =~ /#{mt}/i
+            match = true
+            end
+          end
+          puts "MIME_TYPE: #{match}"
+        return false if match == false
+        end
+
+        #puts "extensions"
+        # puts "* passed hide tested"
+        if filter[:hidden_extensions] == true
+          return false if filter[:hidden_extension_patterns].include?(chat.request.doctype)
+        end
 
-            #@interface.addChat(self, chat) if @interface
-            notify(:new, chat) if options[:notify] == true
-
-            if chat.id != 0 then
-              Watobo::DataStore.add_chat(chat)
-            else
-              puts "!!! Could not add chat #{chat.id}"
-            end
-          end
-
-          # p "!P!"
-        rescue => bang
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-      end
-    end
-    
-    private
-    
-    def self.match?(chat, filter)
-        begin
-         # return false if filter[:ok_only] == true and chat.response.responseCode !~ /200/ 
-           
-          if filter[:unique]
-            uniq_hash = chat.request.uniq_hash
-            return false if @uniq_chats.has_key? uniq_hash
-            @uniq_chats[uniq_hash] = nil
-          end
-          #puts "scope"
-          if filter[:scope_only]
-             return false unless Watobo::Scope.match_site?(chat.request.site)
-          end
-          # puts "* passed scope"
-          if filter[:hide_tested]
-            return false if chat.tested?
-          end
-          
-           if filter.has_key?(:status_codes) and not filter[:status_codes].empty?
-             return false if filter[:status_codes].find_index{|i| chat.response.status =~ /#{i}/}.nil?
-           end
-          
-          if filter.has_key?(:mime_types) and not filter[:mime_types].empty?
-            match = false
-            filter[:mime_types].each do |mt|
-              if chat.response.content_type =~ /#{mt}/i
-                match = true
-              end
-            end
-            puts "MIME_TYPE: #{match}"
-            return false if match == false
+        if filter[:show_extension_patterns]
+          unless filter[:show_extension_patterns].empty? or filter[:show_extensions] == false
+            return false unless filter[:show_extension_patterns].include?(chat.request.doctype)
           end
-          
-          #puts "extensions"
-          # puts "* passed hide tested"
-          if filter[:hidden_extensions] == true
-            return false if filter[:hidden_extension_patterns].include?(chat.request.doctype)
-          end
-          
-          unless filter[:show_extension_patterns].empty? or filter[:show_extensions] == false
-            return false unless filter[:show_extension_patterns].include?(chat.request.doctype)
-          end
-            #return true if filter[:text].empty?
-         # puts "url pattern"
+        end
+        #return true if filter[:text].empty?
+        # puts "url pattern"
+        if filter[:url_pattern]
           unless filter[:url_pattern].empty?
-            return false unless chat.request.first =~ /#{filter[:url_pattern]}/i
-            #return false
+            filtered = true
+            return true if chat.request.first =~ /#{filter[:url_pattern]}/i
+          #return false
           end
-          
+        end
+
+        if filter[:request_pattern]
           unless filter[:request_pattern].empty?
-            return false unless chat.request.join =~ /#{filter[:request_pattern]}/i
-            #return false
+            filtered = true
+            return true if chat.request.join =~ /#{filter[:request_pattern]}/i
+          #return false
+          end
+        end
+        # puts filter.to_yaml
+        # puts chat.response.responseCode
+        if filter[:response_pattern]
+          unless filter[:response_pattern].empty?
+            filtered = true
+            #return false if filter[:text_only] == true and chat.response.content_type !~ /(text|javascript|xml|json)/
+            return true if chat.response.join.unpack("C*").pack("C*") =~ /#{filter[:response_pattern]}/i
+          #return false
           end
-            
-            # puts filter.to_yaml
-            # puts chat.response.responseCode
-
-          unless filter[:response_pattern].empty? 
-              #return false if filter[:text_only] == true and chat.response.content_type !~ /(text|javascript|xml|json)/ 
-              return false unless chat.response.join.unpack("C*").pack("C*") =~ /#{filter[:response_pattern]}/i
-              #return false
-            end
-            
-          return true
-
-          
-        rescue => bang
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-        false
-      end
-  end
+        end
+
+        return !filtered
+
+      rescue => bang
+        puts bang
+        puts bang.backtrace if $DEBUG
+      end
+      false
+    end
+  end
 end