browser_sniffer 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1a593002b74a298902288af9c9ad850599246545788da8ec5282661ace4b72
-  data.tar.gz: e51a161b66ef5e9f237e498fed82c101ee55dcfd85493a2003743cdbf305be43
+  metadata.gz: 7466e6d392be9a8f030ff7301bfae8aa97ff0f44ebe0e31a7f662b8ddd1c45a5
+  data.tar.gz: 22a24aa5b13e3c663416a4cb015e03c3af315193cdd398945541e18829174df1
 SHA512:
-  metadata.gz: dcce3cb34e52ffe1d43b5ee06f96d7093effce03cef846c709d7addc06555266edcd2f1b0d5b0879d5a5bae17e2f46d78cc64a939bc45e5a229f9575106f9011
-  data.tar.gz: 4a2b2a8995d1e2b7cc6c9aa61bcbb839f63dae0963cd7513eb2ad88fae1755dc39713c730d8d74b0e51ec7a1257f5e4e87fde5a8bed88c87c9837e69f969c6fc
+  metadata.gz: 0f5a4612854ada3f81857d40d536817cb1064aec4dc6f24251d25658923dd91d45230091019defe14c594422004bd053402792a4b312d8fca5a5056b80a71479
+  data.tar.gz: 25b99d22d52f3e8dae0a9aeb345408121dd23076f4a3736dbd147ab398dd5b3490b7b09de7fb8e413664e4170d551c3683e4dc667e7e02d240cb2fd601501730

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/lib/browser_sniffer.rb

@@ -153,4 +153,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/lib/browser_sniffer/version.rb

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

data/test/shopify_agents_test.rb

@@ -406,6 +406,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)
@@ -603,4 +674,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.2.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,8 +95,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.0.3
 signing_key: 
 specification_version: 4
 summary: Parses user agent strings and boils it all down to a few simple classifications.