browser_sniffer 1.1.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1a593002b74a298902288af9c9ad850599246545788da8ec5282661ace4b72
-  data.tar.gz: e51a161b66ef5e9f237e498fed82c101ee55dcfd85493a2003743cdbf305be43
+  metadata.gz: c1f122e65998d2712691f2b2dfefd9cbbdb7e824ad1a5a39bab483b4274bbac3
+  data.tar.gz: 002eb813a2e049806a5e409035aeb8f303c4dff4797e05461993d70e372f5c18
 SHA512:
-  metadata.gz: dcce3cb34e52ffe1d43b5ee06f96d7093effce03cef846c709d7addc06555266edcd2f1b0d5b0879d5a5bae17e2f46d78cc64a939bc45e5a229f9575106f9011
-  data.tar.gz: 4a2b2a8995d1e2b7cc6c9aa61bcbb839f63dae0963cd7513eb2ad88fae1755dc39713c730d8d74b0e51ec7a1257f5e4e87fde5a8bed88c87c9837e69f969c6fc
+  metadata.gz: 266ff5af2b669e477e088b0cf2caff845e7bacdbcc2abd7a6c4380921a9343e15604c2c4975260bf53cdccc0002de45b49563aef40e790c4fe46f1abc5e497b0
+  data.tar.gz: 9c9620bb162e584acc189d3a6e208d67470a0d16aeefd5b331f9250e5dc1eb444fc1243fef615bf242cde1a5ba4d89c9a124a0984e56119baf4c05831c545225

data/.travis.yml

@@ -3,6 +3,10 @@ rvm:
   - 1.9
   - 2.0
   - 2.1
+  - 2.4
+  - 2.5
+  - 2.6
+  - truffleruby-19.2.0.1 # like 2.6.2
   - jruby
 
 before_install: gem update bundler

data/browser_sniffer.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 1.9.3"
 
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"

data/lib/browser_sniffer/patterns.rb

