selenium_tor 1.5.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45483bd8f793aa018296ee9ae0e06c496d0dd4dde2155e5421f05f7da9d497c1
-  data.tar.gz: 8ca6956063b24ee1b30e3c8a4a7f2332fcc40fb12be62a9fd94058470e5ff657
+  metadata.gz: e6f9d6ff1e71d45656e35148ac5d58b490e85c23fbe47cb977de1b0b3f0a7de2
+  data.tar.gz: 24a4431f5a6b7957f14ca5d222b0f630f29e9955956622e20e73cdff5c51de6c
 SHA512:
-  metadata.gz: fa1ad5934e06fb5a69c81e267e55d919cc29cce8fbc0480297b0439d65db53c79c63e27dfc718455b90d6368f5af359bd153003f570befc88a6c96bb3bc18dc4
-  data.tar.gz: a565f2f16b886d9a70c3646775e6cb093fc586b9702e01f7707bbae481395f8207322525355a5224fe2251d119681e18285ecebec48d0b78d07b27bf775f0e4b
+  metadata.gz: 3f4a53aa33461f0159c0ff8703786646df23b8f503534710d4cf83c688ee247334262e88661f9d87a9a7ce008377c62032e209b737c7abd61165a0b309d8a262
+  data.tar.gz: 758cbe58b60de4556ff5c95fc82761f919ea1670b131c8afad6f6e6be673092ceb2fa71e5fde1240d5e70c03786eb4d04c75197073af9425381c1d6d66777522

data/.rubocop.yml

@@ -13,7 +13,7 @@ Style/HashSyntax:
 
 Naming/MethodName:
   Exclude:
-    - !ruby/regexp /test_.*\.rb$/ # for test_FOO constant tests
+    - !ruby/regexp /test_.*\.rb$/  # for test_FOO constant tests
 
 Security/Eval:
   Exclude:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master (unreleased)
 
+## [1.6.0] - 2024-12-04
+
+* drop support for TB < 14.0 stable
+* Remove vglrun test from CI
+
 ## [1.5.4] - 2024-10-10
 
 * Add Bsdiff gem dependency

data/README.md

@@ -41,7 +41,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ## Dependencies and configuration
 
