watobo 0.9.9.pre2 → 0.9.9.pre3

data/CHANGELOG

@@ -5,13 +5,16 @@
 * ConversationTable: values in coloumn Parameters are url-decoded
 * Added a WebCrawler Plugin based on Mechanize
 * Manual Request Editor: Url is displayed in the window title
+* Menubar items are disabled if no project is defined
 
 == Fixes
 * CA Directory is now created in WATOBO working directory '.watobo'
 * Fixed Crash on opening client-certificate dialog
 * ConversationTable: GET and POST parameters are shown in the parameters coloumn 
 * TreeView-Pane: Show full conversation list when Findings tab is selected
-* smaller fixes
+* Fixed a bug in parsing post parameters
+* Also some minor bugs
+
 
 = Version 0.9.8
 == NEW

data/lib/watobo/core/project.rb

@@ -435,8 +435,10 @@ module Watobo
 
     def uniqueRequestHash(request)
       begin
+        extend_request(request) unless request.respond_to? :site
         hashbase = request.site + request.method + request.path
         request.get_parm_names.sort.each do |p|
+         # puts "URL-Parm: #{p}"
           if @scan_settings[:non_unique_parms].include?(p) then
           hashbase += p + request.get_parm_value(p)
           else
@@ -445,6 +447,7 @@ module Watobo
 
         end
         request.post_parm_names.sort.each do |p|
+         # puts "POST-Parm: #{p}"
           if @scan_settings[:non_unique_parms].include?(p) then
           hashbase += p + request.post_parm_value(p)
           else
@@ -452,6 +455,7 @@ module Watobo
           end
 
         end
+       # puts hashbase
         return Digest::MD5.hexdigest(hashbase)
       rescue => bang
         puts bang

data/lib/watobo/core/session.rb

@@ -350,9 +350,9 @@ include Watobo::Constants
               updateCSRFToken(csrf_cache, copy)
               socket, csrf_request, csrf_response = sendHTTPRequest(copy, opts)
               next if socket.nil?
-              puts "= Response Headers:"
-              puts csrf_response
-              puts "==="
+            #  puts "= Response Headers:"
+            #  puts csrf_response
+            #  puts "==="
               update_sids(csrf_request.host, csrf_response.headers)
               next if socket.nil?
               #  p "*"

data/lib/watobo/gui/main_window.rb

@@ -425,7 +425,8 @@ module Watobo
           puts ccdlg.client_certificates.to_yaml
           @project.client_certificates = ccdlg.client_certificates
           @iproxy.client_certificates = ccdlg.client_certificates
-          saveProjectSettings(@project)
+         # saveProjectSettings(@project)
+          Watobo::Gui.save_settings()
           # Watobo::Gui.save_default_settings(@project)
 
           end
@@ -650,6 +651,7 @@ module Watobo
         @last_request = nil
         @last_response = nil
         @iproxy.stop if @iproxy
+        disable_menu
 
       end
 
@@ -694,6 +696,7 @@ module Watobo
       def startProject(project)
 
         return false unless project.is_a? Project
+        enable_menu
 
         puts "DEBUG: starting project" if $DEBUG
         @project = project
@@ -956,7 +959,8 @@ module Watobo
           if dlg.execute != 0 then
           # puts dlg.scanner_settings.to_yaml
           @project.updateSettings(YAML.load(YAML.dump(dlg.scanner_settings)))
-          saveProjectSettings(@project)
+         # saveProjectSettings(@project)
+          Watobo::Gui.save_settings()
 
           end
         else
@@ -981,7 +985,8 @@ module Watobo
         dlg = Watobo::Gui::EditScopeDialog.new(self, @project, LAYOUT_FILL_X|LAYOUT_FILL_Y)
         if dlg.execute != 0 then
         @project.scope = YAML.load(YAML.dump(dlg.scope))
-        saveProjectSettings(@project)
+       # saveProjectSettings(@project)
+        Watobo::Gui.save_settings()
         refreshViewers()
         end
       end