@@ -73,8 +73,8 @@ class BrowserSniffer
         %r{.*(Shopify POS Next|Shopify POS)\/(?:iOS)\/([\d\.]+) \((iPhone|iPad|iPod)}i
       ], [[:name, 'Shopify POS'], :version], [
         # Shopify Mobile for Android
-        %r{.*(Shopify Mobile)\/Android\/([\d\.]+(?: \(debug(?:|-push)\))?) \(Build (\d+) with API (\d+)}i
-      ], [[:name, 'Shopify Mobile'], :version, :build, :sdk_version], [
+        %r{.*(Shopify Mobile)\/Android\/([\d\.]+)(?: \((debug(?:|-push))\))? \(Build (\d+) with API (\d+)}i
+      ], [[:name, 'Shopify Mobile'], :version, :debug_mode, :build, :sdk_version], [
         # ShopifyFoundation shared library
         /^(ShopifyFoundation)/i,
       ], [:name], [
@@ -332,7 +332,7 @@ class BrowserSniffer
         /(gnu)\s?([\w\.]+)*/i # GNU
       ], [:name, :version, [:type, :linux]], [
         /(cros)\s[\w]+\s([\w\.]+\w)/i # Chromium OS
-      ], [[:name, 'Chromium OS'], :version],[
+      ], [[:name, 'Chromium OS'], :version, [:type, :chromium_os]],[
         # Solaris
         /(sunos)\s?([\w\.]+\d)*/i # Solaris
       ], [[:name, 'Solaris'], :version], [

data/lib/browser_sniffer/version.rb

@@ -1,3 +1,3 @@
 class BrowserSniffer
-  VERSION = "1.1.3"
+  VERSION = "1.3.0"
 end

data/lib/browser_sniffer.rb

@@ -24,6 +24,15 @@ class BrowserSniffer
     browser == :ie && major_browser_version == 11
   end
 
+  # This method checks ie 11 mobile or ie11 rendering an older version in compatibility mode, in addition to `ie11?`.
+  # The `ie11?` method would return false in both those scenarios.
+  def ie11_actual?
+    ie11_engine = major_engine_version == 7 && engine_name == 'Trident'
+    ie_mobile11 = major_browser_version == 11 && browser_name == 'IEMobile'
+
+    ie11? || ie11_engine || ie_mobile11
+  end
+
   def handheld?
     form_factor == :handheld
   end
@@ -153,4 +162,42 @@ class BrowserSniffer
     end
     result
   end
+
+  def same_site_none_compatible?
+    return false unless user_agent
+
+    webkit_same_site_compatible? && same_site_recognized_browser?
+  end
+
+  def webkit_same_site_compatible?
+    return false unless os && os_version && browser
+
+    !(os == :ios && os_version.match(/^([0-9]|1[12])[\.\_]/)) &&
+       !(os == :mac && browser == :safari && os_version.match(/^10[\.\_]14/))
+  end
+
+  def same_site_recognized_browser?
+    return false unless major_browser_version
+
+    !(chromium_based? && major_browser_version >= 51 && major_browser_version <= 66) &&
+      !(uc_browser? && !uc_browser_version_at_least?(12, 13, 2))
+  end
+
+  def chromium_based?
+    browser_name ? browser_name.downcase.match(/chrom(e|ium)/) : false
+  end
+
+  def uc_browser?
+    user_agent ? user_agent.downcase.match(/uc\s?browser/) : false
+  end
+
+  def uc_browser_version_at_least?(major, minor, build)
+    return false unless browser_version
+    digits = browser_version.split('.').map(&:to_i)
+    return false unless digits.count >= 3
+
+    return digits[0] > major if digits[0] != major
+    return digits[1] > minor if digits[1] != minor
+    digits[2] >= build
+  end
 end

data/test/browser_sniffer_test.rb

@@ -454,6 +454,7 @@ class BrowserSnifferTest < Minitest::Test
       :android? => false,
       :desktop? => true,
       :ie11? => false,
+      :ie11_actual? => false,
       :engine => nil,
       :major_engine_version => nil,
       :os => :mac,
@@ -467,6 +468,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => true,
+      :ie11_actual? => true,
       :android? => false,
       :desktop? => true,
       :engine => :trident,
@@ -481,6 +483,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => true,
+      :ie11_actual? => true,
       :android? => false,
       :desktop? => true,
       :engine => :trident,
@@ -495,6 +498,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => true,
+      :ie11_actual? => true,
       :android? => false,
       :desktop? => true,
       :engine => :trident,
@@ -509,6 +513,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => true,
+      :ie11_actual? => true,
       :android? => false,
       :desktop? => true,
       :engine => :trident,
@@ -523,6 +528,7 @@ class BrowserSnifferTest < Minitest::Test
       :form_factor => :desktop,
       :ios? => false,
       :ie11? => false,
+      :ie11_actual? => false,
       :android? => false,
       :desktop? => true,
       :engine => :webkit,
@@ -544,7 +550,52 @@ class BrowserSnifferTest < Minitest::Test
       :os_version => nil,
       :browser => nil,
       :major_browser_version => nil
-    }
+    },
+    :chromiumos_chrome => {
+      :user_agent => "Mozilla/5.0 (X11; CrOS x86_64 10066.0.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.122 Safari/537.36",
+      :form_factor => :desktop,
+      :ios? => false,
+      :android? => false,
+      :desktop? => true,
+      :engine => :webkit,
+      :major_engine_version => 537,
+      :os => :chromium_os,
+      :os_version => '10066.0.0',
+      :browser => :chrome,
+      :major_browser_version => 81,
+    },
+    :windows_phone_8_1_ie11 => {
+      :user_agent => "Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; Microsoft; " \
+       "Lumia 640 XL) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537",
+      :form_factor => :handheld,
+      :ios? => false,
+      :ie11? => false,
+      :ie11_actual? => true,
+      :android? => false,
+      :desktop? => false,
+      :engine => :webkit,
+      :major_engine_version => 53,
+      :os => :windows,
+      :os_version => "8.1",
+      :browser => nil,
+      :major_browser_version => 11
+    },
+    :win10_ie11_in_ie7_compatibility_mode => {
+      :user_agent => "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 10.0; WOW64; Trident/7.0; .NET4.0C; .NET4.0E; .NET CLR 2.0.50727; " \
+       ".NET CLR 3.0.30729; .NET CLR 3.5.30729; InfoPath.3; Tablet PC 2.0; Zoom 3.6.0)",
+      :form_factor => :desktop,
+      :ios? => false,
+      :ie11? => false,
+      :ie11_actual? => true,
+      :android? => false,
+      :desktop? => true,
+      :engine => :trident,
+      :major_engine_version => 7,
+      :os => :windows,
+      :os_version => "10",
+      :browser => :ie,
+      :major_browser_version => 7
+    },
   }
 
   AGENTS.each do |agent, attributes|

data/test/shopify_agents_test.rb

@@ -155,6 +155,7 @@ describe "Shopify agents" do
     assert_equal ({
       name: 'Shopify Mobile',
       version: '5.4.4',
+      debug_mode: nil,
       build: '12005',
       sdk_version: '25',
     }), sniffer.browser_info
@@ -174,10 +175,11 @@ describe "Shopify agents" do
     "MobileMiddlewareSupported Mozilla/5.0 (Linux; Android 9; Android SDK built for x86 Build/PSR1.180720.075; wv) "\
     "AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/69.0.3497.100 Mobile Safari/537.36"
     sniffer = BrowserSniffer.new(user_agent)
-    
+
     assert_equal ({
       name: 'Shopify Mobile',
       version: '8.12.0',
+      debug_mode: nil,
       build: '12005',
       sdk_version: '28',
     }), sniffer.browser_info
@@ -203,7 +205,8 @@ describe "Shopify agents" do
 
     assert_equal ({
       name: 'Shopify Mobile',
-      version: '6.2.0 (debug)',
+      version: '6.2.0',
+      debug_mode: 'debug',
       build: '1',
       sdk_version: '25',
     }), sniffer.browser_info
@@ -406,6 +409,77 @@ describe "Shopify agents" do
     }), sniffer.os_info
   end
 
