watobo 0.9.12 → 0.9.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (263) hide show
  1. data/.yardopts +2 -2
  2. data/{CHANGELOG → CHANGELOG.md} +62 -0
  3. data/README.md +30 -0
  4. data/bin/nfq_server.rb +4 -3
  5. data/bin/watobo_gui.rb +1 -1
  6. data/config/ott_cache.yml +4 -0
  7. data/config/scanner.yml +1 -18
  8. data/config/sid_cache.yml +14 -0
  9. data/extras/private-hostspot.sh +17 -0
  10. data/extras/watobo-installer.sh +61 -0
  11. data/extras/watobo-transparent.sh +38 -0
  12. data/icons/BestPractice_16x16.ico +0 -0
  13. data/icons/BestPractice_24x24.ico +0 -0
  14. data/lib/watobo/adapters/data_store.rb +25 -3
  15. data/lib/watobo/adapters/file/file_store.rb +19 -11
  16. data/lib/watobo/adapters/session_store.rb +3 -2
  17. data/lib/watobo/adapters.rb +1 -1
  18. data/lib/watobo/ca.rb +1 -1
  19. data/lib/watobo/config.rb +17 -19
  20. data/lib/watobo/constants.rb +3 -2
  21. data/lib/watobo/core/active_check.rb +62 -40
  22. data/lib/watobo/core/active_checks.rb +73 -0
  23. data/lib/watobo/core/ca.rb +3 -2
  24. data/lib/watobo/core/cert_store.rb +3 -2
  25. data/lib/watobo/core/chat.rb +122 -0
  26. data/lib/watobo/core/chats.rb +301 -0
  27. data/lib/watobo/core/conversation.rb +71 -0
  28. data/lib/watobo/core/cookie.rb +9 -25
  29. data/lib/watobo/core/finding.rb +89 -0
  30. data/lib/watobo/core/findings.rb +132 -0
  31. data/lib/watobo/core/forwarding_proxy.rb +4 -2
  32. data/lib/watobo/core/fuzz_gen.rb +3 -2
  33. data/lib/watobo/core/intercept_carver.rb +24 -12
  34. data/lib/watobo/core/intercept_filter.rb +4 -3
  35. data/lib/watobo/core/interceptor.rb +9 -888
  36. data/lib/watobo/core/min_class.rb +27 -0
  37. data/lib/watobo/core/netfilter_queue.rb +3 -2
  38. data/lib/watobo/core/ott_cache.rb +156 -0
  39. data/lib/watobo/core/parameter.rb +66 -0
  40. data/lib/watobo/core/passive_check.rb +15 -22
  41. data/lib/watobo/core/passive_checks.rb +72 -0
  42. data/lib/watobo/core/passive_scanner.rb +69 -0
  43. data/lib/watobo/core/plugin.rb +33 -0
  44. data/lib/watobo/core/project.rb +40 -547
  45. data/lib/watobo/core/proxy.rb +7 -2
  46. data/lib/watobo/core/request.rb +95 -10
  47. data/lib/watobo/core/response.rb +44 -3
  48. data/lib/watobo/core/scanner.rb +6 -7
  49. data/lib/watobo/core/scanner3.rb +439 -0
  50. data/lib/watobo/core/scope.rb +106 -0
  51. data/lib/watobo/core/session.rb +106 -286
  52. data/lib/watobo/core/sid_cache.rb +121 -0
  53. data/lib/watobo/core/subscriber.rb +48 -0
  54. data/lib/watobo/core.rb +2 -2
  55. data/lib/watobo/defaults.rb +3 -2
  56. data/lib/watobo/external/diff/lcs/array.rb +1 -1
  57. data/lib/watobo/external/diff/lcs/block.rb +1 -1
  58. data/lib/watobo/external/diff/lcs/callbacks.rb +1 -1
  59. data/lib/watobo/external/diff/lcs/change.rb +1 -1
  60. data/lib/watobo/external/diff/lcs/hunk.rb +1 -1
  61. data/lib/watobo/external/diff/lcs/ldiff.rb +1 -1
  62. data/lib/watobo/external/diff/lcs/string.rb +1 -1
  63. data/lib/watobo/external/diff/lcs.rb +1 -1
  64. data/lib/watobo/external/ntlm/ntlm.rb +1 -1
  65. data/lib/watobo/externals.rb +1 -1
  66. data/lib/watobo/framework/create_project.rb +19 -12
  67. data/lib/watobo/framework/init.rb +4 -3
  68. data/lib/watobo/framework/init_modules.rb +32 -3
  69. data/lib/watobo/framework/license_text.rb +3 -2
  70. data/lib/watobo/framework/load_chat.rb +36 -0
  71. data/lib/watobo/framework.rb +2 -2
  72. data/lib/watobo/gui/about_watobo.rb +3 -2
  73. data/lib/watobo/gui/browser_preview.rb +4 -3
  74. data/lib/watobo/gui/certificate_dialog.rb +3 -2
  75. data/lib/watobo/gui/chat_diff.rb +6 -14
  76. data/lib/watobo/gui/chatviewer_frame.rb +30 -5
  77. data/lib/watobo/gui/checkboxtree.rb +13 -12
  78. data/lib/watobo/gui/checks_policy_frame.rb +8 -10
  79. data/lib/watobo/gui/client_cert_dialog.rb +8 -6
  80. data/lib/watobo/gui/confirm_scan_dialog.rb +5 -3
  81. data/lib/watobo/gui/conversation_table.rb +288 -51
  82. data/lib/watobo/gui/conversation_table_ctrl.rb +36 -3
  83. data/lib/watobo/gui/conversation_table_ctrl2.rb +416 -0
  84. data/lib/watobo/gui/csrf_token_dialog.rb +25 -33
  85. data/lib/watobo/gui/dashboard.rb +47 -45
  86. data/lib/watobo/gui/define_scope_frame.rb +27 -22
  87. data/lib/watobo/gui/differ_frame.rb +238 -0
  88. data/lib/watobo/gui/edit_comment.rb +3 -2
  89. data/lib/watobo/gui/edit_scope_dialog.rb +7 -6
  90. data/lib/watobo/gui/finding_info.rb +3 -2
  91. data/lib/watobo/gui/findings_tree.rb +101 -26
  92. data/lib/watobo/gui/full_scan_dialog.rb +5 -6
  93. data/lib/watobo/gui/fuzzer_gui.rb +51 -18
  94. data/lib/watobo/gui/goto_url_dialog.rb +92 -0
  95. data/lib/watobo/gui/hex_viewer.rb +16 -5
  96. data/lib/watobo/gui/html_viewer.rb +309 -0
  97. data/lib/watobo/gui/intercept_filter_dialog.rb +3 -2
  98. data/lib/watobo/gui/interceptor_gui.rb +5 -4
  99. data/lib/watobo/gui/interceptor_settings_dialog.rb +4 -3
  100. data/lib/watobo/gui/list_box.rb +4 -3
  101. data/lib/watobo/gui/log_file_viewer.rb +55 -0
  102. data/lib/watobo/gui/log_viewer.rb +3 -82
  103. data/lib/watobo/gui/login_wizzard.rb +3 -3
  104. data/lib/watobo/gui/main_window.rb +183 -164
  105. data/lib/watobo/gui/manual_request_editor.rb +157 -642
  106. data/lib/watobo/gui/master_pw_dialog.rb +3 -2
  107. data/lib/watobo/gui/mixins/gui_settings.rb +3 -2
  108. data/lib/watobo/gui/page_tree.rb +3 -2
  109. data/lib/watobo/gui/password_policy_dialog.rb +3 -2
  110. data/lib/watobo/gui/plugin_board.rb +103 -73
  111. data/lib/watobo/gui/preferences_dialog.rb +3 -2
  112. data/lib/watobo/gui/progress_window.rb +3 -2
  113. data/lib/watobo/gui/project_wizzard.rb +3 -2
  114. data/lib/watobo/gui/proxy_dialog.rb +3 -2
  115. data/lib/watobo/gui/quick_scan_dialog.rb +17 -32
  116. data/lib/watobo/gui/request_builder_frame.rb +134 -0
  117. data/lib/watobo/gui/request_editor.rb +14 -9
  118. data/lib/watobo/gui/rewrite_filters_dialog.rb +4 -3
  119. data/lib/watobo/gui/rewrite_rules_dialog.rb +4 -3
  120. data/lib/watobo/gui/save_chat_dialog.rb +7 -3
  121. data/lib/watobo/gui/scanner_settings_dialog.rb +4 -3
  122. data/lib/watobo/gui/select_chat_dialog.rb +15 -25
  123. data/lib/watobo/gui/session_management_dialog.rb +21 -25
  124. data/lib/watobo/gui/sites_tree.rb +5 -4
  125. data/lib/watobo/gui/status_bar.rb +3 -2
  126. data/lib/watobo/gui/table_editor.rb +398 -386
  127. data/lib/watobo/gui/tagless_viewer.rb +3 -2
  128. data/lib/watobo/gui/templates/plugin.rb +3 -2
  129. data/lib/watobo/gui/templates/plugin2.rb +4 -3
  130. data/lib/watobo/gui/templates/plugin_base.rb +168 -0
  131. data/lib/watobo/gui/text_viewer.rb +49 -3
  132. data/lib/watobo/gui/transcoder_window.rb +3 -2
  133. data/lib/watobo/gui/utils/gui_utils.rb +5 -4
  134. data/lib/watobo/gui/utils/init_icons.rb +5 -2
  135. data/lib/watobo/gui/utils/load_icons.rb +3 -2
  136. data/lib/watobo/gui/utils/load_plugins.rb +22 -5
  137. data/lib/watobo/gui/utils/master_password.rb +3 -2
  138. data/lib/watobo/gui/utils/save_default_settings.rb +7 -5
  139. data/lib/watobo/gui/utils/save_project_settings.rb +1 -1
  140. data/lib/watobo/gui/utils/save_proxy_settings.rb +4 -3
  141. data/lib/watobo/gui/utils/save_scanner_settings.rb +5 -4
  142. data/lib/watobo/gui/utils/session_history.rb +3 -2
  143. data/lib/watobo/gui/workspace_dialog.rb +3 -2
  144. data/lib/watobo/gui/www_auth_dialog.rb +4 -3
  145. data/lib/watobo/gui/xml_viewer_frame.rb +3 -2
  146. data/lib/watobo/gui.rb +6 -3
  147. data/lib/watobo/http/cookies/cookies.rb +66 -0
  148. data/lib/watobo/http/data/data.rb +68 -0
  149. data/lib/watobo/{gui/mixins/subscriber.rb → http/url/url.rb} +33 -19
  150. data/lib/watobo/http_socket/agent.rb +851 -0
  151. data/lib/watobo/http_socket/client_socket.rb +290 -0
  152. data/lib/watobo/http_socket/connection.rb +423 -0
  153. data/lib/watobo/http_socket/http_socket.rb +273 -0
  154. data/lib/watobo/http_socket/ntlm_auth.rb +152 -0
  155. data/lib/watobo/http_socket/proxy.rb +31 -0
  156. data/lib/watobo/http_socket.rb +25 -0
  157. data/lib/watobo/interceptor/proxy.rb +883 -0
  158. data/lib/watobo/interceptor/transparent.rb +37 -0
  159. data/lib/watobo/interceptor.rb +25 -0
  160. data/lib/watobo/mixins/check_info.rb +50 -0
  161. data/lib/watobo/mixins/httpparser.rb +92 -20
  162. data/lib/watobo/mixins/request_parser.rb +103 -88
  163. data/lib/watobo/mixins/shapers.rb +42 -11
  164. data/lib/watobo/mixins/transcoders.rb +61 -57
  165. data/lib/watobo/mixins.rb +3 -2
  166. data/lib/watobo/parser/html.rb +106 -0
  167. data/lib/watobo/parser.rb +22 -0
  168. data/lib/watobo/utils/check_regex.rb +3 -2
  169. data/lib/watobo/utils/copy_object.rb +3 -2
  170. data/lib/watobo/utils/crypto.rb +3 -2
  171. data/lib/watobo/utils/expand_range.rb +3 -2
  172. data/lib/watobo/utils/file_management.rb +7 -3
  173. data/lib/watobo/utils/hexprint.rb +3 -2
  174. data/lib/watobo/utils/load_chat.rb +4 -3
  175. data/lib/watobo/utils/load_icon.rb +3 -2
  176. data/lib/watobo/utils/print_debug.rb +3 -2
  177. data/lib/watobo/utils/response_builder.rb +6 -4
  178. data/lib/watobo/utils/response_hash.rb +66 -49
  179. data/lib/watobo/utils/secure_eval.rb +3 -2
  180. data/lib/watobo/utils/strings.rb +3 -2
  181. data/lib/watobo/utils/text2request.rb +4 -5
  182. data/lib/watobo/utils/url.rb +46 -0
  183. data/lib/watobo/utils.rb +3 -2
  184. data/lib/watobo.rb +13 -3
  185. data/modules/active/Apache/mod_status.rb +15 -11
  186. data/modules/active/Flash/crossdomain.rb +17 -14
  187. data/modules/active/RoR/cve_2013_015x.rb +21 -0
  188. data/modules/active/directories/dirwalker.rb +10 -16
  189. data/modules/active/discovery/fileextensions.rb +10 -7
  190. data/modules/active/discovery/http_methods.rb +8 -9
  191. data/modules/active/domino/domino_db.rb +10 -11
  192. data/modules/active/dotNET/custom_errors.rb +124 -0
  193. data/modules/active/dotNET/dotnet_files.rb +112 -0
  194. data/modules/active/fileinclusion/lfi_simple.rb +9 -7
  195. data/modules/active/jboss/jboss_basic.rb +12 -9
  196. data/modules/active/sap/its_commands.rb +10 -9
  197. data/modules/active/sap/its_service_parameter.rb +10 -9
  198. data/modules/active/sap/its_services.rb +10 -9
  199. data/modules/active/sap/its_xss.rb +11 -10
  200. data/modules/active/siebel/siebel_apps.rb +14 -16
  201. data/modules/active/sqlinjection/sql_boolean.rb +139 -75
  202. data/modules/active/sqlinjection/sqli_error.rb +9 -6
  203. data/modules/active/sqlinjection/sqli_timing.rb +13 -11
  204. data/modules/active/xml/xml_xxe.rb +134 -0
  205. data/modules/active/xss/{xss_rated.rb → xss_ng.rb} +89 -56
  206. data/modules/active/xss/xss_simple.rb +9 -6
  207. data/modules/passive/ajax.rb +85 -0
  208. data/modules/passive/autocomplete.rb +78 -0
  209. data/modules/passive/cookie_options.rb +3 -2
  210. data/modules/passive/cookie_xss.rb +3 -2
  211. data/modules/passive/detect_code.rb +7 -4
  212. data/modules/passive/detect_fileupload.rb +3 -2
  213. data/modules/passive/detect_infrastructure.rb +7 -4
  214. data/modules/passive/detect_one_time_tokens.rb +3 -2
  215. data/modules/passive/dirindexing.rb +3 -2
  216. data/modules/passive/disclosure_domino.rb +3 -2
  217. data/modules/passive/disclosure_emails.rb +3 -2
  218. data/modules/passive/disclosure_ipaddr.rb +3 -2
  219. data/modules/passive/filename_as_parameter.rb +3 -2
  220. data/modules/passive/form_spotter.rb +10 -7
  221. data/modules/passive/hidden_fields.rb +73 -0
  222. data/modules/passive/hotspots.rb +7 -4
  223. data/modules/passive/in_script_parameter.rb +3 -2
  224. data/modules/passive/multiple_server_headers.rb +4 -3
  225. data/modules/passive/possible_login.rb +3 -2
  226. data/modules/passive/redirect_url.rb +3 -2
  227. data/modules/passive/redirectionz.rb +6 -3
  228. data/modules/passive/xss_dom.rb +16 -9
  229. data/plugins/catalog/catalog.rb +119 -193
  230. data/plugins/crawler/crawler.rb +4 -3
  231. data/plugins/crawler/gui/auth_frame.rb +3 -2
  232. data/plugins/crawler/gui/crawler_gui.rb +3 -2
  233. data/plugins/crawler/gui/general_settings_frame.rb +3 -2
  234. data/plugins/crawler/gui/hooks_frame.rb +3 -2
  235. data/plugins/crawler/gui/scope_frame.rb +3 -2
  236. data/plugins/crawler/gui/settings_tabbook.rb +3 -2
  237. data/plugins/crawler/gui/status_frame.rb +3 -2
  238. data/plugins/crawler/gui.rb +3 -2
  239. data/plugins/crawler/lib/bags.rb +3 -2
  240. data/plugins/crawler/lib/constants.rb +3 -2
  241. data/plugins/crawler/lib/engine.rb +3 -2
  242. data/plugins/crawler/lib/grabber.rb +3 -2
  243. data/plugins/crawler/lib/uri_mp.rb +1 -1
  244. data/plugins/filefinder/filefinder.rb +92 -70
  245. data/plugins/sqlmap/bin/test.rb +3 -2
  246. data/plugins/sqlmap/gui/main.rb +3 -2
  247. data/plugins/sqlmap/gui/options_frame.rb +4 -3
  248. data/plugins/sqlmap/gui.rb +1 -1
  249. data/plugins/sqlmap/lib/sqlmap_ctrl.rb +3 -2
  250. data/plugins/sqlmap/sqlmap.rb +1 -1
  251. data/plugins/sslchecker/cli/sslchecker_cli.rb +1 -1
  252. data/plugins/sslchecker/gui/cipher_table.rb +17 -10
  253. data/plugins/sslchecker/gui/gui.rb +59 -56
  254. data/plugins/sslchecker/gui/sslchecker.rb +1 -1
  255. data/plugins/sslchecker/lib/check.rb +43 -18
  256. data/plugins/wshell/gui/main.rb +130 -0
  257. data/plugins/wshell/icons/wsh.ico +0 -0
  258. data/plugins/wshell/lib/core.rb +99 -0
  259. data/plugins/wshell/wshell.rb +33 -0
  260. metadata +80 -8
  261. data/README +0 -26
  262. data/lib/watobo/core/http_socket.rb +0 -161
  263. data/lib/watobo/gui/plugin/base.rb +0 -82