@@ -1157,7 +1162,9 @@ module Watobo
 
         menu_bar = FXMenuBar.new(self, :opts => LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
 
+@menu_items = []
         file_menu_pane = FXMenuPane.new(self)
+       
         FXMenuTitle.new(menu_bar, "File" , :popupMenu => file_menu_pane)
         @file_new_menu = FXMenuCommand.new(file_menu_pane, "New/Open" )
         @file_new_menu.connect(SEL_COMMAND, method(:onNewProject))
@@ -1190,6 +1197,7 @@ module Watobo
         #  file_save_as_command = FXMenuCommand.new(file_menu_pane, "Save As..." )
 
         settings_menu_pane = FXMenuPane.new(self)
+         @menu_items << settings_menu_pane
         FXMenuTitle.new(menu_bar, "Settings" , :popupMenu => settings_menu_pane)
         menu_proxy = FXMenuCommand.new(settings_menu_pane, "Forwarding Proxy..." )
         menu_session = FXMenuCommand.new(settings_menu_pane, "Session Management..." )
@@ -1226,10 +1234,12 @@ module Watobo
         FXMenuTitle.new(menu_bar, "Tools" , :popupMenu => tools_menu_pane)
         transcoder = FXMenuCommand.new(tools_menu_pane, "Transcoder")
         interceptor = FXMenuCommand.new(tools_menu_pane, "Interceptor")
+         @menu_items << interceptor
         transcoder.connect(SEL_COMMAND, method(:onOpenTranscoder))
         interceptor.connect(SEL_COMMAND, method(:onOpenInterceptor))
 
         view_menu_pane = FXMenuPane.new(self)
+         @menu_items << view_menu_pane
         FXMenuTitle.new(menu_bar, "View" , :popupMenu => view_menu_pane)
         view_logs_command = FXMenuCommand.new(view_menu_pane, "Logs" )
         view_dashboard_command = FXMenuCommand.new(view_menu_pane, "Dashboard" )
@@ -1240,6 +1250,7 @@ module Watobo
         view_findings_command.connect(SEL_COMMAND, method(:showConversation))
 
         window_menu_pane = FXMenuPane.new(self)
+          @menu_items << window_menu_pane
         FXMenuTitle.new(menu_bar, "Window" , :popupMenu => window_menu_pane)
         use_small_icons = FXMenuCheck.new(window_menu_pane, "Small Icons/Text" )
         use_small_icons.connect(SEL_COMMAND) {
@@ -1595,6 +1606,7 @@ module Watobo
     #    if @foption_nocss.checked? then @doctype_TableFilter.concat(@fext_style);end
         
         add_queue_timer(50)
+        disable_menu
       end
 
       def create
@@ -1650,8 +1662,9 @@ module Watobo
         }
 
         project.subscribe(:settings_changed){
-          saveProjectSettings(project)
-          saveSessionSettings(project)
+        #  saveProjectSettings(project)
+         # saveSessionSettings(project)
+          Watobo::Gui.save_settings()
         }
       end
 
@@ -1813,6 +1826,29 @@ module Watobo
         end
       end
 
+      def disable_menu
+         @menu_items.each do |e|
+           e.disable if e.respond_to? :disable
+           if e.respond_to? :each_child
+             e.each_child do |c|
+               c.disable if c.respond_to? :disable
+             end
+           end
+         end
+      end
+      
+      def enable_menu
+         @menu_items.each do |e|
+           e.enable if e.respond_to? :enable
+           if e.respond_to? :each_child
+             e.each_child do |c|
+               c.enable if c.respond_to? :enable
+             end
+           end
+         end
+        
+      end
+      
       def purge_findings(findings)
         return false if @project.nil?
         findings.each do |f|

data/lib/watobo/gui/manual_request_editor.rb

@@ -989,7 +989,7 @@ end
             @request_viewer.setText('')
             @response_viewer.setText('')
             new_request = @req_builder.parseRequest
-
+            
             if new_request.nil?
                logger("Could not send request!")
                return false

data/lib/watobo/gui/table_editor.rb

@@ -149,7 +149,7 @@ module Watobo
                @request.removeHeader("Cookie")
                @request.addHeader("Cookie", cookies.join("; "))
             end
-            #  puts @request
+          
             @request
          end
 

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

@@ -44,6 +44,11 @@ module Watobo
 
         Watobo::Conf::General.save_project(Watobo.project.session_store)
         Watobo::Conf::Interceptor.save_project(Watobo.project.session_store)
+        
+        # also save global settings here
+        Watobo::Conf::General.save
+        Watobo::Conf::Interceptor.save
+      
         return true
       rescue => bang
         puts bang

data/lib/watobo/mixins/httpparser.rb

@@ -349,6 +349,7 @@ module Watobo
       include Watobo::Constants
       def post_parms
         parmlist=[]
+        return parmlist unless has_body?
         begin
         if self.last =~ /\=.*\&?/i
           parmlist = self.last.split(/\&/)

data/lib/watobo.rb

@@ -47,7 +47,7 @@ require 'watobo/framework'
 
 module Watobo
 
-  VERSION = "0.9.9.pre2"
+  VERSION = "0.9.9.pre3"
 
   def self.base_directory
     @base_directory ||= ""

data/plugins/crawler/gui/general_settings_frame.rb

@@ -96,7 +96,7 @@ module Watobo
             fxtext = FXText.new(iframe, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
             fxtext.backColor = fxtext.parent.backColor
             fxtext.disable
-            text = "To speed up the crawl process and to save bandwith it is recommended to use HEAD requests for specific document extensions."
+            text = "To speed up the crawl process and to save bandwidth it is recommended to use HEAD requests for specific document extensions."
             text << "The response to a HEAD request only includes the http headers but no body. The extensions pattern is defined as an regular expression,"
             text << "e.g. '(pdf|swf|doc|flv|jpg|png|gif)' - without single quotes."
 

data/plugins/crawler/gui/hooks_frame.rb

@@ -76,7 +76,7 @@ module Watobo
             fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|TEXT_WORDWRAP)
             fxtext.backColor = fxtext.parent.backColor
             fxtext.disable
-            text = "You can define a script which gets executed just before each connection. So you are able modify the Mechanize::Agent and Mechanize::Requests just before the request is send to the server.\n"
+            text = "You can define a script which gets executed just before each connection. So you are able to modify the Mechanize::Agent and Mechanize::Requests just before the request is sent to the server.\n"
             text << "For more information about pre_connection_hooks check the Mechanize homepage (http://mechanize.rubyforge.org/)."
 
             fxtext.setText(text)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watobo
 version: !ruby/object:Gem::Version
-  version: 0.9.9.pre2
+  version: 0.9.9.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize