RubyGems - watobo - Versions diffs - 0.9.19 → 0.9.20 - Mend

watobo 0.9.19 → 0.9.20

Files changed (266) hide show

data/CHANGELOG.md +104 -0
data/bin/nfq_server.rb +8 -20
data/bin/watobo_gui.rb +8 -20
data/config/forwarding_proxy.yml +2 -2
data/lib/watobo.rb +12 -22
data/lib/watobo/adapters.rb +12 -24
data/lib/watobo/adapters/data_store.rb +76 -66
data/lib/watobo/adapters/file/file_store.rb +295 -307
data/lib/watobo/adapters/session_store.rb +13 -25
data/lib/watobo/ca.rb +9 -21
data/lib/watobo/config.rb +205 -217
data/lib/watobo/constants.rb +8 -20
data/lib/watobo/core.rb +11 -23
data/lib/watobo/core/active_check.rb +11 -21
data/lib/watobo/core/active_checks.rb +57 -69
data/lib/watobo/core/ca.rb +388 -398
data/lib/watobo/core/cert_store.rb +42 -54
data/lib/watobo/core/chat.rb +100 -112
data/lib/watobo/core/chats.rb +271 -275
data/lib/watobo/core/client_cert_store.rb +33 -45
data/lib/watobo/core/conversation.rb +56 -68
data/lib/watobo/core/cookie.rb +31 -43
data/lib/watobo/core/finding.rb +74 -86
data/lib/watobo/core/findings.rb +113 -125
data/lib/watobo/core/forwarding_proxy.rb +44 -35
data/lib/watobo/core/fuzz_gen.rb +8 -20
data/lib/watobo/core/intercept_carver.rb +176 -188
data/lib/watobo/core/intercept_filter.rb +243 -255
data/lib/watobo/core/interceptor.rb +106 -118
data/lib/watobo/core/min_class.rb +12 -24
data/lib/watobo/core/netfilter_queue.rb +178 -190
data/lib/watobo/core/ott_cache.rb +152 -148
data/lib/watobo/core/parameter.rb +53 -58
data/lib/watobo/core/passive_check.rb +8 -20
data/lib/watobo/core/passive_checks.rb +56 -68
data/lib/watobo/core/passive_scanner.rb +54 -66
data/lib/watobo/core/plugin.rb +19 -31
data/lib/watobo/core/project.rb +8 -20
data/lib/watobo/core/proxy.rb +51 -63
data/lib/watobo/core/request.rb +128 -120
data/lib/watobo/core/response.rb +59 -61
data/lib/watobo/core/scanner.rb +8 -20
data/lib/watobo/core/scanner3.rb +413 -425
data/lib/watobo/core/scope.rb +91 -103
data/lib/watobo/core/session.rb +109 -87
data/lib/watobo/core/sid_cache.rb +106 -118
data/lib/watobo/core/subscriber.rb +33 -45
data/lib/watobo/defaults.rb +29 -41
data/lib/watobo/external/diff/lcs.rb +8 -20
data/lib/watobo/external/diff/lcs/array.rb +8 -20
data/lib/watobo/external/diff/lcs/block.rb +8 -20
data/lib/watobo/external/diff/lcs/callbacks.rb +8 -20
data/lib/watobo/external/diff/lcs/change.rb +8 -20
data/lib/watobo/external/diff/lcs/hunk.rb +8 -20
data/lib/watobo/external/diff/lcs/ldiff.rb +8 -20
data/lib/watobo/external/diff/lcs/string.rb +8 -20
data/lib/watobo/externals.rb +14 -26
data/lib/watobo/framework.rb +12 -24
data/lib/watobo/framework/create_project.rb +68 -80
data/lib/watobo/framework/init.rb +8 -20
data/lib/watobo/framework/init_modules.rb +8 -20
data/lib/watobo/framework/license_text.rb +36 -48
data/lib/watobo/framework/load_chat.rb +21 -33
data/lib/watobo/gui.rb +121 -133
data/lib/watobo/gui/about_watobo.rb +8 -20
data/lib/watobo/gui/browser_preview.rb +8 -20
data/lib/watobo/gui/certificate_dialog.rb +8 -20
data/lib/watobo/gui/chat_diff.rb +11 -21
data/lib/watobo/gui/chatviewer_frame.rb +10 -22
data/lib/watobo/gui/checkboxtree.rb +8 -20
data/lib/watobo/gui/checks_policy_frame.rb +8 -20
data/lib/watobo/gui/client_cert_dialog.rb +10 -21
data/lib/watobo/gui/confirm_scan_dialog.rb +8 -20
data/lib/watobo/gui/conversation_table.rb +54 -44
data/lib/watobo/gui/conversation_table_ctrl.rb +215 -227
data/lib/watobo/gui/conversation_table_ctrl2.rb +385 -393
data/lib/watobo/gui/csrf_token_dialog.rb +11 -25
data/lib/watobo/gui/custom_viewer.rb +357 -369
data/lib/watobo/gui/dashboard.rb +8 -20
data/lib/watobo/gui/define_scope_frame.rb +8 -20
data/lib/watobo/gui/differ_frame.rb +223 -235
data/lib/watobo/gui/edit_comment.rb +8 -20
data/lib/watobo/gui/edit_scope_dialog.rb +8 -20
data/lib/watobo/gui/export_dialog.rb +114 -0
data/lib/watobo/gui/finding_info.rb +9 -21
data/lib/watobo/gui/findings_tree.rb +8 -20
data/lib/watobo/gui/full_scan_dialog.rb +8 -20
data/lib/watobo/gui/fuzzer_gui.rb +8 -20
data/lib/watobo/gui/goto_url_dialog.rb +78 -90
data/lib/watobo/gui/hex_viewer.rb +25 -27
data/lib/watobo/gui/html_viewer.rb +295 -307
data/lib/watobo/gui/intercept_filter_dialog.rb +196 -208
data/lib/watobo/gui/interceptor_gui.rb +1046 -1041
data/lib/watobo/gui/interceptor_settings_dialog.rb +8 -20
data/lib/watobo/gui/list_box.rb +109 -121
data/lib/watobo/gui/log_file_viewer.rb +40 -52
data/lib/watobo/gui/log_viewer.rb +87 -99
data/lib/watobo/gui/login_wizzard.rb +8 -20
data/lib/watobo/gui/main_window.rb +34 -33
data/lib/watobo/gui/manual_request_editor.rb +25 -35
data/lib/watobo/gui/master_pw_dialog.rb +8 -20
data/lib/watobo/gui/mixins/gui_settings.rb +37 -49
data/lib/watobo/gui/page_tree.rb +225 -237
data/lib/watobo/gui/password_policy_dialog.rb +8 -20
data/lib/watobo/gui/plugin_board.rb +8 -20
data/lib/watobo/gui/preferences_dialog.rb +8 -20
data/lib/watobo/gui/progress_window.rb +8 -20
data/lib/watobo/gui/project_wizzard.rb +8 -20
data/lib/watobo/gui/proxy_dialog.rb +117 -85
data/lib/watobo/gui/quick_scan_dialog.rb +8 -20
data/lib/watobo/gui/request_builder_frame.rb +125 -122
data/lib/watobo/gui/request_editor.rb +53 -28
data/lib/watobo/gui/rewrite_filters_dialog.rb +402 -414
data/lib/watobo/gui/rewrite_rules_dialog.rb +380 -392
data/lib/watobo/gui/save_chat_dialog.rb +148 -160
data/lib/watobo/gui/scanner_settings_dialog.rb +8 -20
data/lib/watobo/gui/select_chat_dialog.rb +8 -20
data/lib/watobo/gui/session_management_dialog.rb +8 -20
data/lib/watobo/gui/sites_tree.rb +118 -22
data/lib/watobo/gui/status_bar.rb +8 -20
data/lib/watobo/gui/table_editor.rb +76 -53
data/lib/watobo/gui/tagless_viewer.rb +10 -21
data/lib/watobo/gui/templates/plugin.rb +8 -20
data/lib/watobo/gui/templates/plugin2.rb +99 -111
data/lib/watobo/gui/templates/plugin_base.rb +152 -164
data/lib/watobo/gui/text_viewer.rb +8 -20
data/lib/watobo/gui/transcoder_window.rb +15 -22
data/lib/watobo/gui/utils/gui_utils.rb +8 -20
data/lib/watobo/gui/utils/init_icons.rb +94 -106
data/lib/watobo/gui/utils/load_icons.rb +41 -53
data/lib/watobo/gui/utils/load_plugins.rb +118 -130
data/lib/watobo/gui/utils/master_password.rb +76 -88
data/lib/watobo/gui/utils/save_default_settings.rb +121 -133
data/lib/watobo/gui/utils/save_project_settings.rb +8 -20
data/lib/watobo/gui/utils/save_proxy_settings.rb +53 -21
data/lib/watobo/gui/utils/save_scanner_settings.rb +26 -38
data/lib/watobo/gui/utils/session_history.rb +120 -132
data/lib/watobo/gui/workspace_dialog.rb +8 -20
data/lib/watobo/gui/www_auth_dialog.rb +8 -20
data/lib/watobo/gui/xml_viewer_frame.rb +8 -20
data/lib/watobo/http.rb +12 -23
data/lib/watobo/http/cookies/cookies.rb +63 -70
data/lib/watobo/http/data/data.rb +56 -64
data/lib/watobo/http/data/json.rb +51 -0
data/lib/watobo/http/url/url.rb +46 -58
data/lib/watobo/http/xml/xml.rb +129 -141
data/lib/watobo/interceptor.rb +11 -23
data/lib/watobo/interceptor/proxy.rb +624 -625
data/lib/watobo/interceptor/transparent.rb +22 -34
data/lib/watobo/mixins.rb +18 -30
data/lib/watobo/mixins/check_info.rb +35 -47
data/lib/watobo/mixins/httpparser.rb +42 -35
data/lib/watobo/mixins/request_parser.rb +8 -20
data/lib/watobo/mixins/shapers.rb +484 -477
data/lib/watobo/mixins/transcoders.rb +8 -20
data/lib/watobo/parser.rb +9 -21
data/lib/watobo/parser/html.rb +91 -103
data/lib/watobo/sockets.rb +11 -23
data/lib/watobo/sockets/agent.rb +836 -848
data/lib/watobo/sockets/client_socket.rb +283 -277
data/lib/watobo/sockets/connection.rb +409 -421
data/lib/watobo/sockets/http_socket.rb +16 -23
data/lib/watobo/sockets/ntlm_auth.rb +137 -149
data/lib/watobo/utils.rb +18 -30
data/lib/watobo/utils/check_regex.rb +8 -20
data/lib/watobo/utils/copy_object.rb +8 -20
data/lib/watobo/utils/crypto.rb +8 -20
data/lib/watobo/utils/expand_range.rb +31 -43
data/lib/watobo/utils/export_xml.rb +108 -0
data/lib/watobo/utils/file_management.rb +8 -20
data/lib/watobo/utils/hexprint.rb +17 -29
data/lib/watobo/utils/load_chat.rb +8 -20
data/lib/watobo/utils/load_icon.rb +8 -20
data/lib/watobo/{external/ntlm → utils}/ntlm.rb +874 -796
data/lib/watobo/utils/print_debug.rb +20 -32
data/lib/watobo/utils/response_builder.rb +98 -110
data/lib/watobo/utils/response_hash.rb +9 -20
data/lib/watobo/utils/secure_eval.rb +10 -22
data/lib/watobo/utils/strings.rb +18 -30
data/lib/watobo/utils/text2request.rb +12 -20
data/lib/watobo/utils/url.rb +31 -43
data/lib/watobo/utils/utf16.rb +22 -0
data/modules/active/Apache/mod_status.rb +9 -0
data/modules/active/Apache/multiview.rb +161 -0
data/modules/active/Flash/crossdomain.rb +9 -0
data/modules/active/directories/dirwalker.rb +8 -20
data/modules/active/discovery/fileextensions.rb +10 -22
data/modules/active/discovery/http_methods.rb +8 -20
data/modules/active/domino/domino_db.rb +8 -20
data/modules/active/dotNET/custom_errors.rb +110 -122
data/modules/active/dotNET/dotnet_files.rb +98 -110
data/modules/active/fileinclusion/lfi_simple.rb +8 -20
data/modules/active/jboss/jboss_basic.rb +8 -20
data/modules/active/sap/business_objects.rb +63 -0
data/modules/active/sap/its_commands.rb +8 -20
data/modules/active/sap/its_service_parameter.rb +8 -20
data/modules/active/sap/its_services.rb +8 -20
data/modules/active/sap/its_xss.rb +8 -20
data/modules/active/shell_shock/shell_shock.rb +149 -0
data/modules/active/siebel/siebel_apps.rb +168 -180
data/modules/active/sqlinjection/sql_boolean.rb +9 -21
data/modules/active/sqlinjection/sqli_error.rb +10 -22
data/modules/active/sqlinjection/sqli_timing.rb +228 -240
data/modules/active/struts2/default_handler_ognl.rb +114 -126
data/modules/active/struts2/include_params_ognl.rb +113 -125
data/modules/active/xml/xml_xxe.rb +122 -127
data/modules/active/xss/xss_ng.rb +223 -234
data/modules/active/xss/xss_simple.rb +8 -20
data/modules/passive/ajax.rb +76 -84
data/modules/passive/autocomplete.rb +64 -76
data/modules/passive/cookie_options.rb +8 -20
data/modules/passive/cookie_xss.rb +9 -21
data/modules/passive/detect_code.rb +9 -21
data/modules/passive/detect_fileupload.rb +11 -22
data/modules/passive/detect_infrastructure.rb +23 -35
data/modules/passive/detect_one_time_tokens.rb +8 -20
data/modules/passive/dirindexing.rb +9 -21
data/modules/passive/disclosure_domino.rb +66 -79
data/modules/passive/disclosure_emails.rb +9 -21
data/modules/passive/disclosure_ipaddr.rb +15 -23
data/modules/passive/filename_as_parameter.rb +8 -20
data/modules/passive/form_spotter.rb +15 -21
data/modules/passive/hidden_fields.rb +64 -70
data/modules/passive/hotspots.rb +13 -22
data/modules/passive/in_script_parameter.rb +15 -24
data/modules/passive/multiple_server_headers.rb +8 -20
data/modules/passive/possible_login.rb +12 -23
data/modules/passive/redirect_url.rb +10 -22
data/modules/passive/redirectionz.rb +9 -21
data/modules/passive/sap-headers.rb +64 -76
data/modules/passive/xss_dom.rb +10 -21
data/plugins/catalog/catalog.rb +17 -23
data/plugins/crawler/crawler.rb +12 -24
data/plugins/crawler/gui.rb +13 -25
data/plugins/crawler/gui/auth_frame.rb +278 -290
data/plugins/crawler/gui/crawler_gui.rb +302 -320
data/plugins/crawler/gui/general_settings_frame.rb +104 -116
data/plugins/crawler/gui/hooks_frame.rb +88 -100
data/plugins/crawler/gui/scope_frame.rb +58 -70
data/plugins/crawler/gui/settings_tabbook.rb +46 -58
data/plugins/crawler/gui/status_frame.rb +67 -78
data/plugins/crawler/lib/bags.rb +26 -38
data/plugins/crawler/lib/constants.rb +19 -31
data/plugins/crawler/lib/engine.rb +505 -508
data/plugins/crawler/lib/grabber.rb +77 -87
data/plugins/crawler/lib/status.rb +82 -0
data/plugins/crawler/lib/uri_mp.rb +20 -32
data/plugins/filefinder/dbs/siebel_paths.txt +1118 -0
data/plugins/filefinder/dbs/subs-big.lst +31986 -0
data/plugins/filefinder/filefinder.rb +13 -23
data/plugins/sqlmap/bin/test.rb +86 -98
data/plugins/sqlmap/gui.rb +12 -24
data/plugins/sqlmap/gui/main.rb +226 -238
data/plugins/sqlmap/gui/options_frame.rb +105 -117
data/plugins/sqlmap/lib/sqlmap_ctrl.rb +103 -115
data/plugins/sqlmap/sqlmap.rb +10 -22
data/plugins/sslchecker/cli/sslchecker_cli.rb +8 -20
data/plugins/sslchecker/gui/cipher_table.rb +252 -264
data/plugins/sslchecker/gui/gui.rb +267 -276
data/plugins/sslchecker/gui/sslchecker.rb +12 -24
data/plugins/sslchecker/lib/check.rb +172 -80
data/plugins/wshell/gui/main.rb +115 -127
data/plugins/wshell/lib/core.rb +85 -97
data/plugins/wshell/wshell.rb +19 -31
metadata +14 -6
data/.yardopts +0 -24