-[Tor Browser](https://www.torproject.org/download).
+[Tor Browser](https://www.torproject.org/download). Versions >= 14.0 stable are supported.
 
 As with Firefox browser, `geckodriver` needs to be installed and in your PATH.
 

data/fonts/000_README.txt

@@ -2,6 +2,5 @@ DO NOT MODIFY THE CONTENTS OF THIS DIRECTORY
 
 Any adjustment to bundled fonts will result in an altered fingerprint. Font
 fingerprinting is more than just detecting what fonts you have, it also includes
-font fallbacks and characters (unicode code points) and any change in those can
+font fallbacks and characters (Unicode code points) and any change in those can
 be measured.
-

data/lib/tor/driver.rb

@@ -29,8 +29,7 @@ module Selenium
           @data_dir = Dir.mktmpdir
           @options = options || Options.new # fix for issue #11, 'tis a puzzlement
           add_torrc_path_to_options
-          # @instance = DriverDelegate.new(options: @options, **)
-          @instance = DriverDelegate.new(options: @options, **, service: service)
+          @instance = DriverDelegate.new(options: @options, **)
           install_extensions @instance
           create_tor_process_and_start_tor @options.tor_opts
           super(@instance)
@@ -88,12 +87,6 @@ module Selenium
         def domain
           URI(current_url).host&.match(/[^\.]+\.\w+$/)
         end
-
-        def service
-          service = Service.tor
-          service.args << '--enable-crash-reporter' # BUG: 18, https://github.com/mozilla/geckodriver/issues/2202
-          service
-        end
       end
     end
   end

data/lib/tor/libxul_checksums.yml

@@ -1,4 +1,31 @@
 ---
+14.5a1:
+  unpatched_libxul: 4586056dfd6584effa61f974e802b5b2103965326716423c2f76043e68571149
+  patched_libxul: b4463dffe43a112e509764c5e32b100bc2749112dc852244ed8817b72e631642
+  patch_checksum: a0397d3e9a86339c497bcedf3b8c4bed767284e9299e791e54266d42c2872b7d
+14.0.3:
+  unpatched_libxul: 2ddc3df2e8feb52c3bcd638249aac7d584d9c65888d67e18ad5fecceb4d5010a
+  patched_libxul: 9864cdfd750e504f06bd9eeca427f0a20d83d0bb5cd8e8232ae4a3ee4b2812b1
+  patch_checksum: 5deece766f5922c77ca4e60f194c0bdfa0374f6c80e190cdf60dd10f49d3b5e8
+14.0.2:
+  unpatched_libxul: 590a02a751951452b0f3eded2234b6c1ffc49ce794301192450a236db5ad11af
+  patched_libxul: 6a49949e01ea35f61ba0e08c05d66ec6b9591d7b148314b99a9d2e7b8334c3f4
+  patch_checksum: 8f3ab90326a7b995eebfd83018dc83b257f5699a72d3cd9754706df973a66852
+14.0.1:
+  unpatched_libxul: 02751a5f1c3390c8d8b1b062147713d9a5412797139d3a86217df3380b44a390
+  patched_libxul: 6df072f5e9f86bcd244b5dab416074754214b85f9735bc05f8d322bf136652ef
+  patch_checksum: 844e29b6131fa6d7282a0052aa81000c5decdd410da509f56e0cf9b8c24d6ca9
+!!str 14.0:
+  unpatched_libxul: 0a9c57aa19a953af56b49e944bfb950b7ba47d12fa927bb76c5ff04b8cdcf063
+  patched_libxul: 3b163b5c035376883fd49eac7fa5d90bfa536d26038ee4e36508226111936cce
+  patch_checksum: 2821841ff51fb511731810622fecb9c132e0774f5883dc500f67869c59a81509
+#######################
+# NO LONGER SUPPORTED #
+#######################
+14.0a9:
+  unpatched_libxul: af9228a9b026fb4dad1d611070421346d8f4f714f00d909bbc2bda04e4175ff4
+  patched_libxul: 7e1e5e733c8c258a92170b45d0bbcafc14beea628290cacbc013affda3082193
+  patch_checksum: cb3fef972d41f81a212b95b1b47b8b0fcb03e58271cde4bbaf6d4fe3f7ffc318
 14.0a8:
   unpatched_libxul: 3ce2cef75c68f52df50cc435c9307bae8596ecbbf53d067e0731506096fb36cd
   patched_libxul: 789bb47f02d7f5c87cae05409ea31a2cf1d222f6716c2dd81fc333f221bf8c16

data/lib/tor/libxul_patchable.rb

@@ -14,9 +14,10 @@ module Selenium
       module LibxulPatchable
         class LibxulPatchableError < StandardError; end
 
-        LIBXUL_CHECKSUMS = YAML.load_file(File.join(__dir__, 'libxul_checksums.yml'))[Tor::TBB_VERSION]
         PATCH_REPO = 'https://gitlab.com/matzfan/keymaster/-/raw/master/patches/tor-browser'
         ISSUES_URL = 'https://gitlab.com/matzfan/keymaster/-/issues'
+        NO_PATCH_MSG = "No patch for #{Tor::TBB_VERSION}, please raise an issue at #{ISSUES_URL}".freeze
+        UNDEF_REGEXP = /undefined method (`|')\[\]' for nil/
 
         def libxul_patched?
           libxul_checksum = checksum_for Tor::TBB_LIBXUL
@@ -35,7 +36,7 @@ module Selenium
           execute_patch patchfile
           FileUtils.cp libxul_patched, Tor::TBB_LIBXUL
         rescue OpenURI::HTTPError
-          raise LibxulPatchableError, "No patch for #{Tor::TBB_VERSION}, please raise an issue at #{ISSUES_URL}"
+          raise LibxulPatchableError, NO_PATCH_MSG
         end
 
         def unpatch_libxul
@@ -63,16 +64,32 @@ module Selenium
           Bsdiff.patch libxul_original, libxul_patched, patchfile
         end
 
+        def libxul_checksums
+          @libxul_checksums ||= YAML.load_file(File.join(__dir__, 'libxul_checksums.yml'))[Tor::TBB_VERSION]
+        end
+
         def unpatched_libxul_checksum_for_version
-          LIBXUL_CHECKSUMS['unpatched_libxul']
+          libxul_checksums['unpatched_libxul']
+        rescue NoMethodError => e
+          raise LibxulPatchableError, NO_PATCH_MSG if e.message.match UNDEF_REGEXP
+
+          raise e
         end
 
         def patched_libxul_checksum_for_version
-          LIBXUL_CHECKSUMS['patched_libxul']
+          libxul_checksums['patched_libxul']
+        rescue NoMethodError => e
+          raise LibxulPatchableError, NO_PATCH_MSG if e.message.match UNDEF_REGEXP
+
+          raise e
         end
 
         def patch_checksum_for_version
-          LIBXUL_CHECKSUMS['patch_checksum']
+          libxul_checksums['patch_checksum']
+        rescue NoMethodError => e
+          raise LibxulPatchableError, NO_PATCH_MSG if e.message.match UNDEF_REGEXP
+
+          raise e
         end
 
         def checksum_for(file)

data/lib/tor/options.rb

@@ -42,17 +42,21 @@ module Selenium
         def do_start_tor_browser_script_stuff
           ENV['SESSION_MANAGER'] = nil
           ENV['XAUTHORITY'] = File.join(Dir.home, '.Xauthority') unless ENV.fetch('XAUTHORITY', nil)
-          ENV['FONTCONFIG_PATH'] = File.join TBB_BROWSER_DIR, 'fontconfig'
-          ENV['FONTCONFIG_FILE'] = 'fonts.conf'
           FileUtils.rm_rf File.join(Tor::TBB_BROWSER_DIR, *%w[TorBrowser Data fontconfig])
           ENV['GSETTINGS_BACKEND'] = 'memory'
+          setup_font_vars if Tor::TBB_VERSION.to_f < 14.5 # DEPRECATE when 14.5 stable drops
         end
 
         def copy_fonts
-          return unless Dir[File.join('fonts', '*')].size == 1 # README checked into git
-
+          FileUtils.rm_rf File.join(File.expand_path('fonts'), '.')
           FileUtils.cp(Dir[File.join(Tor::TBB_BROWSER_DIR, 'fonts', '*')], File.expand_path('fonts'))
         end
+
+        # DEPRECATE when 14.5 stable drops
+        def setup_font_vars
+          ENV['FONTCONFIG_PATH'] = File.join TBB_BROWSER_DIR, 'fontconfig'
+          ENV['FONTCONFIG_FILE'] = 'fonts.conf'
+        end
       end
     end
   end

data/lib/tor/version.rb

@@ -3,7 +3,7 @@
 module Selenium
   module WebDriver
     module Tor
-      VERSION = '1.5.4'
+      VERSION = '1.6.0'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: selenium_tor
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.6.0
 platform: ruby
 authors:
 - MatzFan
 bindir: exe
 cert_chain: []
-date: 2024-10-09 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bsdiff
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.24'
+        version: '4.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.24'
+        version: '4.27'
 description: An extension for Selenium::WebDriver that automates Tor Browser
 executables: []
 extensions: []