watobo 0.9.12 → 0.9.13
Sign up to get free protection for your applications and to get access to all the features.
- data/.yardopts +2 -2
- data/{CHANGELOG → CHANGELOG.md} +62 -0
- data/README.md +30 -0
- data/bin/nfq_server.rb +4 -3
- data/bin/watobo_gui.rb +1 -1
- data/config/ott_cache.yml +4 -0
- data/config/scanner.yml +1 -18
- data/config/sid_cache.yml +14 -0
- data/extras/private-hostspot.sh +17 -0
- data/extras/watobo-installer.sh +61 -0
- data/extras/watobo-transparent.sh +38 -0
- data/icons/BestPractice_16x16.ico +0 -0
- data/icons/BestPractice_24x24.ico +0 -0
- data/lib/watobo/adapters/data_store.rb +25 -3
- data/lib/watobo/adapters/file/file_store.rb +19 -11
- data/lib/watobo/adapters/session_store.rb +3 -2
- data/lib/watobo/adapters.rb +1 -1
- data/lib/watobo/ca.rb +1 -1
- data/lib/watobo/config.rb +17 -19
- data/lib/watobo/constants.rb +3 -2
- data/lib/watobo/core/active_check.rb +62 -40
- data/lib/watobo/core/active_checks.rb +73 -0
- data/lib/watobo/core/ca.rb +3 -2
- data/lib/watobo/core/cert_store.rb +3 -2
- data/lib/watobo/core/chat.rb +122 -0
- data/lib/watobo/core/chats.rb +301 -0
- data/lib/watobo/core/conversation.rb +71 -0
- data/lib/watobo/core/cookie.rb +9 -25
- data/lib/watobo/core/finding.rb +89 -0
- data/lib/watobo/core/findings.rb +132 -0
- data/lib/watobo/core/forwarding_proxy.rb +4 -2
- data/lib/watobo/core/fuzz_gen.rb +3 -2
- data/lib/watobo/core/intercept_carver.rb +24 -12
- data/lib/watobo/core/intercept_filter.rb +4 -3
- data/lib/watobo/core/interceptor.rb +9 -888
- data/lib/watobo/core/min_class.rb +27 -0
- data/lib/watobo/core/netfilter_queue.rb +3 -2
- data/lib/watobo/core/ott_cache.rb +156 -0
- data/lib/watobo/core/parameter.rb +66 -0
- data/lib/watobo/core/passive_check.rb +15 -22
- data/lib/watobo/core/passive_checks.rb +72 -0
- data/lib/watobo/core/passive_scanner.rb +69 -0
- data/lib/watobo/core/plugin.rb +33 -0
- data/lib/watobo/core/project.rb +40 -547
- data/lib/watobo/core/proxy.rb +7 -2
- data/lib/watobo/core/request.rb +95 -10
- data/lib/watobo/core/response.rb +44 -3
- data/lib/watobo/core/scanner.rb +6 -7
- data/lib/watobo/core/scanner3.rb +439 -0
- data/lib/watobo/core/scope.rb +106 -0
- data/lib/watobo/core/session.rb +106 -286
- data/lib/watobo/core/sid_cache.rb +121 -0
- data/lib/watobo/core/subscriber.rb +48 -0
- data/lib/watobo/core.rb +2 -2
- data/lib/watobo/defaults.rb +3 -2
- data/lib/watobo/external/diff/lcs/array.rb +1 -1
- data/lib/watobo/external/diff/lcs/block.rb +1 -1
- data/lib/watobo/external/diff/lcs/callbacks.rb +1 -1
- data/lib/watobo/external/diff/lcs/change.rb +1 -1
- data/lib/watobo/external/diff/lcs/hunk.rb +1 -1
- data/lib/watobo/external/diff/lcs/ldiff.rb +1 -1
- data/lib/watobo/external/diff/lcs/string.rb +1 -1
- data/lib/watobo/external/diff/lcs.rb +1 -1
- data/lib/watobo/external/ntlm/ntlm.rb +1 -1
- data/lib/watobo/externals.rb +1 -1
- data/lib/watobo/framework/create_project.rb +19 -12
- data/lib/watobo/framework/init.rb +4 -3
- data/lib/watobo/framework/init_modules.rb +32 -3
- data/lib/watobo/framework/license_text.rb +3 -2
- data/lib/watobo/framework/load_chat.rb +36 -0
- data/lib/watobo/framework.rb +2 -2
- data/lib/watobo/gui/about_watobo.rb +3 -2
- data/lib/watobo/gui/browser_preview.rb +4 -3
- data/lib/watobo/gui/certificate_dialog.rb +3 -2
- data/lib/watobo/gui/chat_diff.rb +6 -14
- data/lib/watobo/gui/chatviewer_frame.rb +30 -5
- data/lib/watobo/gui/checkboxtree.rb +13 -12
- data/lib/watobo/gui/checks_policy_frame.rb +8 -10
- data/lib/watobo/gui/client_cert_dialog.rb +8 -6
- data/lib/watobo/gui/confirm_scan_dialog.rb +5 -3
- data/lib/watobo/gui/conversation_table.rb +288 -51
- data/lib/watobo/gui/conversation_table_ctrl.rb +36 -3
- data/lib/watobo/gui/conversation_table_ctrl2.rb +416 -0
- data/lib/watobo/gui/csrf_token_dialog.rb +25 -33
- data/lib/watobo/gui/dashboard.rb +47 -45
- data/lib/watobo/gui/define_scope_frame.rb +27 -22
- data/lib/watobo/gui/differ_frame.rb +238 -0
- data/lib/watobo/gui/edit_comment.rb +3 -2
- data/lib/watobo/gui/edit_scope_dialog.rb +7 -6
- data/lib/watobo/gui/finding_info.rb +3 -2
- data/lib/watobo/gui/findings_tree.rb +101 -26
- data/lib/watobo/gui/full_scan_dialog.rb +5 -6
- data/lib/watobo/gui/fuzzer_gui.rb +51 -18
- data/lib/watobo/gui/goto_url_dialog.rb +92 -0
- data/lib/watobo/gui/hex_viewer.rb +16 -5
- data/lib/watobo/gui/html_viewer.rb +309 -0
- data/lib/watobo/gui/intercept_filter_dialog.rb +3 -2
- data/lib/watobo/gui/interceptor_gui.rb +5 -4
- data/lib/watobo/gui/interceptor_settings_dialog.rb +4 -3
- data/lib/watobo/gui/list_box.rb +4 -3
- data/lib/watobo/gui/log_file_viewer.rb +55 -0
- data/lib/watobo/gui/log_viewer.rb +3 -82
- data/lib/watobo/gui/login_wizzard.rb +3 -3
- data/lib/watobo/gui/main_window.rb +183 -164
- data/lib/watobo/gui/manual_request_editor.rb +157 -642
- data/lib/watobo/gui/master_pw_dialog.rb +3 -2
- data/lib/watobo/gui/mixins/gui_settings.rb +3 -2
- data/lib/watobo/gui/page_tree.rb +3 -2
- data/lib/watobo/gui/password_policy_dialog.rb +3 -2
- data/lib/watobo/gui/plugin_board.rb +103 -73
- data/lib/watobo/gui/preferences_dialog.rb +3 -2
- data/lib/watobo/gui/progress_window.rb +3 -2
- data/lib/watobo/gui/project_wizzard.rb +3 -2
- data/lib/watobo/gui/proxy_dialog.rb +3 -2
- data/lib/watobo/gui/quick_scan_dialog.rb +17 -32
- data/lib/watobo/gui/request_builder_frame.rb +134 -0
- data/lib/watobo/gui/request_editor.rb +14 -9
- data/lib/watobo/gui/rewrite_filters_dialog.rb +4 -3
- data/lib/watobo/gui/rewrite_rules_dialog.rb +4 -3
- data/lib/watobo/gui/save_chat_dialog.rb +7 -3
- data/lib/watobo/gui/scanner_settings_dialog.rb +4 -3
- data/lib/watobo/gui/select_chat_dialog.rb +15 -25
- data/lib/watobo/gui/session_management_dialog.rb +21 -25
- data/lib/watobo/gui/sites_tree.rb +5 -4
- data/lib/watobo/gui/status_bar.rb +3 -2
- data/lib/watobo/gui/table_editor.rb +398 -386
- data/lib/watobo/gui/tagless_viewer.rb +3 -2
- data/lib/watobo/gui/templates/plugin.rb +3 -2
- data/lib/watobo/gui/templates/plugin2.rb +4 -3
- data/lib/watobo/gui/templates/plugin_base.rb +168 -0
- data/lib/watobo/gui/text_viewer.rb +49 -3
- data/lib/watobo/gui/transcoder_window.rb +3 -2
- data/lib/watobo/gui/utils/gui_utils.rb +5 -4
- data/lib/watobo/gui/utils/init_icons.rb +5 -2
- data/lib/watobo/gui/utils/load_icons.rb +3 -2
- data/lib/watobo/gui/utils/load_plugins.rb +22 -5
- data/lib/watobo/gui/utils/master_password.rb +3 -2
- data/lib/watobo/gui/utils/save_default_settings.rb +7 -5
- data/lib/watobo/gui/utils/save_project_settings.rb +1 -1
- data/lib/watobo/gui/utils/save_proxy_settings.rb +4 -3
- data/lib/watobo/gui/utils/save_scanner_settings.rb +5 -4
- data/lib/watobo/gui/utils/session_history.rb +3 -2
- data/lib/watobo/gui/workspace_dialog.rb +3 -2
- data/lib/watobo/gui/www_auth_dialog.rb +4 -3
- data/lib/watobo/gui/xml_viewer_frame.rb +3 -2
- data/lib/watobo/gui.rb +6 -3
- data/lib/watobo/http/cookies/cookies.rb +66 -0
- data/lib/watobo/http/data/data.rb +68 -0
- data/lib/watobo/{gui/mixins/subscriber.rb → http/url/url.rb} +33 -19
- data/lib/watobo/http_socket/agent.rb +851 -0
- data/lib/watobo/http_socket/client_socket.rb +290 -0
- data/lib/watobo/http_socket/connection.rb +423 -0
- data/lib/watobo/http_socket/http_socket.rb +273 -0
- data/lib/watobo/http_socket/ntlm_auth.rb +152 -0
- data/lib/watobo/http_socket/proxy.rb +31 -0
- data/lib/watobo/http_socket.rb +25 -0
- data/lib/watobo/interceptor/proxy.rb +883 -0
- data/lib/watobo/interceptor/transparent.rb +37 -0
- data/lib/watobo/interceptor.rb +25 -0
- data/lib/watobo/mixins/check_info.rb +50 -0
- data/lib/watobo/mixins/httpparser.rb +92 -20
- data/lib/watobo/mixins/request_parser.rb +103 -88
- data/lib/watobo/mixins/shapers.rb +42 -11
- data/lib/watobo/mixins/transcoders.rb +61 -57
- data/lib/watobo/mixins.rb +3 -2
- data/lib/watobo/parser/html.rb +106 -0
- data/lib/watobo/parser.rb +22 -0
- data/lib/watobo/utils/check_regex.rb +3 -2
- data/lib/watobo/utils/copy_object.rb +3 -2
- data/lib/watobo/utils/crypto.rb +3 -2
- data/lib/watobo/utils/expand_range.rb +3 -2
- data/lib/watobo/utils/file_management.rb +7 -3
- data/lib/watobo/utils/hexprint.rb +3 -2
- data/lib/watobo/utils/load_chat.rb +4 -3
- data/lib/watobo/utils/load_icon.rb +3 -2
- data/lib/watobo/utils/print_debug.rb +3 -2
- data/lib/watobo/utils/response_builder.rb +6 -4
- data/lib/watobo/utils/response_hash.rb +66 -49
- data/lib/watobo/utils/secure_eval.rb +3 -2
- data/lib/watobo/utils/strings.rb +3 -2
- data/lib/watobo/utils/text2request.rb +4 -5
- data/lib/watobo/utils/url.rb +46 -0
- data/lib/watobo/utils.rb +3 -2
- data/lib/watobo.rb +13 -3
- data/modules/active/Apache/mod_status.rb +15 -11
- data/modules/active/Flash/crossdomain.rb +17 -14
- data/modules/active/RoR/cve_2013_015x.rb +21 -0
- data/modules/active/directories/dirwalker.rb +10 -16
- data/modules/active/discovery/fileextensions.rb +10 -7
- data/modules/active/discovery/http_methods.rb +8 -9
- data/modules/active/domino/domino_db.rb +10 -11
- data/modules/active/dotNET/custom_errors.rb +124 -0
- data/modules/active/dotNET/dotnet_files.rb +112 -0
- data/modules/active/fileinclusion/lfi_simple.rb +9 -7
- data/modules/active/jboss/jboss_basic.rb +12 -9
- data/modules/active/sap/its_commands.rb +10 -9
- data/modules/active/sap/its_service_parameter.rb +10 -9
- data/modules/active/sap/its_services.rb +10 -9
- data/modules/active/sap/its_xss.rb +11 -10
- data/modules/active/siebel/siebel_apps.rb +14 -16
- data/modules/active/sqlinjection/sql_boolean.rb +139 -75
- data/modules/active/sqlinjection/sqli_error.rb +9 -6
- data/modules/active/sqlinjection/sqli_timing.rb +13 -11
- data/modules/active/xml/xml_xxe.rb +134 -0
- data/modules/active/xss/{xss_rated.rb → xss_ng.rb} +89 -56
- data/modules/active/xss/xss_simple.rb +9 -6
- data/modules/passive/ajax.rb +85 -0
- data/modules/passive/autocomplete.rb +78 -0
- data/modules/passive/cookie_options.rb +3 -2
- data/modules/passive/cookie_xss.rb +3 -2
- data/modules/passive/detect_code.rb +7 -4
- data/modules/passive/detect_fileupload.rb +3 -2
- data/modules/passive/detect_infrastructure.rb +7 -4
- data/modules/passive/detect_one_time_tokens.rb +3 -2
- data/modules/passive/dirindexing.rb +3 -2
- data/modules/passive/disclosure_domino.rb +3 -2
- data/modules/passive/disclosure_emails.rb +3 -2
- data/modules/passive/disclosure_ipaddr.rb +3 -2
- data/modules/passive/filename_as_parameter.rb +3 -2
- data/modules/passive/form_spotter.rb +10 -7
- data/modules/passive/hidden_fields.rb +73 -0
- data/modules/passive/hotspots.rb +7 -4
- data/modules/passive/in_script_parameter.rb +3 -2
- data/modules/passive/multiple_server_headers.rb +4 -3
- data/modules/passive/possible_login.rb +3 -2
- data/modules/passive/redirect_url.rb +3 -2
- data/modules/passive/redirectionz.rb +6 -3
- data/modules/passive/xss_dom.rb +16 -9
- data/plugins/catalog/catalog.rb +119 -193
- data/plugins/crawler/crawler.rb +4 -3
- data/plugins/crawler/gui/auth_frame.rb +3 -2
- data/plugins/crawler/gui/crawler_gui.rb +3 -2
- data/plugins/crawler/gui/general_settings_frame.rb +3 -2
- data/plugins/crawler/gui/hooks_frame.rb +3 -2
- data/plugins/crawler/gui/scope_frame.rb +3 -2
- data/plugins/crawler/gui/settings_tabbook.rb +3 -2
- data/plugins/crawler/gui/status_frame.rb +3 -2
- data/plugins/crawler/gui.rb +3 -2
- data/plugins/crawler/lib/bags.rb +3 -2
- data/plugins/crawler/lib/constants.rb +3 -2
- data/plugins/crawler/lib/engine.rb +3 -2
- data/plugins/crawler/lib/grabber.rb +3 -2
- data/plugins/crawler/lib/uri_mp.rb +1 -1
- data/plugins/filefinder/filefinder.rb +92 -70
- data/plugins/sqlmap/bin/test.rb +3 -2
- data/plugins/sqlmap/gui/main.rb +3 -2
- data/plugins/sqlmap/gui/options_frame.rb +4 -3
- data/plugins/sqlmap/gui.rb +1 -1
- data/plugins/sqlmap/lib/sqlmap_ctrl.rb +3 -2
- data/plugins/sqlmap/sqlmap.rb +1 -1
- data/plugins/sslchecker/cli/sslchecker_cli.rb +1 -1
- data/plugins/sslchecker/gui/cipher_table.rb +17 -10
- data/plugins/sslchecker/gui/gui.rb +59 -56
- data/plugins/sslchecker/gui/sslchecker.rb +1 -1
- data/plugins/sslchecker/lib/check.rb +43 -18
- data/plugins/wshell/gui/main.rb +130 -0
- data/plugins/wshell/icons/wsh.ico +0 -0
- data/plugins/wshell/lib/core.rb +99 -0
- data/plugins/wshell/wshell.rb +33 -0
- metadata +80 -8
- data/README +0 -26
- data/lib/watobo/core/http_socket.rb +0 -161
- data/lib/watobo/gui/plugin/base.rb +0 -82
@@ -0,0 +1,309 @@
|
|
1
|
+
# .
|
2
|
+
# html_viewer.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
|
+
require 'fox16/scintilla'
|
23
|
+
|
24
|
+
# @private
|
25
|
+
module Watobo#:nodoc: all
|
26
|
+
module Gui
|
27
|
+
class HTMLViewer < FXScintilla
|
28
|
+
attr_accessor :max_len
|
29
|
+
|
30
|
+
def search_text(text, &block)
|
31
|
+
matches = []
|
32
|
+
setTargetStart 0
|
33
|
+
setTargetEnd getLength
|
34
|
+
while searchInTarget(text.length, text) >= 0
|
35
|
+
pos = getTargetStart
|
36
|
+
setTargetStart pos+1
|
37
|
+
setTargetEnd getLength
|
38
|
+
yield pos if block_given?
|
39
|
+
matches << pos
|
40
|
+
end
|
41
|
+
|
42
|
+
matches
|
43
|
+
end
|
44
|
+
|
45
|
+
|
46
|
+
def initialize(owner, opts)
|
47
|
+
super(owner, nil, 0, opts)
|
48
|
+
self.setLexer FXScintilla::SCLEX_HTML
|
49
|
+
self.setCodePage(FXScintilla::SC_CP_UTF8)
|
50
|
+
self.styleSetFont(FXScintilla::STYLE_DEFAULT, "fixed")
|
51
|
+
self.styleSetSize(FXScintilla::STYLE_DEFAULT, 9)
|
52
|
+
self.styleClearAll
|
53
|
+
self.styleSetFore(FXScintilla::SCE_P_DEFAULT, FXRGB(0x80, 0x80, 0x80) & 0xffffff)
|
54
|
+
self.styleSetFore(FXScintilla::SCE_P_COMMENTLINE, FXRGB(0x00, 0x7f, 0x00) & 0xffffff)
|
55
|
+
self.styleSetFore(FXScintilla::SCE_P_NUMBER, FXRGB(0x00, 0x7f, 0x7f) & 0xffffff)
|
56
|
+
self.styleSetFore(FXScintilla::SCE_P_STRING, FXRGB(0x7f, 0x00, 0x7f) & 0xffffff)
|
57
|
+
self.styleSetFore(FXScintilla::SCE_P_CHARACTER, FXRGB(0x7f, 0x00, 0x7f) & 0xffffff)
|
58
|
+
self.styleSetFore(FXScintilla::SCE_P_WORD, FXRGB(0x00, 0x00, 0x7f) & 0xffffff)
|
59
|
+
self.styleSetBold(FXScintilla::SCE_P_WORD, true)
|
60
|
+
self.styleSetFore(FXScintilla::SCE_P_TRIPLE, FXRGB(0x7f, 0x00, 0x00) & 0xffffff)
|
61
|
+
self.styleSetFore(FXScintilla::SCE_P_TRIPLEDOUBLE, FXRGB(0x7f, 0x00, 0x00) & 0xffffff)
|
62
|
+
self.styleSetFore(FXScintilla::SCE_P_CLASSNAME, FXRGB(0x00, 0x00, 0xff) & 0xffffff)
|
63
|
+
self.styleSetBold(FXScintilla::SCE_P_CLASSNAME, true)
|
64
|
+
self.styleSetFore(FXScintilla::SCE_P_DEFNAME, FXRGB(0x00, 0x7f, 0x7f) & 0xffffff)
|
65
|
+
self.styleSetBold(FXScintilla::SCE_P_DEFNAME, true)
|
66
|
+
self.styleSetBold(FXScintilla::SCE_P_OPERATOR, true)
|
67
|
+
self.styleSetFore(FXScintilla::SCE_P_IDENTIFIER, FXRGB(0x7f, 0x7f, 0x7f) & 0xffffff)
|
68
|
+
self.styleSetFore(FXScintilla::SCE_P_COMMENTBLOCK, FXRGB(0x7f, 0x7f, 0x7f) & 0xffffff)
|
69
|
+
self.styleSetFore(FXScintilla::SCE_P_STRINGEOL, FXRGB(0x00, 0x00, 0x00) & 0xffffff)
|
70
|
+
self.styleSetBack(FXScintilla::SCE_P_STRINGEOL, FXRGB(0xe0, 0xc0, 0xe0) & 0xffffff)
|
71
|
+
self.styleSetEOLFilled(FXScintilla::SCE_P_STRINGEOL, true)
|
72
|
+
self.styleSetFore(34, FXRGB(0x00, 0x00, 0xff) & 0xffffff)
|
73
|
+
self.styleSetBold(34, true)
|
74
|
+
self.styleSetFore(35, FXRGB(0xff, 0x00, 0x00) & 0xffffff)
|
75
|
+
self.styleSetBold(35, true)
|
76
|
+
@max_len = 0
|
77
|
+
end
|
78
|
+
end
|
79
|
+
|
80
|
+
class HTMLViewerFrame < FXVerticalFrame
|
81
|
+
|
82
|
+
attr_accessor :max_len
|
83
|
+
|
84
|
+
def setText(text, prefs={})
|
85
|
+
|
86
|
+
normalized_text = "- empty -"
|
87
|
+
if text.is_a? String
|
88
|
+
normalized_text = text.gsub(/[^[:print:]]/,".")
|
89
|
+
elsif text.respond_to? :has_body?
|
90
|
+
unless text.body.nil? or text.body.empty?
|
91
|
+
body = text.body.strip
|
92
|
+
if text.content_type =~ /(html|xml)/
|
93
|
+
doc = Nokogiri::XML(body, &:noblanks)
|
94
|
+
fbody = doc.to_xhtml( indent:3, indent_text:" ")
|
95
|
+
normalized_text = fbody.to_s
|
96
|
+
else
|
97
|
+
normalized_text = body
|
98
|
+
end
|
99
|
+
end
|
100
|
+
elsif text.is_a? Array
|
101
|
+
normalized_text = text.join
|
102
|
+
end
|
103
|
+
|
104
|
+
@text = normalized_text
|
105
|
+
|
106
|
+
# puts normalized_text
|
107
|
+
@html_viewer.setText(@text)
|
108
|
+
#@html_viewer.encodedFromUTF8(normalized_text)
|
109
|
+
|
110
|
+
@match_pos_label.text = "0/0"
|
111
|
+
@match_pos_label.textColor = 'grey'
|
112
|
+
|
113
|
+
@html_viewer.setTargetStart 0
|
114
|
+
@html_viewer.setTargetEnd @html_viewer.getLength
|
115
|
+
|
116
|
+
applyFilter() if @auto_apply_cbtn.checked?
|
117
|
+
end
|
118
|
+
|
119
|
+
def highlight(pattern)
|
120
|
+
highlightPattern(pattern)
|
121
|
+
end
|
122
|
+
|
123
|
+
def getText
|
124
|
+
@html_viewer.to_s
|
125
|
+
end
|
126
|
+
|
127
|
+
def initialize(owner, opts)
|
128
|
+
super(owner, opts)
|
129
|
+
|
130
|
+
@text_matches = []
|
131
|
+
|
132
|
+
@style = 2 # default style
|
133
|
+
@text = ''
|
134
|
+
@max_len = 5000
|
135
|
+
@filter_mode = SEL_TYPE_HIGHLIGHT
|
136
|
+
@match_pos = 0
|
137
|
+
|
138
|
+
text_view_header = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_SIDE_BOTTOM|LAYOUT_FIX_HEIGHT,:height => 24, :padding => 0)
|
139
|
+
|
140
|
+
#@auto_apply_cbtn.connect(SEL_COMMAND, method(:onInterceptChanged))
|
141
|
+
|
142
|
+
pmatch_btn = FXButton.new(text_view_header, "<", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y)
|
143
|
+
@match_pos_label = FXLabel.new(text_view_header, "0/0", :opts => LAYOUT_FILL_Y)
|
144
|
+
@match_pos_label.textColor = 'grey'
|
145
|
+
pmatch_btn.connect(SEL_COMMAND) { gotoPrevMatch() }
|
146
|
+
nmatch_btn = FXButton.new(text_view_header, ">", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y)
|
147
|
+
nmatch_btn.connect(SEL_COMMAND) { gotoNextMatch() }
|
148
|
+
|
149
|
+
# @filter_text = FXTextField.new(text_view_header, 10,
|
150
|
+
# :target => @filter_dt, :selector => FXDataTarget::ID_VALUE,
|
151
|
+
# :opts => FRAME_SUNKEN|FRAME_THICK|LAYOUT_FILL_X|LAYOUT_FILL_Y)
|
152
|
+
|
153
|
+
@filter_text = FXComboBox.new(text_view_header, 20, nil, 0, FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
|
154
|
+
@filter_text.connect(SEL_COMMAND){
|
155
|
+
applyFilter()
|
156
|
+
addFilterHistory()
|
157
|
+
}
|
158
|
+
|
159
|
+
@filter_text.connect(SEL_CHANGED) {
|
160
|
+
applyFilter()
|
161
|
+
}
|
162
|
+
|
163
|
+
@auto_apply_cbtn = FXCheckButton.new(text_view_header, "auto-apply", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP|LAYOUT_RIGHT|LAYOUT_FILL_Y)
|
164
|
+
|
165
|
+
|
166
|
+
text_box_frame = FXVerticalFrame.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
|
167
|
+
|
168
|
+
@html_viewer = HTMLViewer.new(text_box_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
|
169
|
+
#searchflags = FXScintilla::SCFIND_WHOLEWORD|FXScintilla::SCFIND_MATCHCASE|FXScintilla::SCFIND_REGEXP|FXScintilla::SCFIND_WORDSTART
|
170
|
+
@searchflags = FXScintilla::SCFIND_REGEXP
|
171
|
+
@html_viewer.setSearchFlags @searchflags
|
172
|
+
|
173
|
+
addHotkeyHandler(@html_viewer)
|
174
|
+
addHotkeyHandler(@filter_text)
|
175
|
+
|
176
|
+
# @filter_dt.connect(SEL_COMMAND) { applyFilter() }
|
177
|
+
|
178
|
+
end
|
179
|
+
|
180
|
+
def applyFilter
|
181
|
+
pattern = @filter_text.text
|
182
|
+
return if pattern.empty?
|
183
|
+
|
184
|
+
@match_pos_label.text = "0/0"
|
185
|
+
@match_pos_label.textColor = 'grey'
|
186
|
+
|
187
|
+
@text_matches = @html_viewer.search_text(pattern)
|
188
|
+
|
189
|
+
|
190
|
+
if @text_matches.length > 0
|
191
|
+
@match_pos_label.textColor = 'black'
|
192
|
+
@match_pos_label.text = "1/#{@text_matches.length}"
|
193
|
+
|
194
|
+
show_match_pos(0)
|
195
|
+
end
|
196
|
+
|
197
|
+
end
|
198
|
+
|
199
|
+
private
|
200
|
+
|
201
|
+
def show_match_pos(match_pos=nil)
|
202
|
+
|
203
|
+
pos = match_pos.nil? ? 0 : match_pos
|
204
|
+
return false if @text_matches.empty?
|
205
|
+
return false if pos > @text_matches.length-1
|
206
|
+
@match_pos = pos
|
207
|
+
pattern = @filter_text.text
|
208
|
+
text_pos = @text_matches[pos]
|
209
|
+
@html_viewer.gotoPos text_pos
|
210
|
+
@html_viewer.setSel text_pos, text_pos+pattern.length
|
211
|
+
end
|
212
|
+
|
213
|
+
def show_next
|
214
|
+
if @match_pos < @text_matches.length-1
|
215
|
+
@match_pos += 1
|
216
|
+
show_match_pos @match_pos
|
217
|
+
return true
|
218
|
+
end
|
219
|
+
return false
|
220
|
+
end
|
221
|
+
|
222
|
+
def show_prev
|
223
|
+
if @match_pos > 0
|
224
|
+
@match_pos -= 1
|
225
|
+
show_match_pos @match_pos
|
226
|
+
return true
|
227
|
+
end
|
228
|
+
return false
|
229
|
+
end
|
230
|
+
|
231
|
+
|
232
|
+
def addFilterHistory()
|
233
|
+
text = @filter_text.text
|
234
|
+
return true if text == ''
|
235
|
+
has_item = false
|
236
|
+
@filter_text.each do |item, data|
|
237
|
+
has_item = true if data == text
|
238
|
+
end
|
239
|
+
@filter_text.appendItem(text, text) unless has_item == true
|
240
|
+
@filter_text.numVisible = @filter_text.numItems
|
241
|
+
end
|
242
|
+
|
243
|
+
def resetFilter
|
244
|
+
@match_pos_label.text = "0/0"
|
245
|
+
@match_pos_label.textColor = 'grey'
|
246
|
+
@filter_text.text = ''
|
247
|
+
end
|
248
|
+
|
249
|
+
def addHotkeyHandler(widget)
|
250
|
+
@ctrl_pressed = false
|
251
|
+
|
252
|
+
widget.connect(SEL_KEYPRESS) { |sender, sel, event|
|
253
|
+
state = false
|
254
|
+
@ctrl_pressed = true if event.code == KEY_Control_L or event.code == KEY_Control_R
|
255
|
+
# @shift_pressed = true if @ctrl_pressed and ( event.code == KEY_Shift_L or event.code == KEY_Shift_R )
|
256
|
+
if event.code == KEY_Return
|
257
|
+
highlight(@filter_text.text)
|
258
|
+
state = true # special handling of KEY_Return, because we don't want a linebreak in textbox.
|
259
|
+
end
|
260
|
+
|
261
|
+
if event.code == KEY_F1
|
262
|
+
|
263
|
+
unless event.moved?
|
264
|
+
FXMenuPane.new(self) do |menu_pane|
|
265
|
+
FXMenuCaption.new(menu_pane, "Hotkeys:")
|
266
|
+
FXMenuSeparator.new(menu_pane)
|
267
|
+
[ "<ctrl-r> - Reset Filter",
|
268
|
+
"<ctrl-n> - Goto Next",
|
269
|
+
"<ctrl-shift-n> - Goto Prev"
|
270
|
+
].each do |hk|
|
271
|
+
FXMenuCaption.new(menu_pane, hk).backColor = 'yellow'
|
272
|
+
end
|
273
|
+
|
274
|
+
menu_pane.create
|
275
|
+
menu_pane.popup(nil, event.root_x, event.root_y)
|
276
|
+
app.runModalWhileShown(menu_pane)
|
277
|
+
end
|
278
|
+
|
279
|
+
end
|
280
|
+
end
|
281
|
+
|
282
|
+
if @ctrl_pressed
|
283
|
+
case event.code
|
284
|
+
when KEY_n
|
285
|
+
if show_next
|
286
|
+
@match_pos_label.text = "#{@match_pos+1}/#{@text_matches.length}"
|
287
|
+
end
|
288
|
+
when KEY_N
|
289
|
+
if show_prev
|
290
|
+
@match_pos_label.text = "#{@match_pos+1}/#{@text_matches.length}"
|
291
|
+
end
|
292
|
+
when KEY_r
|
293
|
+
resetFilter()
|
294
|
+
|
295
|
+
end
|
296
|
+
end
|
297
|
+
state
|
298
|
+
}
|
299
|
+
|
300
|
+
widget.connect(SEL_KEYRELEASE) { |sender, sel, event|
|
301
|
+
@ctrl_pressed = false if event.code == KEY_Control_L or event.code == KEY_Control_R
|
302
|
+
false
|
303
|
+
}
|
304
|
+
end
|
305
|
+
|
306
|
+
end
|
307
|
+
end
|
308
|
+
end
|
309
|
+
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# .
|
2
2
|
# intercept_filter_dialog.rb
|
3
3
|
#
|
4
|
-
# Copyright
|
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
|
-
|
22
|
+
# @private
|
23
|
+
module Watobo#:nodoc: all
|
23
24
|
module Gui
|
24
25
|
class InterceptFilterDialog < FXDialogBox
|
25
26
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# .
|
2
2
|
# interceptor_gui.rb
|
3
3
|
#
|
4
|
-
# Copyright
|
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
|
-
|
22
|
+
# @private
|
23
|
+
module Watobo#:nodoc: all
|
23
24
|
module Gui
|
24
25
|
class InterceptEditor < FXVerticalFrame
|
25
26
|
|
@@ -664,9 +665,9 @@ module Watobo
|
|
664
665
|
if not response.nil?
|
665
666
|
response[:response].clear
|
666
667
|
new_response = @responsebox.to_response(:update_content_length => true)
|
667
|
-
puts new_response.class
|
668
|
+
#puts new_response.class
|
668
669
|
response[:response].concat new_response
|
669
|
-
puts new_response
|
670
|
+
#puts new_response
|
670
671
|
response[:thread].run
|
671
672
|
@responsebox.clear
|
672
673
|
@response_list.shift
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# .
|
2
2
|
# interceptor_settings_dialog.rb
|
3
3
|
#
|
4
|
-
# Copyright
|
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
|
-
|
22
|
+
# @private
|
23
|
+
module Watobo#:nodoc: all
|
23
24
|
module Gui
|
24
25
|
|
25
26
|
class InterceptorSettingsFrame < FXVerticalFrame
|
@@ -206,7 +207,7 @@ module Watobo
|
|
206
207
|
|
207
208
|
# puts "create scopeframe with scope:"
|
208
209
|
# @project.scope
|
209
|
-
# @defineScopeFrame = DefineScopeFrame.new(base_frame,
|
210
|
+
# @defineScopeFrame = DefineScopeFrame.new(base_frame, Watobo::Chats.sites(), YAML.load(YAML.dump(@project.scope)), prefs)
|
210
211
|
@interceptorSettingsFrame = InterceptorSettingsFrame.new(base_frame, :opts => SCROLLERS_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y)
|
211
212
|
|
212
213
|
buttons_frame = FXHorizontalFrame.new(base_frame,
|
data/lib/watobo/gui/list_box.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# .
|
2
2
|
# list_box.rb
|
3
3
|
#
|
4
|
-
# Copyright
|
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
|
-
|
22
|
+
# @private
|
23
|
+
module Watobo#:nodoc: all
|
23
24
|
module Gui
|
24
25
|
class ListBox < FXGroupBox
|
25
26
|
def to_a
|
@@ -78,7 +79,7 @@ module Watobo
|
|
78
79
|
fxtext = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
|
79
80
|
fxtext.backColor = fxtext.parent.backColor
|
80
81
|
fxtext.disable
|
81
|
-
text =
|
82
|
+
text = "#{info_text}"
|
82
83
|
fxtext.setText(text)
|
83
84
|
end
|
84
85
|
|
@@ -0,0 +1,55 @@
|
|
1
|
+
# .
|
2
|
+
# log_file_viewer.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
|
+
module Gui
|
25
|
+
class LogFileViewer < FXVerticalFrame
|
26
|
+
|
27
|
+
include Watobo::Constants
|
28
|
+
def show_logs
|
29
|
+
begin
|
30
|
+
@textbox.setText(Watobo.logs)
|
31
|
+
rescue => bang
|
32
|
+
puts "! Could not show logs"
|
33
|
+
puts bang
|
34
|
+
puts bang.backtrace if $DEBUG
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
|
39
|
+
def initialize(parent, mode = nil, opts)
|
40
|
+
opts[:padding]=0
|
41
|
+
|
42
|
+
super(parent, opts)
|
43
|
+
|
44
|
+
update_btn = FXButton.new(self, "Update",:opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_LEFT).connect(SEL_COMMAND){ show_logs }
|
45
|
+
frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
|
46
|
+
@textbox = FXText.new(frame, nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_AUTOSCROLL|TEXT_READONLY)
|
47
|
+
@textbox.editable = false
|
48
|
+
show_logs
|
49
|
+
|
50
|
+
end
|
51
|
+
|
52
|
+
end
|
53
|
+
|
54
|
+
end
|
55
|
+
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# .
|
2
2
|
# log_viewer.rb
|
3
3
|
#
|
4
|
-
# Copyright
|
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
|
-
|
22
|
+
# @private
|
23
|
+
module Watobo#:nodoc: all
|
23
24
|
module Gui
|
24
25
|
class LogViewer < FXVerticalFrame
|
25
26
|
|
@@ -97,85 +98,5 @@ module Watobo
|
|
97
98
|
|
98
99
|
end
|
99
100
|
|
100
|
-
class LogViewer_UNUSED < FXVerticalFrame
|
101
|
-
|
102
|
-
include Watobo::Constants
|
103
|
-
def purge
|
104
|
-
@lock.synchronize do
|
105
|
-
@textbox.text = ''
|
106
|
-
end
|
107
|
-
end
|
108
|
-
|
109
|
-
def log(sender=nil, log_level, msg )
|
110
|
-
puts "#{sender.class} => #{msg}" if $DEBUG
|
111
|
-
begin
|
112
|
-
t = Time.now
|
113
|
-
now = t.strftime("%m/%d/%Y @ %H:%M:%S")
|
114
|
-
|
115
|
-
begin
|
116
|
-
log_text = case log_level
|
117
|
-
when LOG_INFO
|
118
|
-
"#{now}: #{msg}\n"
|
119
|
-
else
|
120
|
-
""
|
121
|
-
end
|
122
|
-
rescue => bang
|
123
|
-
puts bang
|
124
|
-
puts bang.backtrace if $DEBUG
|
125
|
-
end
|
126
|
-
@lock.synchronize do
|
127
|
-
log_text << @log_message unless @log_message.nil?
|
128
|
-
@log_message = log_text
|
129
|
-
end
|
130
|
-
rescue => bang
|
131
|
-
puts bang
|
132
|
-
puts bang.backtrace
|
133
|
-
end
|
134
|
-
|
135
|
-
end
|
136
|
-
|
137
|
-
def start_update_timer
|
138
|
-
@timer = FXApp.instance.addTimeout( 50, :repeat => true) {
|
139
|
-
@lock.synchronize do
|
140
|
-
unless @log_message.nil?
|
141
|
-
unless @log_message.empty?
|
142
|
-
case @mode
|
143
|
-
when :insert
|
144
|
-
@textbox.insertText(0,@log_message)
|
145
|
-
when :append
|
146
|
-
@textbox.appendText(@log_message)
|
147
|
-
end
|
148
|
-
end
|
149
|
-
@log_message = nil
|
150
|
-
end
|
151
|
-
end
|
152
|
-
}
|
153
|
-
end
|
154
|
-
|
155
|
-
def destroy
|
156
|
-
getApp().removeTimeout(@timer) unless @timer.nil?
|
157
|
-
super
|
158
|
-
1
|
159
|
-
end
|
160
|
-
|
161
|
-
def initialize(parent, mode = :insert, opts)
|
162
|
-
opts[:padding] = 0
|
163
|
-
super(parent, opts)
|
164
|
-
|
165
|
-
@mode = mode
|
166
|
-
|
167
|
-
@log_message = nil
|
168
|
-
@lock = Mutex.new
|
169
|
-
@timer = nil
|
170
|
-
|
171
|
-
#self.connect(SEL_CLOSE, method(:onClose))
|
172
|
-
|
173
|
-
@textbox = FXText.new(self, nil, 0, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
|
174
|
-
@textbox.editable = false
|
175
|
-
start_update_timer
|
176
|
-
end
|
177
|
-
|
178
|
-
end
|
179
|
-
|
180
101
|
end
|
181
102
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
# .
|
2
2
|
# login_wizzard.rb
|
3
3
|
#
|
4
|
-
# Copyright
|
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
|
@@ -41,7 +41,7 @@ class FXLoginWizzard < FXDialogBox
|
|
41
41
|
|
42
42
|
def onRequestClick(sender,sel,item)
|
43
43
|
@lastid=item
|
44
|
-
chat =
|
44
|
+
chat = Watobo::Chats.get_by_id(@request_list.getItemText(@lastid))
|
45
45
|
if chat then
|
46
46
|
show_chat(chat)
|
47
47
|
end
|
@@ -70,7 +70,7 @@ class FXLoginWizzard < FXDialogBox
|
|
70
70
|
@request_list.clearItems
|
71
71
|
idlist.each do |chatid|
|
72
72
|
|
73
|
-
chat =
|
73
|
+
chat = Watobo::Chats.get_by_id(chatid)
|
74
74
|
puts chat.id
|
75
75
|
if chat then
|
76
76
|
#puts chatid
|