selenium-webdriver 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89c68b6ae8db07e10f1e0ead164a3d36f5294c62166d361b1ec1fa42647e3672
-  data.tar.gz: c1d0c0c2322acaaa95b98d5187315c975289282b3ee2085c14b86426b819de45
+  metadata.gz: 2be9fb14d69ce82170e3ddbe0cbcf2f2428e1978544d8a7c11191ebd37cf0241
+  data.tar.gz: 2e40d6ad67ccfb269ee1ae9d3f47d024e90081da9881f757f22170751875fa69
 SHA512:
-  metadata.gz: 120b0f57601862015b62dc9ae23b510ca2433342cc500ae4fe38a70550c07e91ff20e26fd2b5a03066830b8e1f06246d1e23151070207c1c8e5e4cfc37c20889
-  data.tar.gz: 3664cea6889b141e7de551ed518471fc2617ae6321c56981e898249fa688564aed92c5a05dba66333bf97457ed551e7051b009340a5e9abb91249e608633b416
+  metadata.gz: b7f419d9b1349a1afbf68999eecaa53391503cc793026228577fbcb40ac4958a35c539286f7c4c3c913992336dc797481f7c57f6aec9d58813671e24d1cd09ad
+  data.tar.gz: '0093bd2d0fbb0c1c8e7abee9d1a632f80d458b1dc0d1b22635f403230ed7c40a2be498915d8abed40bd4992295a1444a69c3e653ebf1d4cf106886c8a9d5a499'

data/CHANGES

