watobo 0.9.9.pre3 → 0.9.9

data/lib/watobo/gui/status_bar.rb

@@ -20,69 +20,121 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
 module Watobo
-   module Gui
-      class StatusBar < FXHorizontalFrame
+  module Gui
+    class StatusBar < FXHorizontalFrame
+      def setStatusInfo( prefs={} )
+        cprefs = {
+          :color => self.parent.backColor,
+          :text => ''
+        }
 
-         def setStatusInfo( prefs={} )
-            cprefs = {
-               :color => self.parent.backColor,
-               :text => ''
-            }
+        cprefs.update prefs unless prefs.nil?
 
-            cprefs.update prefs unless prefs.nil?
+        @statusInfo.text = cprefs[:text]
+        unless cprefs[:color].nil?
+          @statusInfo.backColor = cprefs[:color]
+        end
+        
 
-            @statusInfo.text = cprefs[:text]
-            unless cprefs[:color].nil?
-               @statusInfo.backColor = cprefs[:color]
-            end
-         end
+      end
+      
+      def update_proxy_mode
+       # puts "Update Proxy Mode ..."
+        if Watobo::Conf::Interceptor.proxy_mode == Watobo::Interceptor::MODE_REGULAR
+       #   puts "REGULAR MODE"
+          @portNumber.backColor = @portNumber.parent.backColor
+          @port_label.backColor = @port_label.parent.backColor
+        else
+       #   puts "TRANSPARENT MODE"
+          @portNumber.backColor = FXColor::Red
+          @port_label.backColor = FXColor::Red
+        end
+      end
 
-         def statusInfoText=( new_text )
-            @statusInfo.text = new_text
-            @statusInfo.backColor = self.parent.backColor
-         end
+      def statusInfoText=( new_text )
+        @statusInfo.text = new_text
+        @statusInfo.backColor = self.parent.backColor
+      end
 
-         def projectName=(project_name)
-            @projectName.text = project_name
-         end
+      def projectName=(project_name)
+        @projectName.text = project_name
+      end
 
-         def sessionName=(session_name)
-            @sessionName.text = session_name
-         end
+      def sessionName=(session_name)
+        @sessionName.text = session_name
+      end
 
-         def portNumber=(port_number)
-            @portNumber.text = port_number
-         end
+      def portNumber=(port_number)
+        @portNumber.text = port_number
+      end
 
-         def forwardingProxy=(forward_proxy)
-            @forwardingProxy.text = forward_proxy
-         end
+      def forwardingProxy=(forward_proxy)
+        @forwardingProxy.text = forward_proxy
+      end
+      
+      def bindAddress=(bind_addr)
+        @bind_addr_label.text = "Bind-Addr: #{bind_addr} "
+      end
+
+      def initialize(owner, opts)
+        super(owner, opts)
+
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
+        FXLabel.new(frame, "Status: ")
+        @statusInfo = FXLabel.new(frame, "- no project started -")
 
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
+        FXLabel.new(frame, "Project: ")
+        @projectName = FXLabel.new(frame, " - ")
 
-         def initialize(owner, opts)
-            super(owner, opts)
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
+        FXLabel.new(frame, "Session: ")
+        @sessionName = FXLabel.new(frame, " - ")
+        
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
 
-            frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
-            FXLabel.new(frame, "Status: ")
-            @statusInfo = FXLabel.new(frame, "- no project started -")
+        #@bind_label = FXLabel.new(frame, "BindAddr: ")
+        @bind_addr_label = FXLabel.new(frame, "Bind-Addr: - ")
 
-            frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
-            FXLabel.new(frame, "Project: ")
-            @projectName = FXLabel.new(frame, " - ")
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
+
+        @port_label = FXLabel.new(frame, "Port: ")
+        # @port_label.connect(SEL_RIGHTBUTTONPRESS) { switch_proxy_mode }
+        @portNumber = FXLabel.new(frame, " - ")
+        # @portNumber.connect(SEL_RIGHTBUTTONPRESS) { switch_proxy_mode }
+
+        frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
+        FXLabel.new(frame, "Forwarding Proxy: ")
+        @forwardingProxy = FXLabel.new(frame, " - ")
+      end
 
-            frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
-            FXLabel.new(frame, "Session: ")
-            @sessionName = FXLabel.new(frame, " - ")
+      private
 
