-
Notifications
You must be signed in to change notification settings - Fork 49
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: user agent parsing #1607
feat: user agent parsing #1607
Changes from all commits
1bd9bef
fe3f24e
2b7d08a
7881d61
39b080c
89ca480
f2d953b
30d4686
6c19ee5
3bb0a09
6a7a327
e160cd4
9e0f013
c2ff37c
83b7216
65a4261
71a3037
c6d8282
47eae09
5720d66
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
use std::fmt; | ||
|
||
use woothee::parser::{Parser, WootheeResult}; | ||
|
||
// List of valid user-agent attributes to keep, anything not in this | ||
|
@@ -11,6 +13,185 @@ const VALID_UA_BROWSER: &[&str] = &["Chrome", "Firefox", "Safari", "Opera"]; | |
// field). Windows has many values and we only care that its Windows | ||
const VALID_UA_OS: &[&str] = &["Firefox OS", "Linux", "Mac OSX"]; | ||
|
||
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)] | ||
pub enum Platform { | ||
FirefoxDesktop, | ||
Fenix, | ||
FirefoxIOS, | ||
#[default] | ||
Other, | ||
} | ||
|
||
impl fmt::Display for Platform { | ||
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
let name = format!("{:?}", self).to_lowercase(); | ||
write!(fmt, "{}", name) | ||
} | ||
} | ||
|
||
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)] | ||
pub enum DeviceFamily { | ||
Desktop, | ||
Mobile, | ||
Tablet, | ||
#[default] | ||
Other, | ||
} | ||
|
||
impl fmt::Display for DeviceFamily { | ||
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
let name = format!("{:?}", self).to_lowercase(); | ||
write!(fmt, "{}", name) | ||
} | ||
} | ||
|
||
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)] | ||
pub enum OsFamily { | ||
Windows, | ||
MacOs, | ||
Linux, | ||
IOS, | ||
Android, | ||
#[default] | ||
Other, | ||
} | ||
|
||
impl fmt::Display for OsFamily { | ||
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
let name = format!("{:?}", self).to_lowercase(); | ||
write!(fmt, "{}", name) | ||
} | ||
} | ||
|
||
#[derive(Debug, Default, Eq, PartialEq)] | ||
pub struct DeviceInfo { | ||
pub platform: Platform, | ||
pub device_family: DeviceFamily, | ||
pub os_family: OsFamily, | ||
pub firefox_version: u32, | ||
} | ||
|
||
impl DeviceInfo { | ||
/// Determine if the device is a desktop device based on either the form factor or OS. | ||
pub fn is_desktop(&self) -> bool { | ||
matches!(&self.device_family, DeviceFamily::Desktop) | ||
|| matches!( | ||
&self.os_family, | ||
OsFamily::MacOs | OsFamily::Windows | OsFamily::Linux | ||
) | ||
} | ||
|
||
/// Determine if the device is a mobile phone based on either the form factor or OS. | ||
pub fn is_mobile(&self) -> bool { | ||
matches!(&self.device_family, DeviceFamily::Mobile) | ||
&& matches!(&self.os_family, OsFamily::Android | OsFamily::IOS) | ||
} | ||
|
||
/// Determine if the device is iOS based on either the form factor or OS. | ||
pub fn is_ios(&self) -> bool { | ||
matches!(&self.device_family, DeviceFamily::Mobile) | ||
&& matches!(&self.os_family, OsFamily::IOS) | ||
} | ||
|
||
/// Determine if the device is an android (Fenix) device based on either the form factor or OS. | ||
pub fn is_fenix(&self) -> bool { | ||
matches!(&self.device_family, DeviceFamily::Mobile) | ||
&& matches!(&self.os_family, OsFamily::Android) | ||
} | ||
} | ||
|
||
/// Parses user agents from headers and returns a DeviceInfo struct containing | ||
/// DeviceFamily, OsFamily, Platform, and Firefox Version. | ||
/// | ||
/// Intended to handle standard user agent strings but also accomodates the non-standard, | ||
/// Firefox-specific user agents for iOS and desktop. | ||
/// | ||
/// It is theoretically possible to have an invalid user agent that is non-Firefox in the | ||
/// case of an invalid UA, bot, or scraper. | ||
/// There is a check for this to return an empty result as opposed to failing. | ||
/// | ||
/// Parsing logic for non-standard iOS strings are in the form Firefox-iOS-FxA/24 and | ||
/// manually modifies WootheeResult to match with correct enums for iOS platform and OS. | ||
/// FxSync/<...>.desktop result still parses natively with Woothee and doesn't require intervention. | ||
pub fn get_device_info(user_agent: &str) -> DeviceInfo { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's add a note in the docs for this fn that it handles a mix regular user-agents and the sync specific ones. I guess the latter are mostly just the ios "Firefox-iOS-FxA/24" one. Desktop also has its sync specific "FxSync/<...>.desktop" thing but it doesn't end up requiring special handling |
||
let mut w_result: WootheeResult<'_> = Parser::new().parse(user_agent).unwrap_or_default(); | ||
|
||
// Current Firefox-iOS logic outputs the `user_agent` in the following formats: | ||
// Firefox-iOS-Sync/108.1b24234 (iPad; iPhone OS 16.4.1) (Firefox) | ||
// OR | ||
// Firefox-iOS-FxA/24 | ||
// Both contain prefix `Firefox-iOS` and are not successfully parsed by Woothee. | ||
// This custom logic accomodates the current state (Q4 - 2024) | ||
// This may be a discussion point for future client-side adjustment to have a more standardized | ||
// user_agent string. | ||
if user_agent.to_lowercase().starts_with("firefox-ios") { | ||
w_result.name = "firefox"; | ||
w_result.category = "smartphone"; | ||
w_result.os = "iphone"; | ||
} | ||
|
||
// NOTE: Firefox on iPads report back the Safari "desktop" UA | ||
// (e.g. `Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/605.1.15 | ||
// (KHTML, like Gecko) Version/13.1 Safari/605.1.15)` | ||
// therefore we have to accept that one. This does mean that we may presume | ||
// that a mac safari UA is an iPad. | ||
if w_result.name.to_lowercase() == "safari" && !user_agent.to_lowercase().contains("firefox/") { | ||
w_result.name = "firefox"; | ||
w_result.category = "smartphone"; | ||
w_result.os = "ipad"; | ||
} | ||
|
||
// Check if the user agent is not Firefox and return empty. | ||
if !["firefox"].contains(&w_result.name.to_lowercase().as_str()) { | ||
return DeviceInfo::default(); | ||
} | ||
|
||
let os = w_result.os.to_lowercase(); | ||
let os_family = match os.as_str() { | ||
_ if os.starts_with("windows") => OsFamily::Windows, | ||
"mac osx" => OsFamily::MacOs, | ||
"linux" => OsFamily::Linux, | ||
"iphone" | "ipad" => OsFamily::IOS, | ||
"android" => OsFamily::Android, | ||
_ => OsFamily::Other, | ||
}; | ||
|
||
let device_family = match w_result.category { | ||
"pc" => DeviceFamily::Desktop, | ||
"smartphone" if os.as_str() == "ipad" => DeviceFamily::Tablet, | ||
"smartphone" => DeviceFamily::Mobile, | ||
_ => DeviceFamily::Other, | ||
}; | ||
|
||
let platform = match device_family { | ||
DeviceFamily::Desktop => Platform::FirefoxDesktop, | ||
DeviceFamily::Mobile => match os_family { | ||
OsFamily::IOS => Platform::FirefoxIOS, | ||
OsFamily::Android => Platform::Fenix, | ||
_ => Platform::Other, | ||
}, | ||
DeviceFamily::Tablet => match os_family { | ||
OsFamily::IOS => Platform::FirefoxIOS, | ||
_ => Platform::Other, | ||
}, | ||
DeviceFamily::Other => Platform::Other, | ||
}; | ||
|
||
let firefox_version = w_result | ||
.version | ||
.split('.') | ||
.next() | ||
.and_then(|v| v.parse::<u32>().ok()) | ||
.unwrap_or(0); | ||
|
||
DeviceInfo { | ||
platform, | ||
device_family, | ||
os_family, | ||
firefox_version, | ||
} | ||
} | ||
|
||
pub fn parse_user_agent(agent: &str) -> (WootheeResult<'_>, &str, &str) { | ||
let parser = Parser::new(); | ||
let wresult = parser.parse(agent).unwrap_or_else(|| WootheeResult { | ||
|
@@ -41,7 +222,9 @@ pub fn parse_user_agent(agent: &str) -> (WootheeResult<'_>, &str, &str) { | |
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::parse_user_agent; | ||
use crate::server::user_agent::{DeviceFamily, OsFamily, Platform}; | ||
|
||
use super::{get_device_info, parse_user_agent}; | ||
|
||
#[test] | ||
fn test_linux() { | ||
|
@@ -81,4 +264,75 @@ mod tests { | |
assert_eq!(metrics_browser, "Other"); | ||
assert_eq!(ua_result.name, "UNKNOWN"); | ||
} | ||
|
||
#[test] | ||
fn test_windows_desktop() { | ||
let user_agent = r#"Firefox/130.0.1 (Windows NT 10.0; Win64; x64) FxSync/1.132.0.20240913135723.desktop"#; | ||
let device_info = get_device_info(user_agent); | ||
assert_eq!(device_info.platform, Platform::FirefoxDesktop); | ||
assert_eq!(device_info.device_family, DeviceFamily::Desktop); | ||
assert_eq!(device_info.os_family, OsFamily::Windows); | ||
assert_eq!(device_info.firefox_version, 130); | ||
} | ||
|
||
#[test] | ||
fn test_macos_desktop() { | ||
let user_agent = | ||
r#"Firefox/130.0.1 (Intel Mac OS X 10.15) FxSync/1.132.0.20240913135723.desktop"#; | ||
let device_info = get_device_info(user_agent); | ||
assert_eq!(device_info.platform, Platform::FirefoxDesktop); | ||
assert_eq!(device_info.device_family, DeviceFamily::Desktop); | ||
assert_eq!(device_info.os_family, OsFamily::MacOs); | ||
assert_eq!(device_info.firefox_version, 130); | ||
} | ||
|
||
#[test] | ||
fn test_fenix() { | ||
let user_agent = r#"Mozilla/5.0 (Android 13; Mobile; rv:130.0) Gecko/130.0 Firefox/130.0"#; | ||
let device_info = get_device_info(user_agent); | ||
assert_eq!(device_info.platform, Platform::Fenix); | ||
assert_eq!(device_info.device_family, DeviceFamily::Mobile); | ||
assert_eq!(device_info.os_family, OsFamily::Android); | ||
assert_eq!(device_info.firefox_version, 130); | ||
} | ||
|
||
#[test] | ||
fn test_firefox_ios() { | ||
let user_agent = r#"Firefox-iOS-FxA/24"#; | ||
let device_info = get_device_info(user_agent); | ||
assert_eq!(device_info.platform, Platform::FirefoxIOS); | ||
assert_eq!(device_info.device_family, DeviceFamily::Mobile); | ||
assert_eq!(device_info.os_family, OsFamily::IOS); | ||
assert_eq!(device_info.firefox_version, 0); | ||
} | ||
|
||
#[test] | ||
fn test_firefox_ios_alternate_user_agent() { | ||
let user_agent = r#"Firefox-iOS-Sync/115.0b32242 (iPhone; iPhone OS 17.7) (Firefox)"#; | ||
let device_info = get_device_info(user_agent); | ||
assert_eq!(device_info.platform, Platform::FirefoxIOS); | ||
assert_eq!(device_info.device_family, DeviceFamily::Mobile); | ||
assert_eq!(device_info.os_family, OsFamily::IOS); | ||
assert_eq!(device_info.firefox_version, 0); | ||
} | ||
|
||
#[test] | ||
fn test_platform_other() { | ||
let user_agent = r#"Mozilla/5.0 (Linux; Android 9; SM-A920F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4216.0 Mobile Safari/537.36"#; | ||
let device_info = get_device_info(user_agent); | ||
assert_eq!(device_info.platform, Platform::Other); | ||
assert_eq!(device_info.device_family, DeviceFamily::Other); | ||
assert_eq!(device_info.os_family, OsFamily::Other); | ||
assert_eq!(device_info.firefox_version, 0); | ||
} | ||
|
||
#[test] | ||
fn test_non_firefox_platform_other() { | ||
let user_agent = r#"Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0)"#; | ||
let device_info = get_device_info(user_agent); | ||
assert_eq!(device_info.platform, Platform::Other); | ||
assert_eq!(device_info.device_family, DeviceFamily::Other); | ||
assert_eq!(device_info.os_family, OsFamily::Other); | ||
assert_eq!(device_info.firefox_version, 0); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add a test for
Platform::Other
-- going by the spreadsheet, I'd expect "Mozilla/5.0 (Linux; Android 9; SM-A920F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4216.0 Mobile Safari/537.36" (Android Chrome I believe) to come back as it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made an implementation change, since the parsing logic was still getting the right OS and device family. I adjusted it to be that if the browser is not Firefox, return the Default implementation of
DeviceInfo
with Other as everything andFirefoxVersion
of 0, making it easy to screen out, added test too