+  it "Shopify POS via webview can be sniffed" do
+    user_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) "\
+    "AppleWebKit/ 604.1.21 (KHTML, like Gecko) Version/ 12.0 Mobile/17A6278a Safari/602.1.26 "\
+    "MobileMiddlewareSupported com.jadedpixel.pos Shopify POS/5.43.1 (iPad; iOS 13.1; Scale/2.00)"
+    sniffer = BrowserSniffer.new(user_agent)
+
+    assert_equal ({
+      name: 'Shopify POS',
+      version: '5.43.1',
+    }), sniffer.browser_info
+
+    assert_equal ({
+      type: :tablet,
+      scale: '2.00',
+    }), sniffer.device_info
+
+    assert_equal ({
+      type: :ios,
+      version: '13.1',
+      name: 'iOS',
+    }), sniffer.os_info
+  end
+
+  it "Shopify POS with modern user agent via webview can be sniffed" do
+    user_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) "\
+    "AppleWebKit/ 604.1.21 (KHTML, like Gecko) Version/ 12.0 Mobile/17A6278a "\
+    "Safari/602.1.26 MobileMiddlewareSupported Shopify POS/iOS/3.12.1 "\
+    "(iPad4,7/com.jadedpixel.pos/10.3.1) - Build 1"
+    sniffer = BrowserSniffer.new(user_agent)
+
+    assert_equal ({
+      name: 'Shopify POS',
+      version: '3.12.1',
+    }), sniffer.browser_info
+
+    assert_equal ({
+      type: :tablet,
+      model: '4,7',
+    }), sniffer.device_info
+
+    assert_equal ({
+      type: :ios,
+      name: 'iOS',
+      version: '10.3.1',
+    }), sniffer.os_info
+  end
+
+  it "Shopify POS Next with modern user agent via webview can be sniffed" do
+    user_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) "\
+    "AppleWebKit/ 604.1.21 (KHTML, like Gecko) Version/ 12.0 Mobile/17A6278a "\
+    "Safari/602.1.26 MobileMiddlewareSupported Shopify POS Next/iOS/3.12.1 "\
+    "(iPad4,7/com.jadedpixel.pos/10.3.1) - Build 1"
+    sniffer = BrowserSniffer.new(user_agent)
+
+    assert_equal ({
+      name: 'Shopify POS',
+      version: '3.12.1',
+    }), sniffer.browser_info
+
+    assert_equal ({
+      type: :tablet,
+      model: '4,7',
+    }), sniffer.device_info
+
+    assert_equal ({
+      type: :ios,
+      name: 'iOS',
+      version: '10.3.1',
+    }), sniffer.os_info
+  end
+
   it "Shopify POS with okhttp user agent can be parsed" do
     user_agent = "okhttp/3.6.0"
     sniffer = BrowserSniffer.new(user_agent)
@@ -486,7 +560,8 @@ describe "Shopify agents" do
 
     assert_equal ({
       name: 'Shopify Mobile',
-      version: '6.0.0 (debug)',
+      version: '6.0.0',
+      debug_mode: 'debug',
       build: '1',
       sdk_version: '25',
     }), sniffer.browser_info
@@ -509,7 +584,8 @@ describe "Shopify agents" do
 
     assert_equal ({
       name: 'Shopify Mobile',
-      version: '6.0.0 (debug-push)',
+      version: '6.0.0',
+      debug_mode: 'debug-push',
       build: '1',
       sdk_version: '25',
     }), sniffer.browser_info
@@ -603,4 +679,37 @@ describe "Shopify agents" do
       name: 'iOS',
     }), sniffer.os_info
   end
+
+  INCOMPATIBLE_USER_AGENTS = [
+    "Mozilla/5.0 (iPhone; CPU iPhone OS 12_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko)"\
+      " GSA/87.0.279142407 Mobile/15E148 Safari/605.1",
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/605.1.15 (KHTML, like Gecko)"\
+      " Version/12.1.2 Safari/605.1.15",
+    "Mozilla/5.0 (Linux; U; Android 7.0; en-US; SM-G935F Build/NRD90M) AppleWebKit/534.30 (KHTML, like Gecko) "\
+      "Version/4.0 UCBrowser/11.3.8.976 U3/0.8.0 Mobile Safari/534.30",
+  ]
+
+  INCOMPATIBLE_USER_AGENTS.each do |user_agent|
+    it "user agent #{user_agent} is correctly marked as incompatible" do
+      sniffer = BrowserSniffer.new(user_agent)
+
+      refute sniffer.same_site_none_compatible?
+    end
+  end
+
+  COMPATIBLE_USER_AGENTS = [
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117"\
+      " Safari/537.36",
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:72.0) Gecko/20100101 Firefox/72.0",
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.4"\
+      " Safari/605.1.15",
+  ]
+
+  COMPATIBLE_USER_AGENTS.each do |user_agent|
+    it "user agent #{user_agent} is correctly marked as compatible" do
+      sniffer = BrowserSniffer.new(user_agent)
+
+      assert sniffer.same_site_none_compatible?
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browser_sniffer
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,8 @@ homepage: https://github.com/Shopify/browser_sniffer
 licenses:
 - GPLv2
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -95,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Parses user agent strings and boils it all down to a few simple classifications.