watobo 0.9.13 → 0.9.14

data/plugins/crawler/gui.rb

@@ -19,97 +19,9 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-if $0 == __FILE__
-  inc_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib"))
-  $: << inc_path
- 
-  require 'watobo'
-  require 'fox16'
-  
-  include Fox
+require_relative 'crawler.rb'
 
-  # @private 
-module Watobo#:nodoc: all
-    module Gui
-    @application = FXApp.new('LayoutTester', 'FoxTest')  
- 
-  %w( load_icons gui_utils load_plugins session_history save_default_settings master_password session_history save_project_settings save_proxy_settings ).each do |l|
-  f = File.join("watobo","gui","utils", l)
-  require f
-  #puts "Loading #{f}"
-end
-
-require 'watobo/gui/utils/init_icons'
-
-gui_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib","watobo", "gui"))
-
-Dir.glob("#{gui_path}/*.rb").each do |cf|
-  next if File.basename(cf) == 'main_window.rb' # skip main_window here, because it must be loaded last
-  require File.join("watobo","gui", File.basename(cf))
-end
-
-require 'watobo/gui/templates/plugin'
-require 'watobo/gui/templates/plugin2'
-require File.join(File.expand_path(File.dirname(__FILE__)), "crawler")
-
-gui_path = File.join(File.expand_path(File.dirname(__FILE__)), "gui")
-
-%w( crawler_gui settings_tabbook general_settings_frame status_frame hooks_frame auth_frame scope_frame ).each do |l|
-  #puts "Loading >> #{l}"
-  require File.join(gui_path, l + ".rb")
-end
- 
-if ARGV.length > 0
-    url = ARGV[0]
-end
- 
-class TestGui < FXMainWindow
-    
-def initialize(app)
-# Call base class initializer first
-super(app, "Test Application", :width => 800, :height => 600)
-frame = FXVerticalFrame.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
-     
-button = FXButton.new(frame, "Open Plugin",:opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT,:padLeft => 10, :padRight => 10, :padTop => 5, :padBottom => 5)
-button.connect(SEL_COMMAND) {
-
-  dlg = Watobo::Plugin::Crawler::Gui.new(self)
-  
-  if dlg.execute != 0
-    puts dlg.details.to_yaml
-  end  
-}
-end
-    # Create and show the main window
-def create
-    super                  # Create the windows
-    show(PLACEMENT_SCREEN) # Make the main window appear
-    dlg = Watobo::Plugin::Crawler::Gui.new(self)
-    dlg.set_tab_index 2
-    prefs = { :form_auth_url => "http://www.google.com" }
-    dlg.settings.auth.set prefs
-      
-    if dlg.execute != 0
-        puts dlg.details.to_yaml
-    end  
-    end
-  end
-#  application = FXApp.new('LayoutTester', 'FoxTest')  
-  TestGui.new(@application)
-  @application.create
-  @application.run
-    end
-end 
-
-
-else
-
-require File.join(File.expand_path(File.dirname(__FILE__)), "crawler")
-
-gui_path = File.join(File.expand_path(File.dirname(__FILE__)), "gui")
 %w( crawler_gui settings_tabbook general_settings_frame status_frame hooks_frame auth_frame scope_frame ).each do |l|
  #puts "Loading >> #{l}"
-  require File.join(gui_path, l + ".rb")
+  require_relative File.join("gui", l)
 end
-
-end

data/plugins/crawler/lib/engine.rb

@@ -181,8 +181,10 @@ false
       end
 
       def run(url, opts={})
+        @engine_status = CRAWL_RUNNING
+        
         @opts.update opts
-           @opts[:head_request_pattern] = '' if @opts[:head_request_pattern].nil? 
+        @opts[:head_request_pattern] = '' if @opts[:head_request_pattern].nil? 
 
         @link_queue = Queue.new
         @page_queue = Queue.new
@@ -214,7 +216,7 @@ puts "---"
           @grabber_threads << g.run
         end
 
