watobo 0.9.9.pre3 → 0.9.9

data/lib/watobo/core/scanner.rb

@@ -197,75 +197,80 @@ module Watobo
       notify(:logger, LOG_INFO, msg )
       puts msg
       #scan_session = Time.now.to_i
-      
-      
+
       @active_checks.uniq.each do |mod|
-         check = mod
-         #check = mod.new(@prefs[:scan_session], @prefs ) if mod.respond_to? :new
-         puts "* subscribe for logout" if $DEBUG
-         check.subscribe(:logout) { |m|
-           next if @login_count > @max_login_count or @prefs[:auto_login] == false
-           if @login_mutex.try_lock
-              begin
-                m.waitLogin(true)
-                Watobo.print_debug("LOGOUT DETECTED") if $DEBUG
-                @login_count += 1
-                m.runLogin(@prefs[:login_chats])
-
-                m.waitLogin(false) if m
-              rescue => bang
-                  Watobo.print_debug("Could not relogin") if $DEBUG
-                  puts bang
-                  puts bang.backtrace if $DEBUG
-              ensure
-            
-              end
-              @login_mutex.unlock
-              end
+        check = mod
+        #check = mod.new(@prefs[:scan_session], @prefs ) if mod.respond_to? :new
+        puts "* subscribe for logout" if $DEBUG
+        check.subscribe(:logout) { |m|
+          next if @login_count > @max_login_count or @prefs[:auto_login] == false
+          if @login_mutex.try_lock
+            begin
+              m.waitLogin(true)
+              Watobo.print_debug("LOGOUT DETECTED") if $DEBUG
+              @login_count += 1
+              m.runLogin(@prefs[:login_chats])
+
+              m.waitLogin(false) if m
+            rescue => bang
+              Watobo.print_debug("Could not relogin") if $DEBUG
+              puts bang
+              puts bang.backtrace if $DEBUG
+            ensure
+
+            end
+          @login_mutex.unlock
+          end
 
         }
 
         puts "* subscribe for :check_finished" if $DEBUG
         check.clearEvents(:check_finished)
+
         check.subscribe(:check_finished) do |m, request, response|
         # update progress
-            @check_count ||= 0
-            @check_count += 1
-            puts "CheckCount: #{@check_count}" if $DEBUG
-              notify( :progress, m )
-              unless @prefs[:scanlog_name].nil?
-                if @prefs[:session_store].respond_to? :add_scan_log
-                  chat = Chat.new(request, response, :id => 0, :chat_source => @prefs[:chat_source])
-                  @prefs[:session_store].add_scan_log(chat, @prefs[:scanlog_name])
-                end
-              end
+          @check_count ||= 0
+          @check_count += 1
+          puts "CheckCount: #{@check_count}" if $DEBUG
+          notify( :progress, m )
+          unless @prefs[:scanlog_name].nil?
+            if @prefs[:session_store].respond_to? :add_scan_log
+              chat = Chat.new(request, response, :id => 0, :chat_source => @prefs[:chat_source])
+              @prefs[:session_store].add_scan_log(chat, @prefs[:scanlog_name])
             end
+          end
+        end
 
-        puts "* subscribe for :new_finding" if $DEBUG  
-        check.clearEvents(:new_finding)          
+        puts "* subscribe for :new_finding" if $DEBUG
+        check.clearEvents(:new_finding)
         check.subscribe(:new_finding) do |f|
-            #    p "* NEW FINDING"
-            #   p f.details[:module]
-              notify(:new_finding, f)
+        #    p "* NEW FINDING"
+        #   p f.details[:module]
+          notify(:new_finding, f)
         end
-      
-      end      
-      
+
+      end
+
       tlist = []
       @filtered_chat_list.uniq.each do |chat|
-         @active_checks.uniq.each do |mod|
-            print "---> #{mod.class}"
-            # accept Class- and Check-Types
-            check = mod
-           
-            # reset check counters and variables
-            check.reset()
-            if @prefs[:online_check] == false or siteAlive?(chat) then
-              @check_list << Thread.new(check, chat, check_prefs){|m, c, p|
-                 m.run_checks(c,p)
-                 notify(:logger, LOG_INFO, "finished checks: #{m.class} on chat #{c.id}")
-               }
-            end
+       # puts "CHAT --> #{chat.id}"
+        @active_checks.uniq.each do |mod|
+        #  puts "MOD"
+          print "---> #{mod.class}"
+          # accept Class- and Check-Types
+          check = mod
+
+          # reset check counters and variables
+          check.reset()
+          if @prefs[:online_check] == false or siteAlive?(chat) then
+            @check_list << Thread.new(check, chat, check_prefs){|m, c, p|
+              m_name = m.class.to_s.gsub(/.*::/,'')
+              notify(:module_started, m_name)
+              m.run_checks(c,p)
+              notify(:logger, LOG_INFO, "finished checks: #{m.class} on chat #{c.id}")
+              notify(:module_finished, m_name)
+            }
+          end
         end
       end
 
@@ -300,9 +305,9 @@ module Watobo
       @status = :stopped
 
       # @onlineCheck = OnlineCheck.new(@project)
-      m = "Initializing Scanner ..."
-      notify(:logger, LOG_INFO, m)
-      puts m
+      msg = "Initializing Scanner ..."
+      notify(:logger, LOG_INFO, msg)
+      puts msg
 
       @prefs = {
         #:root_path => [],
@@ -330,6 +335,7 @@ module Watobo
       puts @prefs.to_yaml if $DEBUG
 
       @filtered_chat_list = filteredChats(@chat_list, @prefs)
+      puts "#ActiveChecks: #{@active_checks.length}"
 
       @active_checks.uniq.each do |m|
         puts m.class

data/lib/watobo/core/session.rb

@@ -20,44 +20,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
 module Watobo
-    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 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
+    
 
     class Session
 
@@ -136,8 +99,12 @@ include Watobo::Constants
         begin
           @lasterror = nil
           response_header = nil
+          
+      
+          
           site = request.site
-          proxy = getProxy(site)
+       #   proxy = getProxy(site)
+          proxy = Watobo::ForwardingProxy.get(site)
 
           unless proxy.nil?
             host = proxy.host
@@ -183,7 +150,7 @@ include Watobo::Constants
           puts bang
           puts bang.backtrace if $DEBUG
         end
-
+        
         begin
           unless proxy.nil?
             # connection requires proxy
@@ -192,21 +159,22 @@ include Watobo::Constants
             # check for regular proxy authentication
             if request.is_ssl?
               socket, response_header = sslProxyConnect(request, proxy, current_prefs)
-              return socket, response_header, error_response("Could not connect to proxy #{proxy.name} (#{proxy.host}:#{proxy.port})\nReason: #{response_header}") if socket.nil?
+              return socket, response_header, error_response("Could Not Connect To Proxy: #{proxy.name} (#{proxy.host}:#{proxy.port})\n", "#{response_header}") if socket.nil?
               
               if current_prefs[:www_auth].has_key?(site)
                 case current_prefs[:www_auth][site][:type]
-                when AUTH_TYPE_NTLM
+                  when AUTH_TYPE_NTLM
                   #  puts "* found NTLM credentials for site #{site}"
-                  socket, response_header = wwwAuthNTLM(socket, request, current_prefs[:www_auth][site])
+                    socket, response_header = wwwAuthNTLM(socket, request, current_prefs[:www_auth][site])
 
-                  response_header.extend Watobo::Mixin::Parser::Url
-                  response_header.extend Watobo::Mixin::Parser::Web10
+                    response_header.extend Watobo::Mixin::Parser::Url
+                    response_header.extend Watobo::Mixin::Parser::Web10
 
-                else
-                  puts "* Unknown Authentication Type: #{current_prefs[:www_auth][site][:type]}"
-                end
+                  else
+                    puts "* Unknown Authentication Type: #{current_prefs[:www_auth][site][:type]}"
+                  end
               else
+                
                 data = request.join + "\r\n"
                 unless socket.nil?
                   socket.print data
@@ -218,7 +186,7 @@ include Watobo::Constants
             #  puts "* doProxyRequest"
             socket, response_header = doProxyRequest(request, proxy, current_prefs)
             #   puts socket.class
-            #   puts response_header.class
+            return socket, response_header, error_response("Could Not Connect To Proxy: #{proxy.name} (#{proxy.host}:#{proxy.port})\n", "#{response_header}") if socket.nil?
 
             return socket, request, response_header
           else
@@ -249,9 +217,10 @@ include Watobo::Constants
             uri_cache = request.removeURI #if proxy.nil?
 
             # puts "========== Add Headers"
-            request.addHeader("Connection", "Close") #if not use_proxy
-            request.addHeader("Proxy-Connection", "Close") #if not use_proxy
-            request.addHeader("Accept-Encoding", "None") #don't want encoding
+           # request.addHeader("Connection", "Close") #if not use_proxy
+            request.addHeader("Proxy-Connection", "Close") unless proxy.nil?
+           # request.addHeader("Accept-Encoding", "gzip;q=0;identity; q=0.5, *;q=0") #don't want encoding
+            
 
             if current_prefs[:www_auth].has_key?(site)
               case current_prefs[:www_auth][site][:type]
@@ -267,10 +236,16 @@ include Watobo::Constants
               end
             else
 
-              data = request.join + "\r\n"
-
-              unless socket.nil?
+              data = request.join 
+              data << "\r\n" unless request.has_body?
+              
+              unless socket.nil?                
                 socket.print data
+             #   if socket.is_a? OpenSSL::SSL::SSLSocket
+             #     socket.io.shutdown(0)
+             #   else
+             #     socket.shutdown(0)
+             #   end
                 response_header = readHTTPHeader(socket, current_prefs)
               end
               # RESTORE URI FOR HISTORY/LOG
@@ -282,6 +257,7 @@ include Watobo::Constants
 
         rescue Errno::ECONNREFUSED
           response = error_response "connection refused (#{host}:#{port})"
+          puts response
           socket = nil
         rescue Errno::ECONNRESET
           response = error_response "connection reset (#{host}:#{port})"
@@ -311,7 +287,7 @@ include Watobo::Constants
           puts bang
           puts bang.backtrace if $DEBUG
         end
-        
+        puts response
         return socket, request, response
       end
 
@@ -520,7 +496,7 @@ end
       def readHTTPBody(socket, response, request, prefs={})
         clen = response.content_length
         data = ""
-        #   timeout(5) do
+      
         begin
           if response.is_chunked?
             Watobo::HTTP.readChunkedBody(socket) { |c|
@@ -532,28 +508,30 @@ end
               data += c
               break if data.length == clen
             }
-          else
+          elsif clen < 0
             # puts "* no content-length information ... mmmmmpf"
-            eofcount = 0
+           # eofcount = 0
             Watobo::HTTP.read_body(socket) do |c|
               data += c
             end
 
           end
+          
+          response.push data unless data.empty?
+          unless prefs[:ignore_logout]==true  or @session[:logout_signatures].empty?
+            notify(:logout, self) if loggedOut?(response)
+          end
+
+          update_sids(request.host, response) if prefs[:update_sids] == true
+          return true
+   
         rescue => e
           puts "! Could not read response"
           puts e
           # puts e.backtrace
         end
-        # end
-
-        response.push data
-        unless prefs[:ignore_logout]==true  or @session[:logout_signatures].empty?
-          notify(:logout, self) if loggedOut?(response)
-        end
-
-        update_sids(request.host, response) if prefs[:update_sids] == true
 
+        return false
       end
 
       private
@@ -1087,12 +1065,14 @@ end
       def error_response(msg, comment=nil)
         er = []
       er << "HTTP/1.1 504 Gateway Timeout\r\n"
-      er << "WATOBO: #{msg}\r\n"
+      er << "WATOBO: #{msg.gsub(/\r?\n/," ").strip}\r\n"
       er << "Content-Length: 0\r\n"
       er << "Connection: close\r\n"
       er << "\r\n"
-      er << "<H1>#{msg}</H1>"
-      er << "<H2>#{comment}</H2>" unless comment.nil?
+      unless comment.nil?
+      body = "<H1>#{msg}</H1></br><H2>#{comment.gsub(/\r?\n/,"</br>")}</H2>" 
+      er << body
+      end
        er.extend Watobo::Mixin::Parser::Url
         er.extend Watobo::Mixin::Parser::Web10
         er.extend Watobo::Mixin::Shaper::Web10
@@ -1101,10 +1081,19 @@ end
       end
       
       def readHTTPHeader(socket, prefs={})
+        
         header = []
         msg = nil
         begin
+          # signal finished sending before reading
+          if socket.is_a? OpenSSL::SSL::SSLSocket
+            # socket.io.close_write
+          else
+             socket.close_write
+          end                
+                
           Watobo::HTTP.read_header(socket) do |line|
+            #puts line
             # puts line.unpack("H*")
             header.push line
           end
@@ -1210,15 +1199,17 @@ end
           #puts socket.class
           #if socket.class.to_s =~ /SSLSocket/
           if socket.is_a? OpenSSL::SSL::SSLSocket
-            socket.io.shutdown(2)
+           # socket.io.shutdown(2)
+           socket.sysclose
           else
             socket.shutdown(2)
           end
-          socket.close
+          socket.close if socket.respond_to? :close  
         rescue => bang
           puts bang
-          puts bang.backtrace if $DEBUG
+          puts bang.backtrace if $DEBUG        
         end
+        
       end
 
       def updateSessionSettings(settings={})
@@ -1245,7 +1236,8 @@ end
       def updateSession(request)
         @@session_lock.synchronize do
           if @session[:valid_sids].has_key?(request.host)
-            # puts "* found sid for site: #{request.site}"
+            valid_sids = @session[:valid_sids][request.host] 
+            puts "* found sid for site: #{request.site}" if $DEBUG
             request.map!{ |line|
               res = line
               @session[:sid_patterns].each do |pat|
@@ -1255,12 +1247,13 @@ end
                     sid_key = Regexp.quote($1.upcase)
                     old_value = $2
 
-                    if @session[:valid_sids][request.host].has_key?(sid_key) then
+                    if valid_sids.has_key?(sid_key) then
                       if not old_value =~ /#{@session[:valid_sids][request.host][sid_key]}/ then # sid value has changed and needs update
                         Watobo.print_debug("update session", "#{old_value} - #{@session[:valid_sids][request.host][sid_key]}") if $DEBUG
                         
-                        res = line.gsub!(/#{Regexp.quote(old_value)}/, @session[:valid_sids][request.host][sid_key])
-                        
+                        unless old_value.empty?
+                        res = line.gsub!(/#{Regexp.quote(old_value)}/, valid_sids[sid_key])
+                        end
                         if not res then puts "!!!could not update sid (#{sid_key})"; end
 
                       end

data/lib/watobo/core.rb

@@ -29,6 +29,6 @@
 
     end
 =end
-%w( project scanner session fuzz_gen http_socket interceptor passive_check active_check simple_ca cookie).each do |lib|
+%w( project scanner proxy session fuzz_gen http_socket interceptor passive_check active_check cookie request response intercept_filter intercept_carver forwarding_proxy cert_store netfilter_queue ).each do |lib|
   require File.join( "watobo", "core", lib)
 end

data/lib/watobo/framework/create_project.rb

@@ -20,29 +20,44 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
 module Watobo
+  @project_name = ''
+  @session_name = ''
+  @project = nil
+  
+  def self.project_name
+    @project_name
+  end 
+  
+  def self.session_name
+    @session_name
+  end
+ 
   def self.project
     @project
   end
+
   # create_project is a wrapper function to create a new project
   # you can either create a project by giving a URL (:url),
   # or by giving a :project_name AND a :session_name
   def self.create_project(prefs={})
     project_settings = Hash.new
-   # project_settings.update @settings
+    # project_settings.update @settings
 
     if prefs.has_key? :url
-    #TODO: create project_settings from url
-    else
-    project_settings[:project_name] = prefs[:project_name]
-    project_settings[:session_name] = prefs[:session_name]
+      #TODO: create project_settings from url
+      else
+      project_settings[:project_name] = prefs[:project_name]
+      project_settings[:session_name] = prefs[:session_name]
     end
 
-    ds = Watobo::DataStore.aquire(project_settings[:project_name], project_settings[:session_name])
-    
+    ds = Watobo::DataStore.acquire(project_settings[:project_name], project_settings[:session_name])
+    @project_name = project_settings[:project_name]
+    @session_name = project_settings[:session_name]
+
     # updating settings
     Watobo::Conf.load_project_settings(ds)
     Watobo::Conf.load_session_settings(ds)
-    
+
     project_settings[:session_store] = ds
 
     puts "= initialize passive checks ="
@@ -59,7 +74,7 @@ module Watobo
     project = Project.new(project_settings)
     #@running_projects << project
     @project = project
-    
+
   end
-  
+
 end

data/lib/watobo/framework/init.rb

@@ -25,6 +25,8 @@ module Watobo
   @passive_checks = []
   @running_projects = []
   
+  @tmp_dir
+  
   def self.running_projects
     @running_projects
   end
@@ -49,6 +51,10 @@ module Watobo
     init_passive_modules
   end
 
+  def self.temp_directory
+    @tmp_dir
+  end
+  
   def self.working_directory
     # puts "Method Obsolet! use Watobo::Conf::General.working_directory instead."
     Watobo::Conf::General.working_directory
@@ -143,6 +149,13 @@ module Watobo
         Dir.mkdir(cfg_dir)
         print "OK\n"
       end
+      
+      @tmp_dir = File.join(Conf::General.working_directory, "tmp")
+      unless File.exist? @tmp_dir
+        puts "* create temp directory '#{@tmp_dir}' ..."
+        Dir.mkdir(@tmp_dir)
+        print "OK\n"
+      end
     end
   end
 end

data/lib/watobo/gui/browser_preview.rb

@@ -201,6 +201,7 @@ module Watobo
             url = request.url
             url += request.query != '' ? '&' : '?'
             url += "WATOBOPreview=#{hashid}"
+            puts "PreviewURL: #{url}"
             @browser.navigate(url) if hashid
             return url
           else
@@ -232,7 +233,7 @@ module Watobo
 
       def watoboProxy?
 
-        aquireBrowser()
+        acquireBrowser()
 
         begin
           #@browser.visible = false
@@ -253,7 +254,7 @@ module Watobo
           puts "!!! Could not connect to proxy."
           puts bang
           puts bang.backtrace if $DEBUG
-          aquireBrowser(true)
+          acquireBrowser(true)
           retry
         end
       #  @browser.close
@@ -262,7 +263,7 @@ module Watobo
 
       end
 
-      def aquireBrowser( force = false )
+      def acquireBrowser( force = false )
         if @browser.nil? or force == true then
 # TODO: initialize a global GUI function on startup to check if necessary gems are installed
           case RUBY_PLATFORM
@@ -283,7 +284,7 @@ module Watobo
             end
 
           else # cygwin|java
-            puts "!!! Could not aquire browser control for preview (unsupported OS) !!!"
+            puts "!!! Could not acquire browser control for preview (unsupported OS) !!!"
           end
         elsif not @browser.ready?
           puts

data/lib/watobo/gui/checks_policy_frame.rb

@@ -65,6 +65,7 @@ module Watobo
 
       def getSelectedModules()
         sel = @tree.getCheckedData
+      
       #sel.map { |i| p i.class }
       end
 

data/lib/watobo/gui/client_cert_dialog.rb

@@ -27,7 +27,8 @@ module Watobo
 
       attr :client_certificates
       def savePasswords?()
-        @save_pws_cbt.checked?
+        return false
+        #@save_pws_cbt.checked?
       end
 
       include Responder
@@ -87,21 +88,25 @@ module Watobo
         :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT)
         FXButton.new(matrix, "Select").connect(SEL_COMMAND){ select_key_file }
 
-        matrix = FXMatrix.new(main_frame, 2, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+      #  matrix = FXMatrix.new(main_frame, 2, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X|LAYOUT_FILL_Y)
         FXLabel.new(matrix, "Password:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
         @password_txt = FXTextField.new(matrix, 25,
         :target => @password_dt, :selector => FXDataTarget::ID_VALUE,
         :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+        
+         FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
 
         FXLabel.new(matrix, "Retype:", nil, LAYOUT_TOP|JUSTIFY_RIGHT)
         @retype_txt = FXTextField.new(matrix, 25,
         :target => @retype_dt, :selector => FXDataTarget::ID_VALUE,
         :opts => TEXTFIELD_NORMAL|LAYOUT_SIDE_RIGHT|TEXTFIELD_PASSWD)
+        
+        FXButton.new(matrix, "", :opts=>FRAME_NONE).disable
 
-        @save_pws_cbt = FXCheckButton.new(matrix, "save passwords")
-        @save_pws_cbt.checkState = false
-        @save_pws_cbt.checkState = true if @password_policy[:save_passwords] == true
-        note_label = FXLabel.new(matrix, "This setting affects all passwords!!!")
+      # @save_pws_cbt = FXCheckButton.new(matrix, "save passwords")
+      #  @save_pws_cbt.checkState = false
+      #  @save_pws_cbt.checkState = true if @password_policy[:save_passwords] == true
+      #  note_label = FXLabel.new(matrix, "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)

data/lib/watobo/gui/conversation_table.rb

@@ -121,7 +121,7 @@ module Watobo
 
             return true if @filter[:request] and chat.request.join =~ /#{@filter[:text]}/i
 
-            if chat.response.content_type =~ /(text|javascript)/
+            if chat.response.content_type =~ /(text|javascript|xml)/
               return true if @filter[:response] and chat.response.join.unpack("C*").pack("C*") =~ /#{@filter[:text]}/i
             end
 
@@ -330,11 +330,14 @@ module Watobo
         rup = chat.request.urlparms
         unless rup.nil?
         ps << rup
-        end        
+        end     
+       
+        post_parms_string = ''
+        post_parms_string << chat.request.post_parms.join("&")   
         
-        if chat.request.method =~ /POST/ then
+        if chat.request.method =~ /POST/ and !post_parms_string.empty? then
           ps << "&&" unless ps.empty?
-          ps << chat.request.post_parms.join("&")        
+          ps << post_parms_string         
         end