-            frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
-            FXLabel.new(frame, "Port: ")
-            @portNumber = FXLabel.new(frame, " - ")
+      def switch_proxy_mode
 
-            frame = FXHorizontalFrame.new(self, :opts => FRAME_SUNKEN, :padding => 0)
-            FXLabel.new(frame, "Forwarding Proxy: ")
-            @forwardingProxy = FXLabel.new(frame, " - ")
-         end
+        if RUBY_PLATFORM =~ /linux/i
+          puts "SWITCHING PROXY MODE ..."
+          if Watobo::Interceptor.proxy_mode == Watobo::Interceptor::MODE_TRANSPARENT
+            mode = "Regular"
+            #  Watobo::NFQueue.stop
+            Watobo::Interceptor.proxy_mode = Watobo::Interceptor::MODE_REGULAR
+          @portNumber.backColor = @portNumber.parent.backColor
+          @port_label.backColor = @port_label.parent.backColor
+          else
+            mode = "Transparent"
+            # t = Watobo::NFQueue.start
+            Watobo::Interceptor.proxy_mode = Watobo::Interceptor::MODE_TRANSPARENT
+            @portNumber.backColor = FXColor::Red
+            @port_label.backColor = FXColor::Red
+          # puts t.status
+          end
+          puts "current mode: #{mode}"
+        else
+          puts "COULD NOT SWITCH PROXY-MODE"
+          puts "Reason: Platform Not Supported"
+        end
       end
-      # class end
-   end
+    end
+  # class end
+  end
 end

data/lib/watobo/gui/table_editor.rb

@@ -205,7 +205,7 @@ module Watobo
             self.connect(SEL_DOUBLECLICKED) do |sender, sel, data|
                row = sender.getCurrentRow
                return nil unless row >= 0 and row < self.numRows
-               transcoder = FXTranscoder.new(FXApp.instance, self.getItemText(row, 2))
+               transcoder = TranscoderWindow.new(FXApp.instance, self.getItemText(row, 2))
                transcoder.create
                transcoder.show(Fox::PLACEMENT_SCREEN)
             end

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

@@ -22,37 +22,33 @@
 module Watobo
   class Plugin2 < FXDialogBox
     attr :plugin_name
-   # attr :icon
+    # attr :icon
 
     include Watobo::Gui
     include Watobo::Gui::Icons
-    
+
     @icon_file = nil
-  
-   
-  def self.get_icon
-    @icon_file
-  end
-  
-  def self.icon_file(icon_file)
-   # puts "Caller >> #{caller.class}"
-   # puts caller.to_yaml
-    
-    dummy = caller.first.split(":")
-    dummy.pop
-    file = dummy.join(":") 
-    
-    @icon_file = File.join(File.dirname(file), "..","icons", icon_file)
-  end
-  
-  
-  
-  def load_icon
-    icon = self.class.get_icon
-    puts "* loading icon > #{icon}"
-    self.icon = Watobo::Gui.load_icon(icon) unless icon.nil?
-  end
-    
+    def self.get_icon
+      @icon_file
+    end
+
+    def self.icon_file(icon_file)
+      # puts "Caller >> #{caller.class}"
+      # puts caller.to_yaml
+
+      dummy = caller.first.split(":")
+      dummy.pop
+      file = dummy.join(":")
+
+      @icon_file = File.join(File.dirname(file), "..","icons", icon_file)
+    end
+
+    def load_icon
+      icon = self.class.get_icon
+      puts "* loading icon > #{icon}"
+      self.icon = Watobo::Gui.load_icon(icon) unless icon.nil?
+    end
+
     def subscribe(event, &callback)
       (@event_dispatcher_listeners[event] ||= []) << callback
     end

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

@@ -28,8 +28,8 @@ module Watobo
         mp = ''
         save_pws = false
 
-        puts "= Master Password Settings ="
-        puts Watobo::Gui::MasterPW.settings.to_yaml
+        #   puts "= Master Password Settings ="
+        #   puts Watobo::Gui::MasterPW.settings.to_yaml
 
         if Watobo::Gui::MasterPW.save_passwords?
           save_pws = true
@@ -41,14 +41,14 @@ module Watobo
         Watobo.save_proxy_settings( :save_passwords => save_pws, :key => mp )
 
         Watobo::Gui.save_scanner_settings()