-        @engine_status = CRAWL_RUNNING
+        puts "* startet #{@grabber_threads.length} grabbers"
 
         loop do
           pagebag = @page_queue.deq
@@ -251,7 +253,8 @@ puts "---"
       private
 
 def current_status
-  { :engine_status => @engine_status,
+  { 
+    :engine_status => @engine_status,
     :link_size => @link_queue.size,
     :page_size => @page_queue.size
     }.update @stats

data/plugins/crawler/lib/grabber.rb

@@ -54,7 +54,7 @@ module Watobo#:nodoc: all
       end
 
       def run
-        Thread.new(@link_queue, @page_queue){ |lq, pq|
+        @grab_thread = Thread.new(@link_queue, @page_queue){ |lq, pq|
           loop do
             begin
               #link, referer, depth = lq.deq
@@ -69,12 +69,15 @@ module Watobo#:nodoc: all
             end
           end
         }
+         @grab_thread
       end
 
       def initialize(link_queue, page_queue, opts = {} )
         @link_queue = link_queue
         @page_queue = page_queue
         @opts = opts
+        @grab_thread = nil
+        
         begin
           @agent = Crawler::Agent.new(@opts)
     

data/plugins/sqlmap/bin/test.rb

@@ -34,8 +34,9 @@ module Watobo#:nodoc: all
  
   %w( load_icons gui_utils load_plugins session_history save_default_settings master_password session_history save_project_settings save_proxy_settings ).each do |l|
   f = File.join("watobo","gui","utils", l)
+  puts "SQLMap >> Loading #{f}"
   require f
-  puts "Loading #{f}"
+  
 end
 
 require 'watobo/gui/utils/init_icons'

data/plugins/sqlmap/gui.rb

@@ -19,9 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-require File.join(File.expand_path(File.dirname(__FILE__)), "sqlmap")
+require_relative 'sqlmap'
 
-gui_path = File.join(File.expand_path(File.dirname(__FILE__)), "gui")
 %w( main options_frame ).each do |l|
-  require File.join(gui_path, l + ".rb")
+  require_relative File.join('gui', l )
 end

data/plugins/sqlmap/sqlmap.rb

@@ -19,8 +19,6 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-path = File.expand_path(File.dirname(__FILE__))
-
 %w( sqlmap_ctrl ).each do |l|
-  require File.join(path, "lib", l)
+  require_relative File.join("lib", l )
 end

data/plugins/sslchecker/gui/sslchecker.rb

@@ -19,8 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-path = File.expand_path(File.dirname(__FILE__))
+#path = File.expand_path(File.dirname(__FILE__))
 
-require File.join(path, "..", "lib", "check.rb")
-require File.join(path, "cipher_table.rb")
-require File.join(path, "gui.rb")
+require_relative File.join( "..", "lib", "check")
+require_relative "cipher_table"
+require_relative "gui"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watobo
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -213,7 +213,6 @@ files:
 - lib/watobo/http_socket/connection.rb
 - lib/watobo/http_socket/http_socket.rb
 - lib/watobo/http_socket/ntlm_auth.rb
-- lib/watobo/http_socket/proxy.rb
 - lib/watobo/http_socket.rb
 - lib/watobo/interceptor/proxy.rb
 - lib/watobo/interceptor/transparent.rb
@@ -263,7 +262,6 @@ files:
 - modules/active/fileinclusion/lfi_simple.rb
 - modules/active/Flash/crossdomain.rb
 - modules/active/jboss/jboss_basic.rb
-- modules/active/RoR/cve_2013_015x.rb
 - modules/active/sap/its_commands.rb
 - modules/active/sap/its_services.rb
 - modules/active/sap/its_service_parameter.rb

data/lib/watobo/http_socket/proxy.rb

@@ -1,31 +0,0 @@
-# .
-# proxy.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 HTPSocket
-    class Proxy
-      def initialize()
-        
-      end
-    end
-  end
-end

data/modules/active/RoR/cve_2013_015x.rb

@@ -1,21 +0,0 @@
-# .
-# cve_2013_015x.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
-# .