@@ -1,7 +1,7 @@
1
1
  # .
2
2
  # proxy.rb
3
3
  #
4
- # Copyright 2012 by siberas, http://www.siberas.de
4
+ # Copyright 2013 by siberas, http://www.siberas.de
5
5
  #
6
6
  # This file is part of WATOBO (Web Application Tool Box)
7
7
  # http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
19
19
  # along with WATOBO; if not, write to the Free Software
20
20
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21
21
  # .
22
- module Watobo
22
+ # @private
23
+ module Watobo#:nodoc: all
23
24
  class Proxy
24
25
  include Watobo::Constants
25
26
 
@@ -33,6 +34,10 @@ module Watobo
33
34
  super
34
35
  end
35
36
  end
37
+
38
+ def to_yaml
39
+ @settings.to_yaml
40
+ end
36
41
 
37
42
 
38
43
  def has_login?
@@ -1,7 +1,7 @@
1
1
  # .
2
2
  # request.rb
3
3
  #
4
- # Copyright 2012 by siberas, http://www.siberas.de
4
+ # Copyright 2013 by siberas, http://www.siberas.de
5
5
  #
6
6
  # This file is part of WATOBO (Web Application Tool Box)
7
7
  # http://watobo.sourceforge.com
@@ -19,22 +19,107 @@
19
19
  # along with WATOBO; if not, write to the Free Software
