watobo 0.9.9.pre3 → 0.9.9

data/lib/watobo/gui/fuzzer_gui.rb

@@ -996,12 +996,10 @@ module Watobo
             scan_prefs[:check_online] = false
             # check if logging all scan chat
 
-            if @logScanChats.checked? and File.exist?(@log_dir_dt.value)
-               new_dir = File.join(@log_dir_dt.value, "fuzzer-" + Time.now.to_f.to_s )
-               Dir.mkdir(new_dir)
-               scan_prefs[:scanlog_dir] = new_dir
-            end
-
+             if @logScanChats.checked?
+               scan_prefs[:scanlog_name] = @log_dir_dt.value unless @log_dir_dt.value.empty?
+          end
+          
             @scanner = Watobo::Scanner2.new(chat_list, check_list, @project.passive_checks, scan_prefs)
             @pbar.total = @scanner.numTotalChecks
             @pbar.progress = 0
@@ -1136,29 +1134,29 @@ puts "run scanner"
                if @logScanChats.checked? then
                   @log_dir_text.enabled = true
                   @log_dir_label.enabled = true
-                  @log_dir_btn.enable
+                 # @log_dir_btn.enable
                else
                   @log_dir_text.enabled = false
                   @log_dir_label.enabled = false
-                  @log_dir_btn.disable
+                 # @log_dir_btn.disable
                end
             end
 
 
             @log_dir_dt = FXDataTarget.new('')
             #   @log_dir_dt.value = @project.scanLogDirectory() if File.exist?(@project.scanLogDirectory())
-            @log_dir_label = FXLabel.new(opt, "Scan-Log Directory:" )
+            @log_dir_label = FXLabel.new(opt, "Scan Name:" )
             scanlog_frame = FXHorizontalFrame.new(opt,:opts => LAYOUT_FILL_X|LAYOUT_SIDE_TOP)
             @log_dir_text = FXTextField.new(scanlog_frame, 20,
             :target => @log_dir_dt, :selector => FXDataTarget::ID_VALUE,
             :opts => TEXTFIELD_NORMAL|LAYOUT_FILL_COLUMN)
             @log_dir_text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-            @log_dir_btn = FXButton.new(scanlog_frame, "Change")
+           # @log_dir_btn = FXButton.new(scanlog_frame, "Change")
             # @log_dir_btn.connect(SEL_COMMAND, method(:selectLogDirectory))
 
             @log_dir_text.enabled = false
             @log_dir_label.enabled = false
-            @log_dir_btn.disable
+            #@log_dir_btn.disable
 
 
 

data/lib/watobo/gui/intercept_filter_dialog.rb

