Merge pull request #9 from pradtke/master

Support embedded mac browser check
fullfatthings · Jan 28, 2021 · 6803453 · 6803453
2 parents 86404ba + 91538e8
commit 6803453
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/src/SameSiteException.php b/src/SameSiteException.php
@@ -19,6 +19,7 @@ class SameSiteException
     const SAFARI_REGEX = "/Version\/.* Safari\//";
     const CHROME_REGEX = "/Chrom(e|ium)/";
     const UCBROWSER_REGEX = "/UCBrowser\/(\d+)\.(\d+)\.(\d+)[\.\d]* /";
+    const EMBEDDED_MAC_REGEX = "|Mozilla.*\(Macintosh;.*Mac OS X [_\d]+\).*AppleWebKit/[\.\d]+ \(KHTML, like Gecko\)$|";
 
     const IOS_VERSION_REGEX = "/\(iP.+; CPU .*OS (\d+)[_\d]*.*\) AppleWebKit\//";
     const OSX_VERSION_REGEX = "/\(Macintosh;.*Mac OS X (\d+)_(\d+)[_\d]*.*\) AppleWebKit\//";
@@ -105,13 +106,24 @@ public static function hasWebKitSameSiteBug($user_agent_string)
         return (self::isIosVersion(12, $user_agent_string) ||
           (
             self::isMacosxVersion(10, 14, $user_agent_string) &&
-            self::isSafari($user_agent_string)
-            // NB: have not included isMacEmbeddedBrowser.
+            (self::isSafari($user_agent_string) || self::isMacEmbeddedBrowser($user_agent_string))
           )
 
         );
     }
 
+    /**
+     * Detect if the user agent string is a Mac embedded browser
+     * @param string $user_agent_string
+     *   User agent string to test.
+     * @return bool
+     *   True if the given user agent is Mac embedded browser.
+     */
+    public static function isMacEmbeddedBrowser($user_agent_string)
+    {
+        return (bool) preg_match(self::EMBEDDED_MAC_REGEX, $user_agent_string);
+    }
+
     /**
      * Detect if the user agent string is known to drop unrecognized same site cookies.
      *

diff --git a/tests/SameSiteExceptionTest.php b/tests/SameSiteExceptionTest.php
@@ -166,6 +166,32 @@ public static function isSafariProvider()
         );
     }
 
+    /**
+     * @covers ::isMacEmbeddedBrowser
+     *
+     * @dataProvider isMacEmbeddedBrowserProvider()
+     *
+     * @param string $user_agent
+     *   User agent string
+     * @param bool $match
+     *   Should the string match.
+     */
+    public function testIsMacEmbeddedBrowser($user_agent, $match)
+    {
+        $this->assertEquals($match, SameSiteException::isMacEmbeddedBrowser($user_agent));
+    }
+
+    public static function isMacEmbeddedBrowserProvider()
+    {
+        return array(
+            'Embedded Mac 10.14' => array("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/605.1.15 (KHTML, like Gecko)", true),
+            'Embedded Mac 10.15' => array("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/605.1.15 (KHTML, like Gecko)", true),
+            'firefox' => array("Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:57.0) Gecko/20100101 Firefox/57.0", false),
+            'Native safari' => array("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/604.5.6 (KHTML, like Gecko) Version/11.0.3 Safari/604.5.6", false),
+            'Chromium safari' => array("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36", false)
+        );
+    }
+
     /**
      * @covers ::isChromiumBased
      *
@@ -369,7 +395,7 @@ public static function isSameSiteNoneIncompatibleProvider()
      */
     public function testGetSafeString($safe_string, $user_agent, $expected)
     {
-        $this->assertEquals($expected, SameSiteException::getSafeString($safe_string, $user_agent));
+        $this->assertEquals($expected, SameSiteException::getSafeString($safe_string, $user_agent), $user_agent);
     }
 
     public static function getSafeStringProvider()
@@ -383,7 +409,9 @@ public static function getSafeStringProvider()
           'IOS 12 None' => array("None", "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", null),
           'Safari OSX 10.14 Lax' => array("Lax", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Safari/605.1.15", "Lax"),
           'Safari OSX 10.14 Strict' => array("Strict", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Safari/605.1.15", "Strict"),
-          'Safari OSX 10.14 None' => array("None", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Safari/605.1.15", null)
+          'Safari OSX 10.14 None' => array("None", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_5) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.1 Safari/605.1.15", null),
+          'Embedded Mac with support' => array("None",'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/605.1.15 (KHTML, like Gecko)', "None"),
+          'Embedded Mac without support' => array("None",'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_4) AppleWebKit/605.1.15 (KHTML, like Gecko)', null),
         );
     }
 }