20
20
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21
21
  # .
22
- module Watobo
22
+ # @private
23
+ module Watobo#:nodoc: all
23
24
  def self.create_request(url, prefs={})
24
- u = "http://" unless url =~ /^http/
25
- u << url
25
+ unless url =~ /^https?:\/\//
26
+ u = "http://#{url}"
27
+ else
28
+ u = url
29
+ end
30
+
26
31
  uri = URI.parse u
27
- r = "GET #{uri.to_s} HTTP/1.0\r\n"
28
- r << "Host: #{uri.host}"
29
- r.extend Watobo::Mixins::RequestParser
30
- r.to_request
32
+ r = "GET #{uri.to_s} HTTP/1.0\r\n"
33
+ r << "Host: #{uri.host}\r\n"
34
+ r.extend Watobo::Mixins::RequestParser
35
+ r.to_request
31
36
  end
32
-
33
- module Request
37
+
38
+ class Request < Array
39
+
40
+ attr :data
41
+ attr :url
42
+ attr :header
43
+ attr :cookies
44
+
34
45
  def self.create request
35
46
  request.extend Watobo::Mixin::Parser::Url
36
47
  request.extend Watobo::Mixin::Parser::Web10
37
48
  request.extend Watobo::Mixin::Shaper::Web10
49
+ # request = Request.new(request)
50
+
51
+ end
52
+
53
+ def copy
54
+ c = YAML.load(YAML.dump(self))
55
+ Watobo::Request.new c
56
+ end
57
+
58
+ def uniq_hash()
59
+ begin
60
+ settings = Watobo::Conf::Scanner.to_h
61
+ hashbase = site + method + path
62
+
63
+ get_parm_names.sort.each do |p|
64
+ hashbase << p
65
+ hashbase << get_parm_value(p) if settings[:non_unique_parms].include?(p)
66
+ end
67
+
68
+ post_parm_names.sort.each do |p|
69
+
70
+ hashbase << p
71
+ hashbase << post_parm_value(p) if settings[:non_unique_parms].include?(p)
72
+ end
73
+ # puts hashbase
74
+ return Digest::MD5.hexdigest(hashbase)
75
+ rescue => bang
76
+ puts bang
77
+ puts bang.backtrace if $DEBUG
78
+ return nil
79
+ end
80
+ end
81
+
82
+ def parameters(*locations)
83
+ parms = []
84
+ parms.concat @data.parameters
85
+ parms.concat @url.parameters
86
+ parms
87
+ end
88
+
89
+ def set(parm)
90
+ case parm.location
91
+ when :data
92
+ #
93
+ # replace_post_parm(parm.name, parm.value)
94
+ @data.set parm
95
+ when :url
96
+ @url.set parm
97
+ end
98
+ true
99
+ end
100
+
101
+ def initialize(r)
102
+ if r.respond_to? :concat
103
+ #puts "Create REQUEST from ARRAY"
104
+ self.concat r
105
+ elsif r.is_a? String
106
+ if r =~ /^http/
107
+ uri = URI.parse r
108
+ self << "GET #{uri.to_s} HTTP/1.0\r\n"
109
+ self << "Host: #{uri.host}\r\n"
110
+ else
111
+ r.extend Watobo::Mixins::RequestParser
112
+ self.concat r.to_request
113
+ end
114
+
115
+ end
116
+ self.extend Watobo::Mixin::Parser::Url
117
+ self.extend Watobo::Mixin::Parser::Web10
118
+ self.extend Watobo::Mixin::Shaper::Web10
119
+
120
+ @url = Watobo::HTTP::Url.new(self)
121
+ @data = Watobo::HTTPData::WWW_Form.new(self)
122
+ @cookies = Watobo::HTTP::Cookies.new(self)
38
123
  end
