ferrum 0.12 → 0.13

data/lib/ferrum/proxy.rb

@@ -18,7 +18,6 @@ module Ferrum
       @port = port
       @user = user
       @password = password
-      at_exit { stop }
     end
 
     def start
@@ -39,8 +38,10 @@ module Ferrum
         options.merge!(ProxyAuthProc: authenticator.method(:authenticate).to_proc)
       end
 
-      @server = WEBrick::HTTPProxyServer.new(**options)
+      @server = HTTPProxyServer.new(**options)
       @server.start
+      at_exit { stop }
+
       @port = @server.config[:Port]
     end
 
@@ -54,5 +55,93 @@ module Ferrum
       @file&.unlink
       @server.shutdown
     end
+
+    # Fix hanging proxy at exit
+    class HTTPProxyServer < WEBrick::HTTPProxyServer
+      # rubocop:disable all
+      def do_CONNECT(req, res)
+        # Proxy Authentication
+        proxy_auth(req, res)
+
+        ua = Thread.current[:WEBrickSocket]  # User-Agent
+        raise WEBrick::HTTPStatus::InternalServerError,
+              "[BUG] cannot get socket" unless ua
+
+        host, port = req.unparsed_uri.split(":", 2)
+        # Proxy authentication for upstream proxy server
+        if proxy = proxy_uri(req, res)
+          proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0"
+          if proxy.userinfo
+            credentials = "Basic " + [proxy.userinfo].pack("m0")
+          end
+          host, port = proxy.host, proxy.port
+        end
+
+        begin
+          @logger.debug("CONNECT: upstream proxy is `#{host}:#{port}'.")
+          os = TCPSocket.new(host, port)     # origin server
+
+          if proxy
+            @logger.debug("CONNECT: sending a Request-Line")
+            os << proxy_request_line << CRLF
+            @logger.debug("CONNECT: > #{proxy_request_line}")
+            if credentials
+              @logger.debug("CONNECT: sending credentials")
+              os << "Proxy-Authorization: " << credentials << CRLF
+            end
+            os << CRLF
+            proxy_status_line = os.gets(LF)
+            @logger.debug("CONNECT: read Status-Line from the upstream server")
+            @logger.debug("CONNECT: < #{proxy_status_line}")
+            if %r{^HTTP/\d+\.\d+\s+200\s*} =~ proxy_status_line
+              while line = os.gets(LF)
+                break if /\A(#{CRLF}|#{LF})\z/om =~ line
+              end
+            else
+              raise WEBrick::HTTPStatus::BadGateway
+            end
+          end
+          @logger.debug("CONNECT #{host}:#{port}: succeeded")
+          res.status = WEBrick::HTTPStatus::RC_OK
+        rescue => ex
+          @logger.debug("CONNECT #{host}:#{port}: failed `#{ex.message}'")
+          res.set_error(ex)
+          raise WEBrick::HTTPStatus::EOFError
+        ensure
+          # At exit os variable sometimes can be nil which results in hanging forever
+          raise WEBrick::HTTPStatus::EOFError unless os
+
+          if handler = @config[:ProxyContentHandler]
+            handler.call(req, res)
+          end
+          res.send_response(ua)
+          access_log(@config, req, res)
+
+          # Should clear request-line not to send the response twice.
+          # see: HTTPServer#run
+          req.parse(NullReader) rescue nil
+        end
+
+        begin
+          while fds = IO::select([ua, os])
+            if fds[0].member?(ua)
+              buf = ua.readpartial(1024);
+              @logger.debug("CONNECT: #{buf.bytesize} byte from User-Agent")
+              os.write(buf)
+            elsif fds[0].member?(os)
+              buf = os.readpartial(1024);
+              @logger.debug("CONNECT: #{buf.bytesize} byte from #{host}:#{port}")
+              ua.write(buf)
+            end
+          end
+        rescue
+          os.close
+          @logger.debug("CONNECT #{host}:#{port}: closed")
+        end
+
+        raise WEBrick::HTTPStatus::EOFError
+      end
+      # rubocop:enable all
+    end
   end
 end

data/lib/ferrum/target.rb

@@ -23,10 +23,12 @@ module Ferrum
     end
 
     def page
-      @page ||= begin
-        maybe_sleep_if_new_window
-        Page.new(id, @browser)
-      end
+      @page ||= build_page
+    end
+
+    def build_page(**options)
+      maybe_sleep_if_new_window
+      Page.new(id, @browser, **options)
     end
 
     def id

data/lib/ferrum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ferrum
-  VERSION = "0.12"
+  VERSION = "0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ferrum
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -184,16 +184,19 @@ files:
 - lib/ferrum/browser/binary.rb
 - lib/ferrum/browser/client.rb
 - lib/ferrum/browser/command.rb
+- lib/ferrum/browser/options.rb
 - lib/ferrum/browser/options/base.rb
 - lib/ferrum/browser/options/chrome.rb
 - lib/ferrum/browser/options/firefox.rb
 - lib/ferrum/browser/process.rb
 - lib/ferrum/browser/subscriber.rb
+- lib/ferrum/browser/version_info.rb
 - lib/ferrum/browser/web_socket.rb
 - lib/ferrum/browser/xvfb.rb
 - lib/ferrum/context.rb
 - lib/ferrum/contexts.rb
 - lib/ferrum/cookies.rb
+- lib/ferrum/cookies/cookie.rb
 - lib/ferrum/dialog.rb
 - lib/ferrum/errors.rb
 - lib/ferrum/frame.rb