@@ -1,3 +1,18 @@
+4.4.0 (Unreleased)
+=========================
+
+BiDi:
+  * Released selenium-devtools 0.103.1 to fix websocket dependency requirement
+  * Released selenium-devtools 0.104.0 (supports CDP v85, v102, v103, v104)
+  * Have network interceptor ignore cancelled requests (#10856)
+  * Improve websocket message handling
+
+Chromium:
+  * Prevent users from setting w3c: false and warn for true (thanks Tamsil Amani!)
+
+Ruby:
+  * Implement Virtual Authenticator (#10903, #10541) (thanks Tamsil Amani!)
+
 4.3.0 (2022-06-23)
 =========================
 

data/lib/selenium/server.rb

@@ -92,7 +92,7 @@ module Selenium
             download_server(redirected, destination)
           end
         rescue StandardError
-          FileUtils.rm download_file_name if File.exist? download_file_name
+          FileUtils.rm_rf download_file_name
           raise
         end
 

data/lib/selenium/webdriver/chrome/options.rb

@@ -227,6 +227,9 @@ module Selenium
 
           options = browser_options[self.class::KEY]
           options['binary'] ||= binary_path if binary_path
+
+          check_w3c(options[:w3c]) if options.key?(:w3c)
+
           if @profile
             options['args'] ||= []
             options['args'] << "--user-data-dir=#{@profile.directory}"
@@ -237,6 +240,17 @@ module Selenium
           options['extensions'] = @encoded_extensions + @extensions.map { |ext| encode_extension(ext) }
         end
 
+        def check_w3c(w3c)
+          if w3c
+            WebDriver.logger.warn("Setting 'w3c: true' is redundant and will no longer be allowed", id: :w3c)
+            return
+          end
+
+          raise Error::InvalidArgumentError,
+                "Setting 'w3c: false' is not allowed.\n" \
+                "Please update to W3C Syntax: https://www.selenium.dev/blog/2022/legacy-protocol-support/"
+        end
+
         def binary_path
           Chrome.path
         end

data/lib/selenium/webdriver/common/driver.rb

@@ -248,6 +248,15 @@ module Selenium
         bridge.execute_async_script(script, *args)
       end
 
+      #
+      # @return [VirtualAuthenticator]
+      # @see VirtualAuthenticator
+      #
+
+      def add_virtual_authenticator(options)
+        bridge.add_virtual_authenticator(options)
+      end
+
       #-------------------------------- sugar  --------------------------------
 
       #

data/lib/selenium/webdriver/common/driver_extensions/has_network_interception.rb

@@ -61,75 +61,10 @@ module Selenium
         #
 
         def intercept(&block)
-          devtools.network.set_cache_disabled(cache_disabled: true)
-          devtools.fetch.on(:request_paused) do |params|
-            id = params['requestId']
-            if params.key?('responseStatusCode') || params.key?('responseErrorReason')
-              intercept_response(id, params, &pending_response_requests.delete(id))
-            else
-              intercept_request(id, params, &block)
-            end
-          end
-          devtools.fetch.enable(patterns: [{requestStage: 'Request'}, {requestStage: 'Response'}])
+          @interceptor ||= DevTools::NetworkInterceptor.new(devtools)
+          @interceptor.intercept(&block)
         end
 
-        private
-
-        def pending_response_requests
-          @pending_response_requests ||= {}
-        end
-
-        def intercept_request(id, params, &block)
-          original = DevTools::Request.from(id, params)
-          mutable = DevTools::Request.from(id, params)
-
-          block.call(mutable) do |&continue| # rubocop:disable Performance/RedundantBlockCall
-            pending_response_requests[id] = continue
-
-            if original == mutable
-              devtools.fetch.continue_request(request_id: id)
-            else
-              devtools.fetch.continue_request(
-                request_id: id,
-                url: mutable.url,
-                method: mutable.method,
-                post_data: mutable.post_data,
-                headers: mutable.headers.map do |k, v|
-                  {name: k, value: v}
-                end
-              )
-            end
-          end
-        end
-
-        def intercept_response(id, params)
-          return devtools.fetch.continue_request(request_id: id) unless block_given?
-
-          body = fetch_response_body(id)
-          original = DevTools::Response.from(id, body, params)
-          mutable = DevTools::Response.from(id, body, params)
-          yield mutable
-
-          if original == mutable
-            devtools.fetch.continue_request(request_id: id)
-          else
-            devtools.fetch.fulfill_request(
-              request_id: id,
-              body: (Base64.strict_encode64(mutable.body) if mutable.body),
-              response_code: mutable.code,
-              response_headers: mutable.headers.map do |k, v|
-                {name: k, value: v}
-              end
-            )
-          end
-        end
-
-        def fetch_response_body(id)
-          devtools.fetch.get_response_body(request_id: id).dig('result', 'body')
-        rescue Error::WebDriverError
-          # CDP fails to get body on certain responses (301) and raises:
-          # Can only get response body on requests captured after headers received.
-        end
       end # HasNetworkInterception
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/interactions/pointer_actions.rb

@@ -68,9 +68,8 @@ module Selenium
       end
 
       #
-      # Moves the pointer to the middle of the given element.
-      # its location is calculated using getBoundingClientRect.
-      # Then the pointer is moved to optional offset coordinates from the element.
+      # Moves the pointer to the in-view center point of the given element.
+      # Then the pointer is moved to optional offset coordinates.
       #
       # The element is not scrolled into view.
       # MoveTargetOutOfBoundsError will be raised if element with offset is outside the viewport
@@ -88,10 +87,10 @@ module Selenium
       #   driver.action.move_to(el, 100, 100).perform
       #
       # @param [Selenium::WebDriver::Element] element to move to.
-      # @param [Integer] right_by Optional offset from the top-left corner. A negative value means
-      #   coordinates to the left of the element.
-      # @param [Integer] down_by Optional offset from the top-left corner. A negative value means
-      #   coordinates above the element.
+      # @param [Integer] right_by Optional offset from the in-view center of the
+      #   element. A negative value means coordinates to the left of the center.
+      # @param [Integer] down_by Optional offset from the in-view center of the
+      #   element. A negative value means coordinates to the top of the center.
       # @param [Symbol || String] device optional name of the PointerInput device to move.
       # @return [ActionBuilder] A self reference.
       #

data/lib/selenium/webdriver/common/takes_screenshot.rb

@@ -32,7 +32,7 @@ module Selenium
       def save_screenshot(png_path, full_page: false)
         extension = File.extname(png_path).downcase
         if extension != '.png'
-          WebDriver.logger.warn "name used for saved screenshot does not match file type. "\
+          WebDriver.logger.warn "name used for saved screenshot does not match file type. " \
                                 "It should end with .png extension",
                                 id: :screenshot
         end

data/lib/selenium/webdriver/common/virtual_authenticator/credential.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# A credential stored in a virtual authenticator.
+# @see https://w3c.github.io/webauthn/#credential-parameters
+#
+
+module Selenium
+  module WebDriver
+    class Credential
+      class << self
+        def resident(**opts)
+          Credential.new(resident_credential: true, **opts)
+        end
+
+        def non_resident(**opts)
+          Credential.new(resident_credential: false, **opts)
+        end
+
+        def encode(byte_array)
+          Base64.urlsafe_encode64(byte_array&.pack('C*'))
+        end
+
+        def decode(base64)
+          Base64.urlsafe_decode64(base64).unpack('C*')
+        end
+
+        def from_json(opts)
+          user_handle = opts['userHandle'] ? decode(opts['userHandle']) : nil
+          new(id: decode(opts["credentialId"]),
+              resident_credential: opts["isResidentCredential"],
+              rp_id: opts['rpId'],
+              private_key: opts['privateKey'],
+              sign_count: opts['signCount'],
+              user_handle: user_handle)
+        end
+      end
+
+      attr_reader :id, :resident_credential, :rp_id, :user_handle, :private_key, :sign_count
+      alias_method :resident_credential?, :resident_credential
+
+      def initialize(id:, resident_credential:, rp_id:, private_key:, user_handle: nil, sign_count: 0)
+        @id = id
+        @resident_credential = resident_credential
+        @rp_id = rp_id
+        @user_handle = user_handle
+        @private_key = private_key
+        @sign_count = sign_count
+      end
+
+      #
+      # @api private
+      #
+
+      def as_json(*)
+        credential_data = {'credentialId' => Credential.encode(id),
+                           'isResidentCredential' => resident_credential?,
+                           'rpId' => rp_id,
+                           'privateKey' => Credential.encode(private_key),
+                           'signCount' => sign_count}
+        credential_data['userHandle'] = Credential.encode(user_handle) if user_handle
+        credential_data
+      end
+    end # Credential
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/common/virtual_authenticator/virtual_authenticator.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    class VirtualAuthenticator
+
+      attr_reader :options
+
+      #
+      # api private
+      # Use `Driver#add_virtual_authenticator`
+      #
+
+      def initialize(bridge, authenticator_id, options)
+        @id = authenticator_id
+        @bridge = bridge
+        @options = options
+        @valid = true
+      end
+
+      def add_credential(credential)
+        credential = credential.as_json
+        @bridge.add_credential credential, @id
+      end
+
+      def credentials
+        credential_data = @bridge.credentials @id
+        credential_data.map do |cred|
+          Credential.from_json(cred)
+        end
+      end
+
+      def remove_credential(credential_id)
+        credential_id = Credential.encode(credential_id) if credential_id.instance_of?(Array)
+        @bridge.remove_credential credential_id, @id
+      end
+
+      def remove_all_credentials
+        @bridge.remove_all_credentials @id
+      end
+
+      def user_verified=(verified)
+        @bridge.user_verified verified, @id
+      end
+
+      def remove!
+        @bridge.remove_virtual_authenticator(@id)
+        @valid = false
+      end
+
+      def valid?
+        @valid
+      end
+    end # VirtualAuthenticator
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/common/virtual_authenticator/virtual_authenticator_options.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# Options for the creation of virtual authenticators.
+# @see http://w3c.github.io/webauthn/#sctn-automation
+#
+
+module Selenium
+  module WebDriver
+    class VirtualAuthenticatorOptions
+
+      PROTOCOL = {ctap2: "ctap2", u2f: "ctap1/u2f"}.freeze
+      TRANSPORT = {ble: "ble", usb: "usb", nfc: "nfc", internal: "internal"}.freeze
+
+      attr_accessor :protocol, :transport, :resident_key, :user_verification, :user_consenting, :user_verified
+      alias_method :resident_key?, :resident_key
+      alias_method :user_verification?, :user_verification
+      alias_method :user_consenting?, :user_consenting
+      alias_method :user_verified?, :user_verified
+
+      def initialize(protocol: :ctap2, transport: :usb, resident_key: false,
+                     user_verification: false, user_consenting: true, user_verified: false)
+        @protocol = protocol
+        @transport = transport
+        @resident_key = resident_key
+        @user_verification = user_verification
+        @user_consenting = user_consenting
+        @user_verified = user_verified
+      end
+
+      #
+      # @api private
+      #
+
+      def as_json(*)
+        {'protocol' => PROTOCOL[protocol],
+         'transport' => TRANSPORT[transport],
+         'hasResidentKey' => resident_key?,
+         'hasUserVerification' => user_verification?,
+         'isUserConsenting' => user_consenting?,
+         'isUserVerified' => user_verified?}
+      end
+    end # VirtualAuthenticatorOptions
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/common/websocket_connection.rb

@@ -25,10 +25,11 @@ module Selenium
       RESPONSE_WAIT_TIMEOUT = 30
       RESPONSE_WAIT_INTERVAL = 0.1
 
+      MAX_LOG_MESSAGE_SIZE = 9999
+
       def initialize(url:)
         @callback_threads = ThreadGroup.new
 
-        @messages = []
         @session_id = nil
         @url = url
 
@@ -49,17 +50,23 @@ module Selenium
       def send_cmd(**payload)
         id = next_id
         data = payload.merge(id: id)
+        WebDriver.logger.debug "WebSocket -> #{data}"[...MAX_LOG_MESSAGE_SIZE]
         data = JSON.generate(data)
-        WebDriver.logger.debug "WebSocket -> #{data}"
-
         out_frame = WebSocket::Frame::Outgoing::Client.new(version: ws.version, data: data, type: 'text')
         socket.write(out_frame.to_s)
 
-        wait.until { @messages.find { |m| m['id'] == id } }
+        wait.until { messages.delete(id) }
       end
 
       private
 
+      # We should be thread-safe to use the hash without synchronization
+      # because its keys are WebSocket message identifiers and they should be
+      # unique within a devtools session.
+      def messages
+        @messages ||= {}
+      end
+
       def process_handshake
         socket.print(ws.to_s)
         ws << socket.readpartial(1024)
@@ -97,8 +104,8 @@ module Selenium
         return {} if message.empty?
 
         message = JSON.parse(message)
-        @messages << message
-        WebDriver.logger.debug "WebSocket <- #{message}"
+        messages[message["id"]] = message
+        WebDriver.logger.debug "WebSocket <- #{message}"[...MAX_LOG_MESSAGE_SIZE]
 
         message
       end

data/lib/selenium/webdriver/common/window.rb

@@ -36,8 +36,8 @@ module Selenium
 
       def size=(dimension)
         unless dimension.respond_to?(:width) && dimension.respond_to?(:height)
-          raise ArgumentError, "expected #{dimension.inspect}:#{dimension.class}" \
-                               ' to respond to #width and #height'
+          raise ArgumentError, "expected #{dimension.inspect}:#{dimension.class} " \
+                               'to respond to #width and #height'
         end
 
         @bridge.resize_window dimension.width, dimension.height
@@ -61,8 +61,8 @@ module Selenium
 
       def position=(point)
         unless point.respond_to?(:x) && point.respond_to?(:y)
-          raise ArgumentError, "expected #{point.inspect}:#{point.class}" \
-                               ' to respond to #x and #y'
+          raise ArgumentError, "expected #{point.inspect}:#{point.class} " \
+                               'to respond to #x and #y'
         end
 
         @bridge.reposition_window point.x, point.y
@@ -86,8 +86,8 @@ module Selenium
 
       def rect=(rectangle)
         unless %w[x y width height].all? { |val| rectangle.respond_to? val }
-          raise ArgumentError, "expected #{rectangle.inspect}:#{rectangle.class}" \
-                               ' to respond to #x, #y, #width, and #height'
+          raise ArgumentError, "expected #{rectangle.inspect}:#{rectangle.class} " \
+                               'to respond to #x, #y, #width, and #height'
         end
 
         @bridge.set_window_rect(x: rectangle.x,

data/lib/selenium/webdriver/common/zipper.rb

@@ -41,7 +41,7 @@ module Selenium
               to      = File.join(destination, entry.name)
               dirname = File.dirname(to)
 
-              FileUtils.mkdir_p dirname unless File.exist? dirname
+              FileUtils.mkdir_p dirname
               zip.extract(entry, to)
             end
           end

data/lib/selenium/webdriver/common.rb

@@ -57,6 +57,9 @@ require 'selenium/webdriver/common/interactions/wheel_input'
 require 'selenium/webdriver/common/interactions/scroll_origin'
 require 'selenium/webdriver/common/interactions/wheel_actions'
 require 'selenium/webdriver/common/action_builder'
+require 'selenium/webdriver/common/virtual_authenticator/credential'
+require 'selenium/webdriver/common/virtual_authenticator/virtual_authenticator_options'
+require 'selenium/webdriver/common/virtual_authenticator/virtual_authenticator'
 require 'selenium/webdriver/common/html5/shared_web_storage'
 require 'selenium/webdriver/common/html5/local_storage'
 require 'selenium/webdriver/common/html5/session_storage'

data/lib/selenium/webdriver/devtools/network_interceptor.rb

@@ -0,0 +1,176 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Selenium
+  module WebDriver
+    class DevTools
+
+      #
+      # Wraps the network request/response interception, providing
+      # thread-safety guarantees and handling special cases such as browser
+      # canceling requests midst interception.
+      #
+      # You should not be using this class directly, use Driver#intercept instead.
+      # @api private
+      #
+
+      class NetworkInterceptor
+
+        # CDP fails to get body on certain responses (301) and raises:
+        # "Can only get response body on requests captured after headers received."
+        CANNOT_GET_BODY_ON_REDIRECT_ERROR_CODE = "-32000"
+
+        # CDP fails to operate with intercepted requests.
+        # Typical reason is browser cancelling intercepted requests/responses.
+        INVALID_INTERCEPTION_ID_ERROR_CODE = "-32602"
+
+        def initialize(devtools)
+          @devtools = devtools
+          @lock = Mutex.new
+        end
+
+        def intercept(&block)
+          devtools.network.on(:loading_failed) { |params| track_cancelled_request(params) }
+          devtools.fetch.on(:request_paused) { |params| request_paused(params, &block) }
+
+          devtools.network.set_cache_disabled(cache_disabled: true)
+          devtools.network.enable
+          devtools.fetch.enable(patterns: [{requestStage: 'Request'}, {requestStage: 'Response'}])
+        end
+
+        private
+
+        attr_accessor :devtools, :lock
+
+        # We should be thread-safe to use the hash without synchronization
+        # because its keys are interception job identifiers and they should be
+        # unique within a devtools session.
+        def pending_response_requests
+          @pending_response_requests ||= {}
+        end
+
+        # Ensure usage of cancelled_requests is thread-safe via synchronization!
+        def cancelled_requests
+          @cancelled_requests ||= []
+        end
+
+        def track_cancelled_request(data)
+          return unless data['canceled']
+
+          lock.synchronize { cancelled_requests << data['requestId'] }
+        end
+
+        def request_paused(data, &block)
+          id = data['requestId']
+          network_id = data['networkId']
+
+          with_cancellable_request(network_id) do
+            if response?(data)
+              block = pending_response_requests.delete(id)
+              intercept_response(id, data, &block)
+            else
+              intercept_request(id, data, &block)
+            end
+          end
+        end
+
+        # The presence of any of these fields indicate we're at the response stage.
+        # @see https://chromedevtools.github.io/devtools-protocol/tot/Fetch/#event-requestPaused
+        def response?(params)
+          params.key?('responseStatusCode') || params.key?('responseErrorReason')
+        end
+
+        def intercept_request(id, params, &block)
+          original = DevTools::Request.from(id, params)
+          mutable = DevTools::Request.from(id, params)
+
+          block.call(mutable) do |&continue| # rubocop:disable Performance/RedundantBlockCall
+            pending_response_requests[id] = continue
+
+            if original == mutable
+              continue_request(original.id)
+            else
+              mutate_request(mutable)
+            end
+          end
+        end
+
+        def intercept_response(id, params)
+          return continue_response(id) unless block_given?
+
+          body = fetch_response_body(id)
+          original = DevTools::Response.from(id, body, params)
+          mutable = DevTools::Response.from(id, body, params)
+          yield mutable
+
+          if original == mutable
+            continue_response(id)
+          else
+            mutate_response(mutable)
+          end
+        end
+
+        def continue_request(id)
+          devtools.fetch.continue_request(request_id: id)
+        end
+        alias_method :continue_response, :continue_request
+
+        def mutate_request(request)
+          devtools.fetch.continue_request(
+            request_id: request.id,
+            url: request.url,
+            method: request.method,
+            post_data: request.post_data,
+            headers: request.headers.map do |k, v|
+              {name: k, value: v}
+            end
+          )
+        end
+
+        def mutate_response(response)
+          devtools.fetch.fulfill_request(
+            request_id: response.id,
+            body: (Base64.strict_encode64(response.body) if response.body),
+            response_code: response.code,
+            response_headers: response.headers.map do |k, v|
+              {name: k, value: v}
+            end
+          )
+        end
+
+        def fetch_response_body(id)
+          devtools.fetch.get_response_body(request_id: id).dig('result', 'body')
+        rescue Error::WebDriverError => e
+          raise unless e.message.start_with?(CANNOT_GET_BODY_ON_REDIRECT_ERROR_CODE)
+        end
+
+        def with_cancellable_request(network_id)
+          yield
+        rescue Error::WebDriverError => e
+          raise if e.message.start_with?(INVALID_INTERCEPTION_ID_ERROR_CODE) && !cancelled?(network_id)
+        end
+
+        def cancelled?(network_id)
+          lock.synchronize { !!cancelled_requests.delete(network_id) }
+        end
+
+      end # NetworkInterceptor
+    end # DevTools
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/devtools.rb

@@ -23,6 +23,7 @@ module Selenium
       autoload :ConsoleEvent, 'selenium/webdriver/devtools/console_event'
       autoload :ExceptionEvent, 'selenium/webdriver/devtools/exception_event'
       autoload :MutationEvent, 'selenium/webdriver/devtools/mutation_event'
+      autoload :NetworkInterceptor, 'selenium/webdriver/devtools/network_interceptor'
       autoload :PinnedScript, 'selenium/webdriver/devtools/pinned_script'
       autoload :Request, 'selenium/webdriver/devtools/request'
       autoload :Response, 'selenium/webdriver/devtools/response'

data/lib/selenium/webdriver/remote/bridge.rb

@@ -426,8 +426,8 @@ module Selenium
 
         def submit_element(element)
           script = "var form = arguments[0];\n" \
-                   "while (form.nodeName != \"FORM\" && form.parentNode) {\n" \
-                   "  form = form.parentNode;\n" \
+                   "while (form.nodeName != \"FORM\" && form.parentNode) {\n  " \
+                   "form = form.parentNode;\n" \
                    "}\n" \
                    "if (!form) { throw Error('Unable to find containing form element'); }\n" \
                    "if (!form.ownerDocument) { throw Error('Unable to find owning document'); }\n" \
@@ -568,6 +568,39 @@ module Selenium
           ShadowRoot.new self, shadow_root_id_from(id)
         end
 
+        #
+        # virtual-authenticator
+        #
+
+        def add_virtual_authenticator(options)
+          authenticator_id = execute :add_virtual_authenticator, {}, options.as_json
+          VirtualAuthenticator.new(self, authenticator_id, options)
+        end
+
+        def remove_virtual_authenticator(id)
+          execute :remove_virtual_authenticator, {authenticatorId: id}
+        end
+
+        def add_credential(credential, id)
+          execute :add_credential, {authenticatorId: id}, credential
+        end
+
+        def credentials(authenticator_id)
+          execute :get_credentials, {authenticatorId: authenticator_id}
+        end
+
+        def remove_credential(credential_id, authenticator_id)
+          execute :remove_credential, {credentialId: credential_id, authenticatorId: authenticator_id}
+        end
+
+        def remove_all_credentials(authenticator_id)
+          execute :remove_all_credentials, {authenticatorId: authenticator_id}
+        end
+
+        def user_verified(verified, authenticator_id)
+          execute :set_user_verified, {authenticatorId: authenticator_id}, {isUserVerified: verified}
+        end
+
         private
 
         #

data/lib/selenium/webdriver/remote/commands.rb

@@ -149,7 +149,21 @@ module Selenium
           # server extensions
           #
 
-          upload_file: [:post, 'session/:session_id/se/file']
+          upload_file: [:post, 'session/:session_id/se/file'],
+
+          #
+          # virtual-authenticator
+          #
+
+          add_virtual_authenticator: [:post, 'session/:session_id/webauthn/authenticator'],
+          remove_virtual_authenticator: [:delete, 'session/:session_id/webauthn/authenticator/:authenticatorId'],
+          add_credential: [:post, 'session/:session_id/webauthn/authenticator/:authenticatorId/credential'],
+          get_credentials: [:get, 'session/:session_id/webauthn/authenticator/:authenticatorId/credentials'],
+          remove_credential: [:delete,
+                              'session/:session_id/webauthn/authenticator/:authenticatorId/credentials/:credentialId'],
+          remove_all_credentials: [:delete, 'session/:session_id/webauthn/authenticator/:authenticatorId/credentials'],
+          set_user_verified: [:post, 'session/:session_id/webauthn/authenticator/:authenticatorId/uv']
+
         }.freeze
 
       end # Bridge

data/lib/selenium/webdriver/version.rb

@@ -19,6 +19,6 @@
 
 module Selenium
   module WebDriver
-    VERSION = '4.3.0'
+    VERSION = '4.4.0'
   end # WebDriver
 end # Selenium

data/selenium-webdriver.gemspec

@@ -56,10 +56,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack', ['~> 2.0']
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', ['~> 3.0']
-  s.add_development_dependency 'rubocop', ['~> 1.22']
-  s.add_development_dependency 'rubocop-performance'
+  s.add_development_dependency 'rubocop', ['~> 1.31']
+  s.add_development_dependency 'rubocop-performance', ['~> 1.13']
   s.add_development_dependency 'rubocop-rake'
-  s.add_development_dependency 'rubocop-rspec'
+  s.add_development_dependency 'rubocop-rspec', ['~> 2.12']
   s.add_development_dependency 'webmock', ['~> 3.5']
   s.add_development_dependency 'webrick', ['~> 1.7']
   s.add_development_dependency 'yard', ['~> 0.9.11']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -162,28 +162,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.31'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '1.31'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -202,16 +202,16 @@ dependencies:
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +359,9 @@ files:
 - lib/selenium/webdriver/common/takes_screenshot.rb
 - lib/selenium/webdriver/common/target_locator.rb
 - lib/selenium/webdriver/common/timeouts.rb
+- lib/selenium/webdriver/common/virtual_authenticator/credential.rb
+- lib/selenium/webdriver/common/virtual_authenticator/virtual_authenticator.rb
+- lib/selenium/webdriver/common/virtual_authenticator/virtual_authenticator_options.rb
 - lib/selenium/webdriver/common/wait.rb
 - lib/selenium/webdriver/common/websocket_connection.rb
 - lib/selenium/webdriver/common/window.rb
@@ -367,6 +370,7 @@ files:
 - lib/selenium/webdriver/devtools/console_event.rb
 - lib/selenium/webdriver/devtools/exception_event.rb
 - lib/selenium/webdriver/devtools/mutation_event.rb
+- lib/selenium/webdriver/devtools/network_interceptor.rb
 - lib/selenium/webdriver/devtools/pinned_script.rb
 - lib/selenium/webdriver/devtools/request.rb
 - lib/selenium/webdriver/devtools/response.rb