39
124
  end
40
125
  end
@@ -1,7 +1,7 @@
1
1
  # .
2
2
  # response.rb
3
3
  #
4
- # Copyright 2012 by siberas, http://www.siberas.de
4
+ # Copyright 2013 by siberas, http://www.siberas.de
5
5
  #
6
6
  # This file is part of WATOBO (Web Application Tool Box)
7
7
  # http://watobo.sourceforge.com
@@ -19,12 +19,53 @@
19
19
  # along with WATOBO; if not, write to the Free Software
20
20
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21
21
  # .
22
- module Watobo
23
- module Response
22
+ # @private
23
+ module Watobo#:nodoc: all
24
+ class Response < Array
25
+ def self.is_html?
26
+
27
+ end
28
+
29
+ def self.is_json?
30
+
31
+ end
32
+
33
+
34
+
35
+
24
36
  def self.create( response )
37
+ raise ArgumentError, "Array Expected." unless response.is_a? Array
38
+ response.extend Watobo::Mixin::Parser::Url
25
39
  response.extend Watobo::Mixin::Parser::Web10
26
40
  response.extend Watobo::Mixin::Shaper::Web10
27
41
  response.extend Watobo::Mixin::Shaper::HttpResponse
28
42
  end
43
+
44
+ def data
45
+ @data
46
+ end
47
+
48
+ def copy
49
+ c = YAML.load(YAML.dump(self))
50
+ Watobo::Request.new c
51
+ end
52
+
53
+ def initialize(r)
54
+ if r.respond_to? :concat
55
+ #puts "Create REQUEST from ARRAY"
56
+ self.concat r
57
+ elsif r.is_a? String
58
+ raise ArgumentError, "Need Array"
59
+ end
60
+ self.extend Watobo::Mixin::Parser::Url
61
+ self.extend Watobo::Mixin::Parser::Web10
62
+ self.extend Watobo::Mixin::Shaper::Web10
63
+ self.extend Watobo::Mixin::Shaper::HttpResponse
64
+
65
+ if content_type =~ /(html|text)/
66
+ self.extend Watobo::Parser::HTML
67
+ end
68
+
69
+ end
29
70
  end