data/lib/watobo/sockets/connection.rb CHANGED Viewed

@@ -1,423 +1,411 @@
-# .
+#.
 # connection.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 HTTPSocket
-    class Connection_UNUSED
-      include Watobo::Constants
-      extend Watobo::Subscriber
-      def initialize(request, prefs)
-        @request = request
-        @response = nil
-        @proxy = Watobo::ForwardingProxy.get(site)
-          unless @proxy.nil?
-            host = @proxy.host
-            port = @proxy.port
-          else
-            host = @request.host
-            port = @request.port
-          end
-          # check if hostname is valid and can be resolved
-          #hostip = IPSocket.getaddress(host)
-      end
-      def read_body( prefs={} )
-        clen = @response.content_length
-        data = ""
-        begin
-          if @response.is_chunked?
-            Watobo::HTTPSocket.readChunkedBody(@socket) { |c|
-              data += c
-            }
-          elsif  clen > 0
-            #  puts "* read #{clen} bytes for body"
-            Watobo::HTTPSocket.read_body(@socket, :max_bytes => clen) { |c|
-              data += c
-              break if data.length == clen
-            }
-          elsif clen < 0
-            # puts "* no content-length information ... mmmmmpf"
-           # eofcount = 0
-            Watobo::HTTPSocket.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
-        return false
-      end
-      def read_header( prefs={} )
-        header = []
-        msg = nil
-        begin
-            Watobo::HTTPSocket.read_header(@socket) do |line|
-            #puts line
-            # puts line.unpack("H*")
-            header << line
-          end
-          rescue Errno::ECONNRESET
-            msg = "<html><head><title>WATOBO</title></head><body>WATOBO: Connection Reset By Peer</body></html>"
-          rescue Timeout::Error
-            msg = "<html><head><title>WATOBO</title></head><body>WATOBO: Timeout</body></html>"
-        rescue => bang
-          puts "!ERROR: read_header"
-          return nil
-        end
-         header = [ "HTTP/1.1 200 OK\r\n", "Server: WATOBO\r\n", "Content-Length: #{msg.length.to_i}\r\n", "Content-Type: text/html\r\n", "\r\n", "#{msg}" ] unless msg.nil?
-        response = Watobo::Response.new header
-        #  update_sids(header)
-        #  update_sids(request.site, response) if prefs[:update_sids] == true
-        unless prefs[:ignore_logout]==true or @session[:logout_signatures].empty?
-           notify(:logout, self) if loggedOut?(response)
-        end
-        return response
-      end
-       def sslConnect(tcp_socket, current_prefs = {} )
-        begin
-          ctx = OpenSSL::SSL::SSLContext.new()
-          ctx.ciphers = current_prefs[:ssl_cipher] if current_prefs.has_key? :ssl_cipher
-          if current_prefs.has_key? :ssl_client_cert and current_prefs.has_key? :ssl_client_key
-            ctx.cert = current_prefs[:ssl_client_cert]
-            ctx.key = current_prefs[:ssl_client_key]
-            if $DEBUG
-                        puts "[SSLconnect] Client Certificates"
-                        puts "= CERT ="
-                       # puts @ctx.cert.methods.sort
-              puts ctx.cert.display
-              puts "---"
-                        puts "= KEY ="
-                        puts ctx.key.display
-                        puts "---"
-                      end
-                      end
-          @socket = OpenSSL::SSL::SSLSocket.new(tcp_socket, ctx)
-          @socket.sync_close = true
-          @socket.connect
-          @socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1)
-          puts "[SSLconnect]: #{@socket.state}" if $DEBUG
-          return socket
-        rescue => bang
-          if current_prefs[:ssl_cipher].nil?
-            puts "[SSLconnect] ... gr#!..*peep*.. "
-            puts bang
-            puts bang.backtrace if $DEBUG
-          end
-        end
-      end
-      # SSLProxyConnect
-      # return SSLSocket, ResponseHeader of ConnectionSetup
-      # On error SSLSocket is nil
-      def sslProxyConnect( prefs )
-        begin
-          tcp_socket = nil
-          response_header = []
-          request = @request.copy
-          #  timeout(6) do
-          tcp_socket = TCPSocket.new( @proxy.host, @proxy.port)
-          tcp_socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1)
-          tcp_socket.sync = true
-          # setup request
-          dummy = "CONNECT #{request.host}:#{request.port} HTTP/1.0\r\n"
-          request.shift
-          request.unshift dummy
-          request.removeHeader("Proxy-Connection")
-          request.removeHeader("Connection")
-          request.removeHeader("Content-Length")
-          request.removeBody()
-          request.addHeader("Proxy-Connection", "Keep-Alive")
-          request.addHeader("Pragma", "no-cache")
-          #  puts "=== sslProxyConnect ==="
-          #  puts request
-          if proxy.has_login?
-            case proxy.auth_type
-            when AUTH_TYPE_NTLM
-              t1 = Net::NTLM::Message::Type1.new()
-              msg = "NTLM " + t1.encode64
-              request.addHeader("Proxy-Authorization", msg)
-              if $DEBUG
-              puts "============= PROXY NTLM: T1 ======================="
-              puts request
-              puts "---"
-              end
-              data = request.join + "\r\n"
-              tcp_socket.print data
-              #  puts "-----------------"
-              cl = 0
-              ntlm_challenge = nil
-              while (line = tcp_socket.gets)
-                response_header.push line
-                puts line if $DEBUG
-                if line =~ /^HTTP\/\d\.\d (\d+) (.*)/ then
-                  rcode = $1.to_i
-                  rmsg = $2
-                end
-                if line =~ /^Proxy-Authenticate: (NTLM) (.+)\r\n/
-                  ntlm_challenge = $2
-                end
-                if line =~ /^Content-Length: (\d*)/i
-                  cl = $1.to_i
-                end
-                break if line.strip.empty?
-              end
-              if cl > 0
-              Watobo::HTTPSocket.read_body(tcp_socket) { |d|
-                # puts d
-              }
-              end
-              if rcode == 200 # Ok
-                puts "* seems proxy doesn't require authentication"
-                socket = sslConnect(tcp_socket, prefs)
-                return socket, response_header
-              end
-              return socket, response_header if ntlm_challenge.nil? or ntlm_challenge == ""
+#.
+# Copyright 2014 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
-              t2 = Net::NTLM::Message.decode64(ntlm_challenge)
-              t3 = t2.response( { :user => proxy.username,
-                :password => proxy.password,
-                :domain => proxy.domain },
-              { :workstation => proxy.workstation, :ntlmv2 => true } )
-              request.removeHeader("Proxy-Authorization")
-              msg = "NTLM " + t3.encode64
-              request.addHeader("Proxy-Authorization", msg)
-              data = request.join + "\r\n"
-              if $DEBUG
-               puts "============= T3 ======================="
-               puts data
-               puts "---"
-              end
-              tcp_socket.print data
-              #  puts "-----------------"
-              response_header = []
-              rcode = 0
-              response_header = read_header(@socket)
-              rcode = response_header.status
-              if rcode =~/^200/ # Ok
-                puts "[ProxyAuth-NTLM] Authorization Successful" if $DEBUG
-                socket = sslConnect(tcp_socket, prefs)
-                return socket, response_header
-              elsif rcode =~ /^407/ # ProxyAuthentication Required
-                # if rcode is still 407 authentication didn't work -> break
-                msg = "NTLM-Authentication failed!"
-                puts "[ProxyAuth-NTLM] #{msg}" if $DEBUG
-                return nil, msg
-              else
-                puts "[SSLconnect] NTLM Authentication"
-                puts ">  #{rcode} <"
-                return nil, response_header
-              end
-            end
-          end # END OF PROXY AUTH
-          # Start ProxyConnect Without Authentication
-          data = request.join + "\r\n"
-          tcp_socket.print data
-          # puts "-----------------"
-          response_header = []
-          response_header = readHTTPHeader(@socket)
-          rcode = response_header.status
-          if rcode =~ /^200/ # Ok
-            # puts "* proxy connection successfull"
-          elsif rcode =~ /^407/ # ProxyAuthentication Required
-            # if rcode is still 407 authentication didn't work -> break
-          else
-            puts "[SSLconnect] Response Status"
-            puts ">  #{rcode} <"
-          end
-          socket = sslConnect(@socket, prefs)
-          return socket, response_header
-        rescue => bang
-          puts bang
-          return nil, error_response(bang)
-        end
-        # return nil, nil
-      end
-      # proxyAuthNTLM
-      # returns: ResponseHeaders
-      def proxyAuthNTLM()
-        request = @request.copy
-        request.removeHeader("Proxy-Authorization")
-        request.removeHeader("Proxy-Connection")
-        response_header = []
-        ntlm_challenge = nil
-        t1 = Net::NTLM::Message::Type1.new()
-        msg = "NTLM " + t1.encode64
-        request.addHeader("Proxy-Authorization", msg)
-        request.addHeader("Proxy-Connection", "Keep-Alive")
-        #   puts "============= T1 ======================="
-        #    puts auth_request
-        data = request.join + "\r\n"
-        @socket.print data
-        #  puts "-----------------"
-        response_header = readHTTPHeader(@socket)
-        rcode = nil
-        rmsg = nil
-        ntlm_challenge = nil
-        clen = 0
-        response_header.each do |line|
-          # puts line
-          if line =~ /^HTTP\/\d\.\d (\d+) (.*)/ then
-            rcode = $1.to_i
-            rmsg = $2
-          end
-          if line =~ /^Proxy-Authenticate: (NTLM) (.+)\r\n/
-            ntlm_challenge = $2
-          end
-          if line =~ /^Content-Length: (\d{1,})\r\n/
-            clen = $1.to_i
-          end
-          break if line.strip.empty?
-        end
-        #puts "* reading #{clen} bytes"
-        if rcode == 407 # ProxyAuthentication Required
-          return response_header if ntlm_challenge.nil? or ntlm_challenge == ""
-        else
-          puts "* no proxy authentication required!"
-          return response_header
-        end
-        Watobo::HTTPSocket.read_body(@socket, :max_bytes => clen){ |d|
-          #puts d
-        }
-        t2 = Net::NTLM::Message.decode64(ntlm_challenge)
-        t3 = t2.response({:user => proxy.username, :password => proxy.password, :workstation => proxy.workstation, :domain => proxy.domain}, {:ntlmv2 => true})
-        request.removeHeader("Proxy-Authorization")
-        #  request.removeHeader("Proxy-Connection")
-        #  request.addHeader("Proxy-Connection", "Close")
-        #  request.addHeader("Pragma", "no-cache")
-        msg = "NTLM " + t3.encode64
-        request.addHeader("Proxy-Authorization", msg)
-        # puts "============= T3 ======================="
-        # puts request
-        # puts "------------------------"
-        data = request.join + "\r\n"
-        @socket.print data
-        response_header = readHTTPHeader(@socket)
-        response_header.each do |line|
-          #  puts line
-          if line =~ /^HTTP\/\d\.\d (\d+) (.*)/ then
-            rcode = $1.to_i
-            rmsg = $2
-          end
-          if line =~ /^Proxy-Authenticate: (NTLM) (.+)\r\n/
-            ntlm_challenge = $2
-          end
-          if line =~ /^Content-Length: (\d{1,})\r\n/
-            clen = $1.to_i
-          end
-          break if line.strip.empty?
-        end
-        #  Watobo::HTTPSocket.read_body(tcp_socket, :max_bytes => clen){ |d|
-        #puts d
-        #  }
-        return response_header
-      end
-      #
-      # doProxyAuth
-      #
-      def  doProxyAuth()
-       # puts "DO PROXY AUTH"
-       # puts proxy.to_yaml
-        response_headers = nil
-        case @proxy.auth_type
-        when AUTH_TYPE_NTLM
-          return proxyAuthNTLM()
-        end # END OF NTLM
-      end
-    end
-  end
-end
+# @private
+module Watobo#:nodoc: all
+  module HTTPSocket
+    class Connection_UNUSED
+      include Watobo::Constants
+      extend Watobo::Subscriber
+      def initialize(request, prefs)
+        @request = request
+        @response = nil
+        @proxy = Watobo::ForwardingProxy.get(site)
+          unless @proxy.nil?
+            host = @proxy.host
+            port = @proxy.port
+          else
+            host = @request.host
+            port = @request.port
+          end
+          # check if hostname is valid and can be resolved
+          #hostip = IPSocket.getaddress(host)
+      end
+      def read_body( prefs={} )
+        clen = @response.content_length
+        data = ""
+        begin
+          if @response.is_chunked?
+            Watobo::HTTPSocket.readChunkedBody(@socket) { |c|
+              data += c
+            }
+          elsif  clen > 0
+            #  puts "* read #{clen} bytes for body"
+            Watobo::HTTPSocket.read_body(@socket, :max_bytes => clen) { |c|
+              data += c
+              break if data.length == clen
+            }
+          elsif clen < 0
+            # puts "* no content-length information ... mmmmmpf"
+           # eofcount = 0
+            Watobo::HTTPSocket.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
+        return false
+      end
+      def read_header( prefs={} )
+        header = []
+        msg = nil
+        begin
+            Watobo::HTTPSocket.read_header(@socket) do |line|
+            #puts line
+            # puts line.unpack("H*")
+            header << line
+          end
+          rescue Errno::ECONNRESET
+            msg = "<html><head><title>WATOBO</title></head><body>WATOBO: Connection Reset By Peer</body></html>"
+          rescue Timeout::Error
+            msg = "<html><head><title>WATOBO</title></head><body>WATOBO: Timeout</body></html>"
+        rescue => bang
+          puts "!ERROR: read_header"
+          return nil
+        end
+         header = [ "HTTP/1.1 200 OK\r\n", "Server: WATOBO\r\n", "Content-Length: #{msg.length.to_i}\r\n", "Content-Type: text/html\r\n", "\r\n", "#{msg}" ] unless msg.nil?
+        response = Watobo::Response.new header
+        #  update_sids(header)
+        #  update_sids(request.site, response) if prefs[:update_sids] == true
+        unless prefs[:ignore_logout]==true or @session[:logout_signatures].empty?
+           notify(:logout, self) if loggedOut?(response)
+        end
+        return response
+      end
+       def sslConnect(tcp_socket, current_prefs = {} )
+        begin
+          ctx = OpenSSL::SSL::SSLContext.new()
+          ctx.ciphers = current_prefs[:ssl_cipher] if current_prefs.has_key? :ssl_cipher
+          if current_prefs.has_key? :ssl_client_cert and current_prefs.has_key? :ssl_client_key
+            ctx.cert = current_prefs[:ssl_client_cert]
+            ctx.key = current_prefs[:ssl_client_key]
+            if $DEBUG
+                        puts "[SSLconnect] Client Certificates"
+                        puts "= CERT ="
+                       # puts @ctx.cert.methods.sort
+              puts ctx.cert.display
+              puts "---"
+                        puts "= KEY ="
+                        puts ctx.key.display
+                        puts "---"
+                      end
+                      end
+          @socket = OpenSSL::SSL::SSLSocket.new(tcp_socket, ctx)
+          @socket.sync_close = true
+          @socket.connect
+          @socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1)
+          puts "[SSLconnect]: #{@socket.state}" if $DEBUG
+          return socket
+        rescue => bang
+          if current_prefs[:ssl_cipher].nil?
+            puts "[SSLconnect] ... gr#!..*peep*.. "
+            puts bang
+            puts bang.backtrace if $DEBUG
+          end
+        end
+      end
+      # SSLProxyConnect
+      # return SSLSocket, ResponseHeader of ConnectionSetup
+      # On error SSLSocket is nil
+      def sslProxyConnect( prefs )
+        begin
+          tcp_socket = nil
+          response_header = []
+          request = @request.copy
+          #  timeout(6) do
+          tcp_socket = TCPSocket.new( @proxy.host, @proxy.port)
+          tcp_socket.setsockopt( Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1)
+          tcp_socket.sync = true
+          # setup request
+          dummy = "CONNECT #{request.host}:#{request.port} HTTP/1.0\r\n"
+          request.shift
+          request.unshift dummy
+          request.removeHeader("Proxy-Connection")
+          request.removeHeader("Connection")
+          request.removeHeader("Content-Length")
+          request.removeBody()
+          request.addHeader("Proxy-Connection", "Keep-Alive")
+          request.addHeader("Pragma", "no-cache")
+          #  puts "=== sslProxyConnect ==="
+          #  puts request
+          if proxy.has_login?
+            case proxy.auth_type
+            when AUTH_TYPE_NTLM
+              t1 = Watobo::NTLM::Message::Type1.new()
+              msg = "NTLM " + t1.encode64
+              request.addHeader("Proxy-Authorization", msg)
+              if $DEBUG
+              puts "============= PROXY NTLM: T1 ======================="
+              puts request
+              puts "---"
+              end
+              data = request.join + "\r\n"
+              tcp_socket.print data
+              #  puts "-----------------"
+              cl = 0
+              ntlm_challenge = nil
+              while (line = tcp_socket.gets)
+                response_header.push line
+                puts line if $DEBUG
+                if line =~ /^HTTP\/\d\.\d (\d+) (.*)/ then
+                  rcode = $1.to_i
+                  rmsg = $2
+                end
+                if line =~ /^Proxy-Authenticate: (NTLM) (.+)\r\n/
+                  ntlm_challenge = $2
+                end
+                if line =~ /^Content-Length: (\d*)/i
+                  cl = $1.to_i
+                end
+                break if line.strip.empty?
+              end
+              if cl > 0
+              Watobo::HTTPSocket.read_body(tcp_socket) { |d|
+                # puts d
+              }
+              end
+              if rcode == 200 # Ok
+                puts "* seems proxy doesn't require authentication"
+                socket = sslConnect(tcp_socket, prefs)
+                return socket, response_header
+              end
+              return socket, response_header if ntlm_challenge.nil? or ntlm_challenge == ""
+              t2 = Watobo::NTLM::Message.decode64(ntlm_challenge)
+              t3 = t2.response( { :user => proxy.username,
+                :password => proxy.password,
+                :domain => proxy.domain },
+              { :workstation => proxy.workstation, :ntlmv2 => true } )
+              request.removeHeader("Proxy-Authorization")
+              msg = "NTLM " + t3.encode64
+              request.addHeader("Proxy-Authorization", msg)
+              data = request.join + "\r\n"
+              if $DEBUG
+               puts "============= T3 ======================="
+               puts data
+               puts "---"
+              end
+              tcp_socket.print data
+              #  puts "-----------------"
+              response_header = []
+              rcode = 0
+              response_header = read_header(@socket)
+              rcode = response_header.status
+              if rcode =~/^200/ # Ok
+                puts "[ProxyAuth-NTLM] Authorization Successful" if $DEBUG
+                socket = sslConnect(tcp_socket, prefs)
+                return socket, response_header
+              elsif rcode =~ /^407/ # ProxyAuthentication Required
+                # if rcode is still 407 authentication didn't work -> break
+                msg = "NTLM-Authentication failed!"
+                puts "[ProxyAuth-NTLM] #{msg}" if $DEBUG
+                return nil, msg
+              else
+                puts "[SSLconnect] NTLM Authentication"
+                puts ">  #{rcode} <"
+                return nil, response_header
+              end
+            end
+          end # END OF PROXY AUTH
+          # Start ProxyConnect Without Authentication
+          data = request.join + "\r\n"
+          tcp_socket.print data
+          # puts "-----------------"
+          response_header = []
+          response_header = readHTTPHeader(@socket)
+          rcode = response_header.status
+          if rcode =~ /^200/ # Ok
+            # puts "* proxy connection successfull"
+          elsif rcode =~ /^407/ # ProxyAuthentication Required
+            # if rcode is still 407 authentication didn't work -> break
+          else
+            puts "[SSLconnect] Response Status"
+            puts ">  #{rcode} <"
+          end
+          socket = sslConnect(@socket, prefs)
+          return socket, response_header
+        rescue => bang
+          puts bang
+          return nil, error_response(bang)
+        end
+        # return nil, nil
+      end
+      # proxyAuthNTLM
+      # returns: ResponseHeaders
+      def proxyAuthNTLM()
+        request = @request.copy
+        request.removeHeader("Proxy-Authorization")
+        request.removeHeader("Proxy-Connection")
+        response_header = []
+        ntlm_challenge = nil
+        t1 = Watobo::NTLM::Message::Type1.new()
+        msg = "NTLM " + t1.encode64
+        request.addHeader("Proxy-Authorization", msg)
+        request.addHeader("Proxy-Connection", "Keep-Alive")
+        #   puts "============= T1 ======================="
+        #    puts auth_request
+        data = request.join + "\r\n"
+        @socket.print data
+        #  puts "-----------------"
+        response_header = readHTTPHeader(@socket)
+        rcode = nil
+        rmsg = nil
+        ntlm_challenge = nil
+        clen = 0
+        response_header.each do |line|
+          # puts line
+          if line =~ /^HTTP\/\d\.\d (\d+) (.*)/ then
+            rcode = $1.to_i
+            rmsg = $2
+          end
+          if line =~ /^Proxy-Authenticate: (NTLM) (.+)\r\n/
+            ntlm_challenge = $2
+          end
+          if line =~ /^Content-Length: (\d{1,})\r\n/
+            clen = $1.to_i
+          end
+          break if line.strip.empty?
+        end
+        #puts "* reading #{clen} bytes"
+        if rcode == 407 # ProxyAuthentication Required
+          return response_header if ntlm_challenge.nil? or ntlm_challenge == ""
+        else
+          puts "* no proxy authentication required!"
+          return response_header
+        end
+        Watobo::HTTPSocket.read_body(@socket, :max_bytes => clen){ |d|
+          #puts d
+        }
+        t2 = Watobo::NTLM::Message.decode64(ntlm_challenge)
+        t3 = t2.response({:user => proxy.username, :password => proxy.password, :workstation => proxy.workstation, :domain => proxy.domain}, {:ntlmv2 => true})
+        request.removeHeader("Proxy-Authorization")
+        #  request.removeHeader("Proxy-Connection")
+        #  request.addHeader("Proxy-Connection", "Close")
+        #  request.addHeader("Pragma", "no-cache")
+        msg = "NTLM " + t3.encode64
+        request.addHeader("Proxy-Authorization", msg)
+        # puts "============= T3 ======================="
+        # puts request
+        # puts "------------------------"
+        data = request.join + "\r\n"
+        @socket.print data
+        response_header = readHTTPHeader(@socket)
+        response_header.each do |line|
+          #  puts line
+          if line =~ /^HTTP\/\d\.\d (\d+) (.*)/ then
+            rcode = $1.to_i
+            rmsg = $2
+          end
+          if line =~ /^Proxy-Authenticate: (NTLM) (.+)\r\n/
+            ntlm_challenge = $2
+          end
+          if line =~ /^Content-Length: (\d{1,})\r\n/
+            clen = $1.to_i
+          end
+          break if line.strip.empty?
+        end
+        #  Watobo::HTTPSocket.read_body(tcp_socket, :max_bytes => clen){ |d|
+        #puts d
+        #  }
+        return response_header
+      end
+      #
+      # doProxyAuth
+      #
+      def  doProxyAuth()
+       # puts "DO PROXY AUTH"
+       # puts proxy.to_yaml
+        response_headers = nil
+        case @proxy.auth_type
+        when AUTH_TYPE_NTLM
+          return proxyAuthNTLM()
+        end # END OF NTLM
+      end
+    end
+  end
+end