-
-        Watobo::Conf::General.save_project(Watobo.project.session_store)
-        Watobo::Conf::Interceptor.save_project(Watobo.project.session_store)
-        
+        unless Watobo.project.nil?
+          Watobo::Conf::General.save_project(Watobo.project.session_store)
+          Watobo::Conf::Interceptor.save_project(Watobo.project.session_store)
+        end
         # also save global settings here
         Watobo::Conf::General.save
         Watobo::Conf::Interceptor.save
-      
+
         return true
       rescue => bang
         puts bang
@@ -61,8 +61,8 @@ module Watobo
       mp = ''
       save_pws = false
 
-      puts "= Master Password Settings ="
-      puts Watobo::Gui::MasterPW.settings.to_yaml
+      #  puts "= Master Password Settings ="
+      #  puts Watobo::Gui::MasterPW.settings.to_yaml
 
       if Watobo::Gui::MasterPW.save_passwords?
         save_pws = true

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

@@ -20,7 +20,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
 module Watobo
-  def self.save_proxy_settings(prefs)
+  def self.save_proxy_settings(prefs={})
 
     c_prefs = {
       :save_passwords => false,
@@ -29,15 +29,31 @@ module Watobo
 
     c_prefs.update prefs
 
-    Watobo::Conf::ForwardingProxy.save_project(Watobo.project.session_store) do |s|
-      s.each do |name, proxy|
-        next unless proxy.is_a? Hash
-        unless c_prefs[:save_passwords] == false
-          unless c_prefs[:key].empty?
-          #asdfa
+    unless Watobo.project.nil?
+      Watobo::Conf::ForwardingProxy.save_project(Watobo.project.session_store) do |s|
+        s.each do |name, proxy|
+          next unless proxy.is_a? Hash
+          unless c_prefs[:save_passwords] == false
+            unless c_prefs[:key].empty?
+            #asdfa
+            end
+          else
+            proxy[:password] = ''
+          end
+        end
+      end
+    else
+
+      Watobo::Conf::ForwardingProxy.save do |s|
+        s.each do |name, proxy|
+          next unless proxy.is_a? Hash
+          unless c_prefs[:save_passwords] == false
+            unless c_prefs[:key].empty?
+            #asdfa
+            end
+          else
+            proxy[:password] = ''
           end
-        else
-          proxy[:password] = ''
         end
       end
     end

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

@@ -22,16 +22,19 @@
 module Watobo
   module Gui
     def self.save_scanner_settings()
-      return false if Watobo.project.nil?
+      unless Watobo.project.nil?
 
-      Watobo::Conf::Scanner.save_project(Watobo.project.session_store ){ |s|
-      # puts s.to_yaml
-        x
-      }
+        Watobo::Conf::Scanner.save_project(Watobo.project.session_store ){ |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)
+        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)
       return true
+      else
+        Watobo::Conf::Scanner.save
+      end
     end
   end
 end

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

@@ -80,7 +80,7 @@ module Watobo
         @history_entries.delete history_id(project_name, session_name)
       end
 
-      def update_usage(project_name, session_name)
+      def update_usage(prefs)
         t_now = Time.now.to_i
         return false unless prefs.has_key? :session_name or prefs.has_key? :project_name
         hid = history_id(prefs[:project_name], prefs[:session_name])

data/lib/watobo/gui/www_auth_dialog.rb

@@ -157,22 +157,23 @@ module Watobo
 
       NO_SELECTION = "no site selected"
       def savePasswords?()
-        @save_pws_cbt.checked?
+        return false
+        #@save_pws_cbt.checked?
       end
 
       include Responder
 
-      def initialize(owner, project, prefs={})
+      def initialize(owner)
 
         super(owner, "NTLM Authentication", :opts => DECOR_ALL)
-        @project = project
+        @project = Watobo.project
         FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
 
-        @password_policy = {
-          :save_passwords => false
-        }
+     #   @password_policy = {
+     #     :save_passwords => false
+     #   }
 
-        @password_policy.update prefs[:password_policy] if prefs.has_key? :password_policy
+      #  @password_policy.update prefs[:password_policy] if prefs.has_key? :password_policy
 
         @site_dt = FXDataTarget.new('')
         @username_dt = FXDataTarget.new('')
@@ -185,13 +186,13 @@ module Watobo
 
         top_frame = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_FILL_X)
 