30
71
  end
@@ -1,7 +1,7 @@
1
1
  # .
2
2
  # scanner.rb
3
3
  #
4
- # Copyright 2012 by siberas, http://www.siberas.de
4
+ # Copyright 2013 by siberas, http://www.siberas.de
5
5
  #
6
6
  # This file is part of WATOBO (Web Application Tool Box)
7
7
  # http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
19
19
  # along with WATOBO; if not, write to the Free Software
20
20
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21
21
  # .
22
- module Watobo
22
+ # @private
23
+ module Watobo#:nodoc: all
23
24
  class Scanner2
24
25
 
25
26
  attr :numTotalChecks
@@ -234,11 +235,9 @@ module Watobo
234
235
  @check_count += 1
235
236
  puts "CheckCount: #{@check_count}" if $DEBUG
236
237
  notify( :progress, m )
237
- unless @prefs[:scanlog_name].nil?
238
- if @prefs[:session_store].respond_to? :add_scan_log
238
+ unless @prefs[:scanlog_name].nil?
239
239
  chat = Chat.new(request, response, :id => 0, :chat_source => @prefs[:chat_source])
240
- @prefs[:session_store].add_scan_log(chat, @prefs[:scanlog_name])
241
- end
240
+ Watobo::DataStore.add_scan_log(chat, @prefs[:scanlog_name])
242
241
  end
