Fix detection of Firefox on iPad

nono · nono · commit 42e4a8f39125 · 2020-04-27T15:30:02.000+02:00
Signed-off-by: Bruno Michel &lt;bruno@cozycloud.cc&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Not yet published
+
+- Fix detection of Firefox on iPad.
+
 ## 0.5.2
 
 - Detect Electron. See [commit](https://github.com/mssola/user_agent/commit/1a36963d74c0efca7de80dc7518a0958c66b3c4f).
diff --git a/all_test.go b/all_test.go
@@ -571,6 +571,11 @@ var uastrings = []struct {
 		ua:       "Mozilla/5.0 (iPhone; CPU iPhone OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/7.0.4 Mobile/16B91 Safari/605.1.15",
 		expected: "Mozilla:5.0 Platform:iPhone OS:CPU iPhone OS 12_1 like Mac OS X Browser:Firefox-7.0.4 Engine:AppleWebKit-605.1.15 Bot:false Mobile:true",
 	},
+	{
+		title:    "Firefox on iPad",
+		ua:       "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/24.1 Safari/605.1.15",
+		expected: "Mozilla:5.0 Platform:iPad OS:Intel Mac OS X 10.15 Browser:Firefox-24.1 Engine:AppleWebKit-605.1.15 Bot:false Mobile:true",
+	},
 	{
 		title:    "Electron",
 		ua:       "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) CozyDrive/3.17.0  Chrome/73.0.3683.119 Electron/5.0.0 Safari/537.36",
diff --git a/operating_systems.go b/operating_systems.go
@@ -116,6 +116,12 @@ func webkit(p *UserAgent, comment []string) {
 			}
 		}
 	}
+
+	// Special case for Firefox on iPad, where the platform is advertised as Macintosh instead of iPad
+	if p.platform == "Macintosh" && p.browser.Engine == "AppleWebKit" && p.browser.Name == "Firefox" {
+		p.platform = "iPad"
+		p.mobile = true
+	}
 }
 
 // Guess the OS, the localization and if this is a mobile device

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,12 @@ func webkit(p *UserAgent, comment []string) {`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`
	`119`	`+`
	`120`	`+ // Special case for Firefox on iPad, where the platform is advertised as Macintosh instead of iPad`
	`121`	`+ if p.platform == "Macintosh" && p.browser.Engine == "AppleWebKit" && p.browser.Name == "Firefox" {`
	`122`	`+ p.platform = "iPad"`
	`123`	`+ p.mobile = true`
	`124`	`+ }`
`119`	`125`	`}`
`120`	`126`
`121`	`127`	`// Guess the OS, the localization and if this is a mobile device`