-        @scope_only_cb = FXCheckButton.new(top_frame, "scope only", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
-        @scope_only_cb.setCheck(false)
+      #  @scope_only_cb = FXCheckButton.new(top_frame, "scope only", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
+      #  @scope_only_cb.setCheck(false)
 
-        if project.has_scope?
-        puts "project has scope defined"
-        end
-        @scope_only_cb.connect(SEL_COMMAND) { updateSitesCombo() }
+      #  if project.has_scope?
+      #  puts "project has scope defined"
+      #  end
+       # @scope_only_cb.connect(SEL_COMMAND) { updateSitesCombo() }
 
         @sites_combo = FXComboBox.new(top_frame, 5,  @site_dt, FXDataTarget::ID_VALUE,
         COMBOBOX_STATIC|FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
@@ -242,7 +243,8 @@ module Watobo
           end
         }
 
-        pas = @project.getWwwAuthentication()
+        #pas = @project.getWwwAuthentication()
+        pas = Watobo::Conf::Scanner.www_auth
         #   puts pas.to_yaml
         pas.each_key do |k|
           auth_settings = {
@@ -265,11 +267,11 @@ module Watobo
         @rem_auth_btn.connect(SEL_COMMAND){ remAuthenticationItem() }
         @rem_auth_btn.disable
 
-        frame = FXVerticalFrame.new(main_frame, :opts => LAYOUT_FILL_X)
-        @save_pws_cbt = FXCheckButton.new(frame, "save passwords")
-        @save_pws_cbt.checkState = false
-        @save_pws_cbt.checkState = true if @password_policy[:save_passwords] == true
-        note_label = FXLabel.new(frame, "This setting affects all passwords!!!")
+      #  frame = FXVerticalFrame.new(main_frame, :opts => LAYOUT_FILL_X)
+      #  @save_pws_cbt = FXCheckButton.new(frame, "save passwords")
+      #  @save_pws_cbt.checkState = false
+      #  @save_pws_cbt.checkState = true if @password_policy[:save_passwords] == true
+      #  note_label = FXLabel.new(frame, "This setting affects all passwords!!!")
 
         buttons = FXHorizontalFrame.new(main_frame, :opts => LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|PACK_UNIFORM_WIDTH,
         :padLeft => 40, :padRight => 40, :padTop => 20, :padBottom => 20)
@@ -291,10 +293,12 @@ module Watobo
       def updateSitesCombo()
         @sites_combo.clearItems
         @sites_combo.appendItem(NO_SELECTION, nil)
-        @project.listSites(:in_scope => @scope_only_cb.checked? ){ |site|
+        unless Watobo.project.nil?
+        Watobo.project.listSites(:in_scope => Watobo.project.has_scope? ){ |site|
         #puts "Site: #{site}"
           @sites_combo.appendItem(site, site)
         }
+        end
         @sites_combo.numVisible = @sites_combo.numItems >= 20 ? 20 : @sites_combo.numItems
         @sites_combo.setCurrentItem(0) if @sites_combo.numItems > 0
       end
@@ -332,7 +336,7 @@ module Watobo
           empty_passwords = true if settings[w3a][:password] == ''
         end
         unless empty_passwords == true then
-        @project.setWwwAuthentication(@auth_table.settings)
+        Watobo::Conf::Scanner.www_auth = @auth_table.settings
         #  puts @auth_table.settings.to_yaml
         getApp().stopModal(self, 1)
         self.hide()

data/lib/watobo/gui.rb

@@ -97,7 +97,8 @@ module Watobo
     end
     
     def self.check_first_run
-       file = File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "disclaimer.chk")
+       # file = File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "disclaimer.chk")
+       file = File.join(Watobo.working_directory, "disclaimer.chk")
        unless File.exists?(file)
           first_start_info = Watobo::Gui::AboutWatobo.new(@main_window)
          if first_start_info.execute != 0 then
@@ -117,6 +118,7 @@ end
 Watobo::Gui.create_application
 
 require 'watobo/gui/utils/init_icons'
+require 'watobo/gui/mixins/subscriber'
 
 gui_path = File.expand_path(File.join(File.dirname(__FILE__), "gui"))
 

data/lib/watobo/mixins/httpparser.rb

@@ -42,8 +42,8 @@ module Watobo
     module Url
       include Watobo::Constants
       def file
-        @file ||= nil
-        return @file unless @file.nil?
+        #@file ||= nil
+        #return @file unless @file.nil?
         if self.first =~ /^[^[:space:]]{1,} https?:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}[^\?]*\/(.*) HTTP.*/
           tmp = $1
           end_of_file_index = tmp.index(/\?/)
@@ -62,8 +62,8 @@ module Watobo
       end
 
       def file_ext
-        @file_ext ||= nil
-        return @file_ext unless @file_ext.nil?
+        #@file_ext ||= nil
+        #return @file_ext unless @file_ext.nil?
         if self.first =~ /^[^[:space:]]{1,} https?:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}[^\?]*\/(.*) HTTP.*/
           @file_ext = $1
         else