@@ -0,0 +1,210 @@
+# .
+# intercept_filter_dialog.rb
+# 
+# Copyright 2012 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
+# .
+module Watobo
+  module Gui
+    class InterceptFilterDialog < FXDialogBox
+
+      include Responder
+      def getRequestFilter()
+        @request_filter
+      end
+
+      def getResponseFilter()
+        @response_filter
+      end
+
+      def initialize(owner, settings = {} )
+        super(owner, "Rewrite Settings", DECOR_ALL, :width => 300, :height => 425)
+
+        @request_filter = { }
+
+        @response_filter = { }
+
+        @request_filter.update settings[:request_filter_settings]
+        @response_filter.update settings[:response_filter_settings]
+
+        FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
+
+        base_frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
+        @tabbook = FXTabBook.new(base_frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+        buttons_frame = FXHorizontalFrame.new(base_frame, :opts => LAYOUT_FILL_X)
+        @req_opt_tab = FXTabItem.new(@tabbook, "Request Options", nil)
+        frame = FXVerticalFrame.new(@tabbook, :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        scroll_window = FXScrollWindow.new(frame, SCROLLERS_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        @req_opt_frame = FXVerticalFrame.new(scroll_window, :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+        @resp_opt_tab = FXTabItem.new(@tabbook, "Response Options", nil)
+        frame= FXVerticalFrame.new(@tabbook, :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        scroll_window = FXScrollWindow.new(frame, SCROLLERS_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        @resp_opt_frame = FXVerticalFrame.new(scroll_window, :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+        initRequestFilterFrame()
+        updateRequestFilterFrame()
+
+        initResponseFilterFrame()
+        updateResponseFilterFrame()
+
+        @finishButton = FXButton.new(buttons_frame, "Accept" ,  nil, nil, :opts => BUTTON_NORMAL|LAYOUT_RIGHT)
+        @finishButton.enable
+        @finishButton.connect(SEL_COMMAND) do |sender, sel, item|
+        #self.handle(self, FXSEL(SEL_COMMAND, ID_CANCEL), nil)
+          self.handle(self, FXSEL(SEL_COMMAND, ID_ACCEPT), nil)
+        end
+
+        @cancelButton = FXButton.new(buttons_frame, "Cancel" ,
+        :target => self, :selector => FXDialogBox::ID_CANCEL,
+        :opts => BUTTON_NORMAL|LAYOUT_RIGHT)
+      end
+
+      private
+
+      def onAccept(sender, sel, event)
+        #TODO: Check if regex is valid
+        @request_filter[:method_filter] = @method_filter_dt.value
+        @request_filter[:negate_method_filter] = @neg_method_filter_cb.checked?
+        @request_filter[:negate_url_filter] = @neg_url_filter_cb.checked?
+        @request_filter[:url_filter] = @url_filter_dt.value
+        @request_filter[:file_type_filter] = @ftype_filter_dt.value
+        @request_filter[:negate_file_type_filter] = @neg_ftype_filter_cb.checked?
+
+        @request_filter[:parms_filter] = @parms_filter_dt.value
+        @request_filter[:negate_parms_filter] = @neg_parms_filter_cb.checked?
+
+        @response_filter[:content_type_filter] = @content_type_filter_dt.value
+        @response_filter[:negate_content_type_filter] = @neg_ctype_filter_cb.checked?
+
+        @response_filter[:response_code_filter] =  @rcode_filter_dt.value
+        @response_filter[:negate_response_code_filter] = @neg_rcode_filter_cb.checked?
+
+        getApp().stopModal(self, 1)
+        self.hide()
+        return 1
+      end
+
+      def updateRequestFilterFrame()
+        @parms_filter.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+        @url_filter.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+        @ftype_filter.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+        @method_filter.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+      end
+
+      def updateResponseFilterFrame()
+        @content_type_filter.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+        @rcode_filter.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+      # @neg_rcode_filter_cb.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+      # @neg_ctype_filter_cb.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+      end
+
+      def initResponseFilterFrame()
+
+        gbframe = FXGroupBox.new(@resp_opt_frame, "Content Type", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        frame = FXVerticalFrame.new(gbframe, :opts => LAYOUT_FILL_X, :padding => 0)
+        fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
+        fxtext.backColor = fxtext.parent.backColor
+        fxtext.disable
+        text = "Regular expression for HTTP Content-Type. E.g., '(text|script)'"
+        fxtext.setText(text)
+        @content_type_filter_dt = FXDataTarget.new('')
+        @content_type_filter_dt.value = @response_filter[:content_type_filter]
+        @content_type_filter = FXTextField.new(frame, 20, :target => @content_type_filter_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        @neg_ctype_filter_cb = FXCheckButton.new(frame, "Negate Filter", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        #@neg_method_filter_cb.checkState = false
+        @neg_ctype_filter_cb.checkState = @response_filter[:negate_content_type_filter]
+
+        gbframe = FXGroupBox.new(@resp_opt_frame, "Response Code", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        frame = FXVerticalFrame.new(gbframe, :opts => LAYOUT_FILL_X, :padding => 0)
+        fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
+        fxtext.backColor = fxtext.parent.backColor
+        fxtext.disable
+        text = "Regular expression for HTTP Content-Type. E.g., '200'"
+        fxtext.setText(text)
+        @rcode_filter_dt = FXDataTarget.new('')
+        @rcode_filter_dt.value = @response_filter[:response_code_filter]
+
+        @rcode_filter = FXTextField.new(frame, 20, :target => @rcode_filter_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        @neg_rcode_filter_cb = FXCheckButton.new(frame, "Negate Filter", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        #@neg_method_filter_cb.checkState = false
+        @neg_rcode_filter_cb.checkState = @response_filter[:negate_response_code_filter]
+
+      end
+
+      def initRequestFilterFrame()
+        gbframe = FXGroupBox.new(@req_opt_frame, "URL Filter", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        frame = FXVerticalFrame.new(gbframe, :opts => LAYOUT_FILL_X, :padding => 0)
+        fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
+        fxtext.backColor = fxtext.parent.backColor
+        fxtext.disable
+        text = "Regular Expression Filter For URL. E.g., '.*www.mysite.com.*login.php'"
+        fxtext.setText(text)
+
+        @url_filter_dt = FXDataTarget.new('')
+        @url_filter_dt.value = @request_filter[:url_filter]
+        @url_filter = FXTextField.new(frame, 20, :target => @url_filter_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        @neg_url_filter_cb = FXCheckButton.new(frame, "Negate Filter", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        #@neg_url_filter_cb.checkState = false
+        @neg_url_filter_cb.checkState = @request_filter[:negate_url_filter]
+
+        gbframe = FXGroupBox.new(@req_opt_frame, "Method Filter", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        frame = FXVerticalFrame.new(gbframe, :opts => LAYOUT_FILL_X, :padding => 0)
+        fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
+        fxtext.backColor = fxtext.parent.backColor
+        fxtext.disable
+        text = "Regular expression for HTTP method. E.g., '(get|PoSt)'"
+        fxtext.setText(text)
+        @method_filter_dt = FXDataTarget.new('')
+        @method_filter_dt.value = @request_filter[:method_filter]
+        @method_filter = FXTextField.new(frame, 20, :target => @method_filter_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        @neg_method_filter_cb = FXCheckButton.new(frame, "Negate Filter", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        #@neg_method_filter_cb.checkState = false
+        @neg_method_filter_cb.checkState = @request_filter[:negate_method_filter]
+
+        gbframe = FXGroupBox.new(@req_opt_frame, "Parm Filter", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        frame = FXVerticalFrame.new(gbframe, :opts => LAYOUT_FILL_X, :padding => 0)
+        fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
+        fxtext.backColor = fxtext.parent.backColor
+        fxtext.disable
+        text = "Regular Expression Filter For Parameter Names. E.g., for intercepting requests containing parameters beginning with 'act' use the regex pattern '^act.*' (without single quotes)"
+        fxtext.setText(text)
+        @parms_filter_dt = FXDataTarget.new('')
+        @parms_filter_dt.value = @request_filter[:parms_filter]
+        @parms_filter = FXTextField.new(frame, 20, :target => @parms_filter_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        @neg_parms_filter_cb = FXCheckButton.new(frame, "Negate Filter", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        #@neg_parm_filter_cb.checkState = false
+        @neg_parms_filter_cb.checkState = @request_filter[:negate_parms_filter]
+
+        gbframe = FXGroupBox.new(@req_opt_frame, "File Type Filter", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        frame = FXVerticalFrame.new(gbframe, :opts => LAYOUT_FILL_X, :padding => 0)
+        fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
+        fxtext.backColor = fxtext.parent.backColor
+        fxtext.disable
+        text = "Regular expression for file types by its extension. E.g., for intercepting requests where file type is PHP use '^php$' (without single quotes)"
+        fxtext.setText(text)
+        @ftype_filter_dt = FXDataTarget.new('')
+        @ftype_filter_dt.value = @request_filter[:file_type_filter]
+        @ftype_filter = FXTextField.new(frame, 20, :target => @ftype_filter_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        @neg_ftype_filter_cb = FXCheckButton.new(frame, "Negate Filter", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        #@neg_parm_filter_cb.checkState = false
+        @neg_ftype_filter_cb.checkState = @request_filter[:negate_file_type_filter]
+      end
+    end
+  end
+end

data/lib/watobo/gui/interceptor_gui.rb

@@ -24,6 +24,7 @@ module Watobo
     class InterceptEditor < FXVerticalFrame
       
       include Watobo::Constants
+      include Watobo::Interceptor
       include Watobo::Gui::Utils
       
       def initialize(owner, opts)
@@ -411,6 +412,7 @@ module Watobo
 
       include Responder
       include Watobo
+      include Watobo::Interceptor
       include Watobo::Gui::Icons
       def execute
         create
@@ -465,13 +467,13 @@ module Watobo
         end
       end
 
-      def initialize(owner, interceptor, opts)
+      def initialize(owner, opts)
         # Invoke base class initialize function first
 
         super( owner, 'Interceptor', nil, nil, DECOR_ALL|DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE, 0, 0, 600, 400, 0, 0, 0, 0, 0, 0)
         self.connect(SEL_CLOSE, method(:onClose))
         self.icon = ICON_INTERCEPTOR
-        @interceptor = interceptor
+        #@interceptor = interceptor
 
         @request_list = []
         @response_list = []
@@ -491,23 +493,39 @@ module Watobo
         #log_frame = FXVerticalFrame.new(mr_splitter, :opts => LAYOUT_FILL_X|LAYOUT_SIDE_BOTTOM,:height => 100)
 
         filter_frame = FXVerticalFrame.new(top_splitter, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y||LAYOUT_FIX_HEIGHT|LAYOUT_BOTTOM)
-        FXLabel.new(filter_frame, "Intercept:" )
-        @intercept_request = FXCheckButton.new(filter_frame, "Requests", nil, 0,
+         gbframe = FXGroupBox.new(filter_frame, "Intercept", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        frame = FXVerticalFrame.new(gbframe, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
+      #  FXLabel.new(filter_frame, "Intercept:" )
+        @intercept_request = FXCheckButton.new(frame, "Requests", nil, 0,
         ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
         @intercept_request.connect(SEL_COMMAND, method(:onInterceptChanged))
 
-        @intercept_response = FXCheckButton.new(filter_frame, "Response", nil, 0,
+        @intercept_response = FXCheckButton.new(frame, "Response", nil, 0,
         ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
         @intercept_response.connect(SEL_COMMAND, method(:onInterceptChanged))
-
-        @filter_options_btn = FXButton.new(filter_frame, "Filter Options", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_LEFT)
+        @filter_options_btn = FXButton.new(frame, "Options", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_LEFT)
         @filter_options_btn.connect(SEL_COMMAND, method(:onBtnFilterOptions))
+        
+        gbframe = FXGroupBox.new(filter_frame, "Rewrite", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        frame = FXVerticalFrame.new(gbframe, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
+        #FXLabel.new(filter_frame, "Rewrite:" )
+        @rewrite_request = FXCheckButton.new(frame, "Requests", nil, 0,
+        ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        @rewrite_request.connect(SEL_COMMAND, method(:onInterceptChanged))
+
+        @rewrite_response = FXCheckButton.new(frame, "Response", nil, 0,
+        ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        @rewrite_response.connect(SEL_COMMAND, method(:onInterceptChanged))
+
+ @rewrite_options_btn = FXButton.new(frame, "Options", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_LEFT)
+        @rewrite_options_btn.connect(SEL_COMMAND){ open_rewrite_options_dialog }
+       
         #@intercept_request.checkState = false
         #@intercept_response.checkState = false
-        unless @interceptor.nil?
+        if Watobo::Interceptor.active?
 
-          @intercept_request.checkState = @interceptor.mode & INTERCEPT_REQUEST > 0
-          @intercept_response.checkState = @interceptor.mode & INTERCEPT_RESPONSE > 0
+          @intercept_request.checkState = Watobo::Interceptor.intercept_requests?
+          @intercept_response.checkState = Watobo::Interceptor.intercept_requests?
         end
 
         view_frame = FXVerticalFrame.new(top_splitter, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y||LAYOUT_FIX_HEIGHT|LAYOUT_BOTTOM)
@@ -702,7 +720,7 @@ end
 
       #    def onHide
       #      #  puts "* hiding interceptor"
-      #      @interceptor.mode = INTERCEPT_NONE
+      #      Watobo::Interceptor.intercept_mode = INTERCEPT_NONE
       #      @mutex.synchronize {
       #        @cv.signal
       #      }
@@ -711,7 +729,8 @@ end
       def onClose(sender, sel, ptr)
         puts "* closing Interceptor UI"
         puts "+ stop intercepting"
-        @interceptor.mode = INTERCEPT_NONE
+        Watobo::Interceptor.intercept_mode = INTERCEPT_NONE
+        Watobo::Interceptor.rewrite_mode = REWRITE_NONE
         puts "+ release all interceptions"
         releaseAll()
         #getApp().stopModal(self, 1)
@@ -756,24 +775,41 @@ end
       def onBtnFilterOptions(sender, sel, ptr)
 
         dlg = Watobo::Gui::InterceptorFilterSettingsDialog.new( self,
-        :request_filter_settings => @interceptor.getRequestFilter(),
-        :response_filter_settings => @interceptor.getResponseFilter()
+        :request_filter_settings => Interceptor.proxy.getRequestFilter(),
+        :response_filter_settings => Interceptor.proxy.getResponseFilter()
         )
         if dlg.execute != 0 then
         # TODO: Apply interceptor settings
-        @interceptor.setRequestFilter(dlg.getRequestFilter)
-        @interceptor.setResponseFilter(dlg.getResponseFilter)
+        Interceptor.proxy.setRequestFilter(dlg.getRequestFilter)
+        Interceptor.proxy.setResponseFilter(dlg.getResponseFilter)
         end
 
       end
+      
+      def open_rewrite_options_dialog
+        dlg = Watobo::Gui::RewriteRulesDialog.new( self )
+        if dlg.execute != 0 then
+        # TODO: Apply interceptor settings
+        Interceptor::RequestCarver.set_carving_rules dlg.request_rules
+        Interceptor::ResponseCarver.set_carving_rules dlg.response_rules
+        end
+      end
 
       def onInterceptChanged(sender, sel, ptr)
         begin
-          unless @interceptor.nil? then
-            @interceptor.mode = @intercept_response.checked? ? INTERCEPT_RESPONSE : 0
-            @interceptor.mode |= @intercept_request.checked? ? INTERCEPT_REQUEST : 0
-          #puts @interceptor.mode
-          end
+         # unless @interceptor.nil? then
+            mode = @intercept_response.checked? ? INTERCEPT_RESPONSE : 0
+            mode |= @intercept_request.checked? ? INTERCEPT_REQUEST : 0
+            #Watobo::Interceptor.intercept_mode = @intercept_response.checked? ? INTERCEPT_RESPONSE : 0
+           # Watobo::Interceptor.intercept_mode |= @intercept_request.checked? ? INTERCEPT_REQUEST : 0
+          #puts Watobo::Interceptor.intercept_mode
+         # puts "New Proxy Mode: #{mode}"
+          Watobo::Interceptor.intercept_mode = mode
+          
+          mode = @rewrite_request.checked? ? REWRITE_REQUEST : 0
+          mode |= @rewrite_response.checked? ? REWRITE_RESPONSE : 0
+          Watobo::Interceptor.rewrite_mode = mode
+         # end
         rescue => bang
           puts bang
           puts bang.backtrace if $DEBUG
@@ -785,6 +821,8 @@ end
     class InterceptorFilterSettingsDialog < FXDialogBox
 
       include Responder
+      include Watobo::Interceptor
+      
       def getRequestFilter()
         @request_filter
       end

data/lib/watobo/gui/interceptor_settings_dialog.rb

@@ -23,10 +23,15 @@ module Watobo
   module Gui
     
     class InterceptorSettingsFrame < FXVerticalFrame
+        
       
       def getSettings()
         settings = Hash.new
         settings[:port] = @port_dt.value
+        settings[:bind_addr] = @bind_addr_dt.value
+        mode = Watobo::Interceptor::MODE_REGULAR
+        mode = Watobo::Interceptor::MODE_TRANSPARENT if @transparent_mode_chk.checked?
+        settings[:proxy_mode] = mode
        
         
         
@@ -42,6 +47,10 @@ module Watobo
         return settings
       end
       
+      def transparent_mode?
+        @transparent_mode_chk.checked?
+      end
+      
       def addItem(list_box, item)   
         if item != "" then
           list_item = list_box.appendItem("#{item}")
@@ -63,12 +72,34 @@ module Watobo
         #@settings = interceptor_settings
         scroller = FXScrollWindow.new(self, :opts => SCROLLERS_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y)
         scroll_area = FXVerticalFrame.new(scroller, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
-        
-        gbox = FXGroupBox.new(scroll_area, "Listening Port", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
-        gbox_frame = FXVerticalFrame.new(gbox, :opts => LAYOUT_SIDE_TOP|PACK_UNIFORM_WIDTH)
+         gbox = FXGroupBox.new(scroll_area, "Transparent Mode", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+         gbox_frame = FXVerticalFrame.new(gbox, :opts => LAYOUT_SIDE_TOP)
+          @transparent_mode_chk = FXCheckButton.new(gbox_frame, "enable", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP|LAYOUT_LEFT)
+          @transparent_mode_chk.setCheck false
+          if RUBY_PLATFORM =~ /linux|bsd|solaris|hpux|darwin/i
+            @transparent_mode_chk.setCheck true if Watobo::Conf::Interceptor.proxy_mode == Watobo::Interceptor::MODE_TRANSPARENT            
+          else
+            @transparent_mode_chk.disable
+            note = FXLabel.new(gbox_frame, "Transparent Mode Not Available On This Platform.")
+            note.textColor = FXColor::Red
+            
+          end
+         
+        gbox = FXGroupBox.new(scroll_area, "Listener", LAYOUT_SIDE_RIGHT|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
+        #gbox_frame = FXVerticalFrame.new(gbox, :opts => LAYOUT_SIDE_TOP|PACK_UNIFORM_WIDTH)
+       frame = FXMatrix.new(gbox, 2, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+
+      # frame = FXHorizontalFrame.new(gbox_frame, :opts => LAYOUT_FILL_X)
+        FXLabel.new(frame, "Bind Address:")
+        @bind_addr_dt = FXDataTarget.new(0)
+        #@port_dt.value = @settings[:port]
+        @bind_addr_dt.value = Watobo::Conf::Interceptor.bind_addr
+        bind_addr_txt = FXTextField.new(frame, 15, @bind_addr_dt, FXDataTarget::ID_VALUE, :opts => JUSTIFY_RIGHT|FRAME_GROOVE|FRAME_SUNKEN)
+        bind_addr_txt .handle(self, FXSEL(SEL_UPDATE, 0), nil)
        
-        frame = FXHorizontalFrame.new(gbox_frame, :opts => LAYOUT_FILL_X)
-        FXLabel.new(frame, "Listen Port:")
+       
+       # frame = FXHorizontalFrame.new(gbox_frame, :opts => LAYOUT_FILL_X)
+        FXLabel.new(frame, "Port:")
         @port_dt = FXDataTarget.new(0)
         #@port_dt.value = @settings[:port]
         @port_dt.value = Watobo::Conf::Interceptor.port
@@ -151,6 +182,9 @@ module Watobo
       include Responder
       attr :interceptor_settings
       
+      def transparent?
+        @interceptorSettingsFrame.transparent_mode?
+      end
       
       def onAccept(sender, sel, event)
         

data/lib/watobo/gui/list_box.rb

@@ -83,7 +83,8 @@ module Watobo
         end
 
         input_frame = FXHorizontalFrame.new(frame, :opts => LAYOUT_FILL_X)
-        @text = FXTextField.new(input_frame, 20, :target => @expath_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        #@text = FXTextField.new(input_frame, 20, :target => @expath_dt, :selector => FXDataTarget::ID_VALUE, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
+        @text = FXTextField.new(input_frame, 20, nil, 0, :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_LEFT|LAYOUT_FILL_X)
         @rem_btn = FXButton.new(input_frame, "Remove" , :opts => BUTTON_NORMAL|BUTTON_DEFAULT|LAYOUT_RIGHT)
         @add_btn = FXButton.new(input_frame, "Add" , :opts => BUTTON_NORMAL|BUTTON_DEFAULT|LAYOUT_RIGHT)
 

data/lib/watobo/gui/log_viewer.rb

@@ -23,10 +23,84 @@ module Watobo
   module Gui
     class LogViewer < FXVerticalFrame
 
+      include Watobo::Constants
+      def purge_logs
+        begin
+          @log_text_lock.synchronize do
+            @textbox.setText('')
+          # @textbox.makePositionVisible 0
+          end
+        rescue => bang
+          puts "! Could not purge logs"
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      end
+
+      def log(log_level, msg )
+
+        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
+          ""
+          end
+          @log_queue << log_text
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      end
+
+      def initialize(parent, mode = nil, opts)
+        opts[:padding]=0
+        @mode = :insert if mode.nil?
+
+        super(parent, opts)
+
+        @log_queue = Queue.new
+
+        @log_text_lock = Mutex.new
+
+        @textbox = FXText.new(self,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        @textbox.editable = false
+        start_update_timer
+      end
+
+      private
+
+      def start_update_timer
+        @timer = FXApp.instance.addTimeout( 150, :repeat => true) {
+          #print @log_queue.length
+          if @log_queue.length > 0
+            msg = @log_queue.deq
+            if @mode == :insert
+              @log_text_lock.synchronize do
+                 @textbox.insertText(0,msg)
+               end
+            else
+              @log_text_lock.synchronize do
+                 @textbox.appendText(msg)
+               end
+            end
+             @textbox.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+          end
+          }
+
+      end
+     
+    end
+
+    class LogViewer_UNUSED < FXVerticalFrame
+
       include Watobo::Constants
       def purge
         @lock.synchronize do
-          @log_viewer.text = ''
+          @textbox.text = ''
         end
       end
 
@@ -65,9 +139,9 @@ module Watobo
                unless @log_message.empty?
                  case @mode
                  when :insert
-             @log_viewer.insertText(0,@log_message)
+             @textbox.insertText(0,@log_message)
              when :append
-               @log_viewer.appendText(@log_message)
+               @textbox.appendText(@log_message)
              end
              end
              @log_message = nil
@@ -94,8 +168,8 @@ module Watobo
 
         #self.connect(SEL_CLOSE, method(:onClose))
 
-        @log_viewer = FXText.new(self,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-        @log_viewer.editable = false
+        @textbox = FXText.new(self,  nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        @textbox.editable = false
         start_update_timer
       end