243
242
  end
244
243
 
@@ -341,7 +340,7 @@ module Watobo
341
340
  puts @prefs.to_yaml if $DEBUG
342
341
 
343
342
  @filtered_chat_list = filteredChats(@chat_list, @prefs)
344
- puts "#ActiveChecks: #{@active_checks.length}"
343
+ puts "#ActiveModules: #{@active_checks.length}"
345
344
 
346
345
  @active_checks.uniq.each do |m|
347
346
  puts m.class
@@ -0,0 +1,439 @@
1
+ # .
2
+ # scanner3.rb
3
+ #
4
+ # Copyright 2013 by siberas, http://www.siberas.de
5
+ #
6
+ # This file is part of WATOBO (Web Application Tool Box)
7
+ # http://watobo.sourceforge.com
8
+ #
9
+ # WATOBO is free software; you can redistribute it and/or modify
10
+ # it under the terms of the GNU General Public License as published by
11
+ # the Free Software Foundation version 2 of the License.
12
+ #
13
+ # WATOBO is distributed in the hope that it will be useful,
14
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16
+ # GNU General Public License for more details.
17
+ #
18
+ # You should have received a copy of the GNU General Public License
19
+ # along with WATOBO; if not, write to the Free Software
20
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21
+ # .
22
+ # @private
23
+ module Watobo#:nodoc: all
24
+ class Scanner3
25
+
26
+ include Watobo::Constants
27
+ include Watobo::Subscriber
28
+
29
+ SCANNER_READY = 0x0000
30
+ SCANNER_RUNNING = 0x0001
31
+
32
+ GENERATION_STARTED = 0x0100
33
+ GENERATION_FINISHED = 0x0200
34
+ class Worker
35
+ include Watobo::Constants
36
+ include Watobo::Subscriber
37
+
38
+ attr :engine
39
+
40
+ STATE_IDLE = 0x00
41
+ STATE_RUNNING = 0x01
42
+ STATE_WAIT_FOR_LOGIN = 0x02
43
+
44
+ def state
45
+ state = nil
46
+ @state_mutex.synchronize do
47
+ state = @state
48
+ end
49
+ state
50
+ end
51
+
52
+ def run
53
+ @state_mutex.synchronize do @state = STATE_RUNNING; end
54
+ Thread.new{ @engine.run }
55
+ end
56
+
57
+ def start
58
+ @engine = Thread.new(@tasks, @logged_out_queue, @prefs){ |tasks, logged_out_queue, prefs|
59
+ relogin_count = 0
60
+ loop do
61
+ task = tasks.deq
62
+ begin
63
+ #puts "RUNNING #{task[:module]}"
64
+ request, response = task[:check].call()
65
+
66
+
67
+ unless prefs[:logout_signatures].empty? or prefs[:auto_login] == false
68
+ logged_out = false
69
+ prefs[:logout_signatures].each do |sig|
70
+ logged_out = true if response.join =~ /#{sig}/
71
+ end
72
+
73
+ if logged_out
74
+ @state_mutex.synchronize do @state = STATE_WAIT_FOR_LOGIN; end
75
+ logged_out_queue.push self
76
+ # stop current thread, will be waked-up by scanner
77
+ Thread.stop
78
+ relogin_count += 1
79
+ @state_mutex.synchronize do @state = STATE_RUNNING; end
80
+ unless relogin_count > 5
81
+ request, response = task[:check].call()
82
+ end
83
+ end
84
+ end
85
+
86
+ unless prefs[:scanlog_name].nil?
87
+ chat = Chat.new(request, response, :id => 0, :chat_source => prefs[:chat_source])
88
+ Watobo::DataStore.add_scan_log(chat, prefs[:scanlog_name])
89
+ end
90
+ rescue => bang
91
+ puts "!!! #{task[:module]} !!!"
92
+ puts bang
93
+ puts bang.backtrace if $DEBUG
94
+ ensure
95
+ #puts "FINISHED #{task[:module]}"
96
+ notify(:task_finished, task[:module])
97
+ end
98
+ Thread.exit if relogin_count > 5
99
+ relogin_count = 0
100
+ end
101
+ }
102
+ end
103
+
104
+ def stop
105
+ @state = STATE_IDLE
106
+ Thread.kill @engine if @engine.alive?
107
+ end
108
+
109
+ def wait_for_login?
110
+ state = false
111
+ @state_mutex.synchronize do
112
+ state = ( @state == STATE_WAIT_FOR_LOGIN )
113
+ end
114
+ state
115
+ end
116
+
117
+ def running?
118
+ @state_mutex.synchronize do
119
+ running = ( @state == STATE_RUNNING )
120
+ end
121
+ running
122
+ end
123
+
124
+ def initialize(task_queue, logged_out_queue, prefs)
125
+ @engine = nil
126
+ @tasks = task_queue
127
+ @logged_out_queue = logged_out_queue
128
+ @prefs = prefs
129
+ @relogin_count = 0
130
+ @state_mutex = Mutex.new
131
+ @state = STATE_IDLE
132
+
133
+ end
134
+
135
+ end
136
+ #
137
+ # E N D O F W O R K E R
138
+
139
+ def tasks
140
+ @tasks
141
+ end
142
+
143
+ def status_running?
144
+ ( status & SCANNER_RUNNING ) > 0
145
+ end
146
+
147
+ def generation_finished?
148
+ ( status & GENERATION_FINISHED ) > 0
149
+ end
150
+
151
+ def finished?
152
+ return true if (
153
+ status_running? &&
154
+ ( @tasks.num_waiting == @workers.length ) &&
155
+ ( @tasks.size == 0 ) &&
156
+ generation_finished?
157
+ )
158
+ false
159
+ end
160
+
161
+ def running?()
162
+ return false if (
163
+ status_running? &&
164
+ ( @tasks.num_waiting == @workers.length ) &&
165
+ ( @tasks.size == 0 ) &&
166
+ generation_finished?
167
+ )
168
+ return true if status_running?
169
+ return false
170
+ end
171
+
172
+ def stop()
173
+ begin
174
+ @workers.each do |w|
175
+ w.stop
176
+ end
177
+ rescue => bang
178
+ puts bang
179
+ puts bang.backtrace if $DEBUG
180
+ end
181
+ end
182
+
183
+ def cancel()
184
+ begin
185
+ @workers.each do |w|
186
+ w.stop
187
+ end
188
+ rescue => bang
189
+ puts bang
190
+ puts bang.backtrace if $DEBUG
191
+ end
192
+ end
193
+
194
+ def continue()
195
+ # TODO
196
+ end
197
+
198
+ def progress
199
+ @task_count_lock.synchronize do
200
+ YAML.load(YAML.dump(@task_counter))
201
+ end
202
+ end
203
+
204
+ def sum_total
205
+ sum = 0
206
+ @task_count_lock.synchronize do
207
+ sum = @task_counter.values.inject(0){|i,v| i + v[:total] }
208
+ end
209
+ sum
210
+ end
211
+
212
+ def sum_progress
213
+ sum = 0
214
+ @task_count_lock.synchronize do
215
+ sum = @task_counter.values.inject(0){|i,v| i + v[:progress] }
216
+ end
217
+ sum
218
+ end
219
+
220
+ def run( check_prefs={} )
221
+ # @sites_online.clear
222
+ @uniqueRequests = Hash.new
223
+ set_status_running
224
+
225
+ @login_count = 0
226
+ @max_login_count = 20
227
+
228
+ Thread.new{
229
+ size = -1
230
+ loop do
231
+ if @tasks.num_waiting == @workers.length and @tasks.size == 0 and generation_finished?
232
+ @workers.map{|w| w.stop }
233
+ # suizide!
234
+ Thread.exit
235
+ end
236
+
237
+ if @logged_out.size == ( @workers.length - @tasks.num_waiting) or @tasks.num_waiting == @workers.size
238
+ @logged_out.clear
239
+ #puts "!LOGOUT DETECTED!\n#{@logged_out.size} - #{@workers.length} - #{@tasks.num_waiting}\n\n"
240
+ begin
241
+ puts "Run login ..."
242
+ login
243
+ @workers.each do |wrkr|
244
+ # puts "State: #{wrkr.state}"
245
+ if wrkr.wait_for_login?
246
+ wrkr.engine.run
247
+ end
248
+ end
249
+
250
+ rescue => bang
251
+ puts bang
252
+ puts bang.backtrace
253
+ end
254
+
255
+ end
256
+
257
+ sleep 1
258
+ end
259
+ }
260
+
261
+ @prefs.update check_prefs
262
+ msg = "\n[Scanner] Starting Scan ..."
263
+ notify(:logger, LOG_INFO, msg )
264
+ puts msg
265
+
266
+ # starting workers before check generation
267
+ start_workers( @prefs)
268
+ @max_tasks = 1000
269
+
270
+ # start check generation in seperate thread
271
+ Thread.new{
272
+ begin
273
+ set_status GENERATION_STARTED
274
+ @chat_list.uniq.each do |chat|
275
+ # puts chat.request.url.to_s
276
+ @active_checks.uniq.each do |ac|
277
+ ac.reset()
278
+ if site_alive?(chat) then
279
+ ac.generateChecks(chat){ |check|
280
+ while @tasks.size > @max_tasks
281
+ sleep 1
282
+ end
283
+ task = { :module => ac,
284
+ :check => check
285
+ }
286
+ @tasks.push task
287
+ }
288
+ end
289
+ end
290
+ end
291
+ rescue => bang
292
+ puts bang
293
+ puts bang.backtrace if $DEBUG
294
+ ensure
295
+ set_status GENERATION_FINISHED
296
+ end
297
+ }
298
+
299
+ end
300
+
301
+ def initialize(chat_list=[], active_checks=[], passive_checks=[], prefs={})
302
+ @chat_list = chat_list
303
+ @active_checks = []
304
+ @passive_checks = passive_checks
305
+
306
+ @tasks = Queue.new
307
+ @logged_out = Queue.new
308
+
309
+ @workers = []
310
+
311
+
312
+
313
+ @status_lock = Mutex.new
314
+
315
+ @task_count_lock = Mutex.new
316
+ @task_counter = {}
317
+
318
+ # @onlineCheck = OnlineCheck.new(@project)
319
+ msg = "Initializing Scanner ..."
320
+ notify(:logger, LOG_INFO, msg)
321
+ puts msg
322
+
323
+ @prefs = Watobo::Conf::Scanner.to_h
324
+
325
+ @prefs.update prefs
326
+ #puts "set up scanner"
327
+ #puts @prefs[:login_chats]
328
+ #puts @prefs[:logout_signatures]
329
+ puts "= create scanner =" if $DEBUG
330
+ puts @prefs.to_yaml
331
+
332
+ unique_checks = {}
333
+ active_checks.each do |x|
334
+ if x.respond_to? :new
335
+ ac = x.new(self.object_id, @prefs)
336
+ else
337
+ ac = x
338
+ end
339
+ unique_checks[ac.class.to_s] = ac unless unique_checks.has_key?(ac.class.to_s)
340
+ end
341
+ unique_checks.each_value do |check|
342
+ @active_checks << check
343
+ end
344
+
345
+ puts "#ActiveModules: #{@active_checks.length}"
346
+
347
+ @active_checks.uniq.each do |check|
348
+
349
+ check.resetCounters()
350
+ @chat_list.each_with_index do |chat, index|
351
+ #print "."
352
+ check.updateCounters(chat, @prefs)
353
+ puts "* [#{index}] CheckCounter #{chat.id}: #{check.check_name} - #{check.numChecks}"
354
+ end
355
+
356
+ # @numTotalChecks += check.numChecks
357
+ # cn = check.info[:check_name]
358
+ # puts "+ add check: #{cn}"
359
+ # notify(:logger, LOG_INFO, "add check #{cn}")
360
+ @task_counter[check.check_name] = { :total => check.numChecks,
361
+ :progress => 0
362
+ }
363
+ end
364
+ @status = SCANNER_READY
365
+ msg = "Scanner Ready!"
366
+ notify(:logger, LOG_INFO, msg)
367
+ puts msg
368
+ end
369
+
370
+ private
371
+
372
+ def set_status_running
373
+ s = ( status | SCANNER_RUNNING )
374
+ set_status( s )
375
+ end
376
+
377
+ def set_status(s)
378
+ @status_lock.synchronize {
379
+ @status |= s
380
+ }
381
+ end
382
+
383
+ def status
384
+ @status_lock.synchronize {
385
+ return @status
386
+ }
387
+ end
388
+
389
+ def start_workers(check_prefs)
390
+ num_workers = @prefs.has_key?(:max_parallel_checks) ? @prefs[:max_parallel_checks] : Watobo::Conf::Scanner.max_parallel_checks
391
+
392
+ puts "Starting #{num_workers} Workers ..."
393
+
394
+ num_workers.times do |i|
395
+ print "... #{i + 1}"
396
+ w = Scanner3::Worker.new(@tasks, @logged_out, check_prefs)
397
+
398
+ w.subscribe(:task_finished){ |m|
399
+ @task_count_lock.synchronize do
400
+ cn = m.check_name
401
+ @task_counter[cn][:progress] += 1
402
+ end
403
+ }
404
+
405
+ @logout_count ||= 0
406
+ @logout_count_lock ||= Mutex.new
407
+ @num_waiting = 0
408
+
409
+ w.start
410
+ @workers << w
411
+ end
412
+ print "\n"
413
+
414
+ end
415
+
416
+ def login
417
+ puts "do relogin"
418
+ login_chats = Watobo::Conf::Scanner.login_chat_ids.uniq.map{|id| Watobo::Chats.get_by_id(id) }
419
+ # puts "running #{login_chats.length} login requests"
420
+ # puts login_chats.first.class
421
+
422
+ @active_checks.first.runLogin(login_chats, @prefs)
423
+
424
+ end
425
+
426
+ def site_alive?(chat)
427
+ @sites_alive ||= Hash.new
428
+ site = chat.request.site
429
+ return true if @sites_alive.has_key? site
430
+
431
+ if Watobo::HTTPSocket.siteAlive?(chat)
432
+ @sites_alive[site] = true
433
+ return true
434
+ end
435
+ return false
436
+ end
437
+
438
+ end
439
+ end