@@ -178,8 +178,8 @@ module Watobo
       end
 
       def proto
-        @proto ||= nil
-        return @proto unless @proto.nil?
+       # @proto ||= nil
+       # return @proto unless @proto.nil?
         @proto = "http" if self.first =~ /^[^[:space:]]{1,} http:\/\//i
         #  puts dummy
         @proto = "https" if self.first =~ /^[^[:space:]]{1,} https:\/\//i
@@ -200,8 +200,8 @@ module Watobo
       end
 
       def url
-        @url ||= nil
-        return @url unless @url.nil?
+        #@url ||= nil
+        #return @url unless @url.nil?
         if self.first =~ /^[^[:space:]]{1,} (https?:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}.*) HTTP\//i then
           @url = $1
         else
@@ -211,8 +211,8 @@ module Watobo
       end
 
       def site
-        @site ||= nil
-        return @site unless @site.nil?
+        #@site ||= nil
+        #return @site unless @site.nil?
         if self.first =~ /^[^[:space:]]{1,} (https?):\/\/([\-0-9a-zA-Z.]*)([:0-9]{0,6})/i then
           host = $2
           port_extension = $3
@@ -230,8 +230,8 @@ module Watobo
       end
 
       def host
-        @host ||= nil
-        return @host unless @host.nil?
+        #@host ||= nil
+        #return @host unless @host.nil?
         if self.first =~ /^[^[:space:]]{1,} https?:\/\/([\-0-9a-zA-Z.]*)[:0-9]{0,6}/i then
           @host = $1
         else
@@ -465,13 +465,40 @@ module Watobo
         return ct
       end
 
+def content_encoding
+        te = TE_NONE
+        self.each do |line|
+          break if line.strip.empty?
+          if line =~ /^Content-Encoding: (.*)/i then
+            dummy = $1.strip
+            puts "Content-Encoding => #{dummy}"
+            te = case dummy
+            when /chunked/i
+              TE_CHUNKED
+            when /compress/i
+              TE_COMPRESS
+            when /zip/i
+              TE_GZIP
+            when /deflate/i
+              TE_DEFLATE
+            when /identity/i
+              TE_IDENTITY
+            else
+              TE_NONE
+            end
+            break
+          end
+        end
+        return te
+      end
+      
       def transferEncoding
         te = TE_NONE
         self.each do |line|
           break if line.strip.empty?
           if line =~ /^Transfer-Encoding: (.*)/i then
             dummy = $1.strip
-            puts dummy
+           # puts dummy
             te = case dummy
             when 'chunked'
               TE_CHUNKED
@@ -491,6 +518,8 @@ module Watobo
         end
         return te
       end
+      
+      alias :transfer_encoding :transferEncoding
 
       def contentMD5
         b = self.body.nil? ? "" : self.body
@@ -578,9 +607,11 @@ end
           return ''
         end
         rescue => bang
+          if $DEBUG
           puts "! No Status Available !".upcase
           puts bang
-          puts bang.backtrace if $DEBUG
+          puts bang.backtrace
+          end 
           return nil
         end
       end
@@ -635,31 +666,7 @@ end
 
     end
 
-    ############################################################
-    # R E S P O N S E   P A R S E R   M I X I N
-    ###############################################################
-    module ResponseParser
-      def status
-        dummy = self.first
-
-        if dummy =~ /HTTP\/1.. (.*)/i then
-          return $1.chomp
-        else
-          return nil
-        end
-      end
-
-
-      def headers(&b)
-        header=[]
-        self.each do |line|
-          return header if line.strip.empty?
-          yield line if block_given?
-          header.push line
-        end
-        return nil
-      end
-end
+   
     end
   end
-end
+end