Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: don't use OS version for Mobile Safari #458

Merged
merged 1 commit into from
Feb 10, 2020
Merged

fix: don't use OS version for Mobile Safari #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions regexes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ user_agent_parsers:
# Google Search App on Android, eg:
- regex: 'Mozilla.+Android.+(GSA)/(\d+)\.(\d+)\.(\d+)'
family_replacement: 'Google'

# QQ Browsers
- regex: '(MQQBrowser/Mini)(?:(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)'
family_replacement: 'QQ Browser Mini'
Expand Down Expand Up @@ -699,13 +699,9 @@ user_agent_parsers:
family_replacement: 'Mobile Safari UI/WKWebView'
- regex: '(iPod|iPhone|iPad).+Version/(\d+)\.(\d+)(?:\.(\d+)|)'
family_replacement: 'Mobile Safari UI/WKWebView'
- regex: '(iPod|iPod touch|iPhone|iPad);.*CPU.*OS[ +](\d+)_(\d+)(?:_(\d+)|).*Mobile.*[ +]Safari'
family_replacement: 'Mobile Safari'
- regex: '(iPod|iPod touch|iPhone|iPad);.*CPU.*OS[ +](\d+)_(\d+)(?:_(\d+)|).*Mobile'
family_replacement: 'Mobile Safari UI/WKWebView'
- regex: '(iPod|iPhone|iPad).* Safari'
- regex: '(iPod|iPod touch|iPhone|iPad).* Safari'
family_replacement: 'Mobile Safari'
- regex: '(iPod|iPhone|iPad)'
- regex: '(iPod|iPod touch|iPhone|iPad)'
family_replacement: 'Mobile Safari UI/WKWebView'
- regex: '(Watch)(\d+),(\d+)'
family_replacement: 'Apple $1 App'
Expand Down Expand Up @@ -976,7 +972,7 @@ os_parsers:
os_v1_replacement: '3'

# Android 9; Android 10;
- regex: '(Android) (\d+);'
- regex: '(Android) (\d+);'

# UCWEB
- regex: '^UCWEB.*; (Adr) (\d+)\.(\d+)(?:[.\-]([a-z0-9]+)|);'
Expand Down
66 changes: 45 additions & 21 deletions tests/test_ua.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ test_cases:
family: 'Luminary'
major: '1'
minor: '0'
patch:
patch:

- user_agent_string: 'Luminary/70 CFNetwork/978.0.7 Darwin/18.5.0'
family: 'Luminary'
major: '70'
minor:
patch:
minor:
patch:

- user_agent_string: 'Luminary/70 CFNetwork/975.0.3 Darwin/18.2.0'
family: 'Luminary'
major: '70'
minor:
patch:
minor:
patch:

- user_agent_string: 'Luminary/1.0.3 build 71/iOS 12.2'
family: 'Luminary'
Expand All @@ -38,14 +38,14 @@ test_cases:
- user_agent_string: 'Luminary/70 CFNetwork/976 Darwin/18.2.0'
family: 'Luminary'
major: '70'
minor:
patch:
minor:
patch:

- user_agent_string: 'Luminary/70 CFNetwork/978.0.7 Darwin/18.6.0'
family: 'Luminary'
major: '70'
minor:
patch:
minor:
patch:

- user_agent_string: 'Luminary/1.0.2 build 57/Android SDK 26'
family: 'Luminary'
Expand All @@ -56,8 +56,8 @@ test_cases:
- user_agent_string: 'LuminaryStage/3311 CFNetwork/978.0.7 Darwin/18.5.0'
family: 'Luminary'
major: '3311'
minor:
patch:
minor:
patch:

- user_agent_string: 'fakeLuminary/1.0'
family: 'Other'
Expand Down Expand Up @@ -593,17 +593,41 @@ test_cases:
minor: '0'
patch: '2'

- user_agent_string: 'Mozilla/5.0 (iPod touch; CPU iPhone OS 9_3_2 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13F69'
- user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 ManagedBrowser/20181024.1'
family: 'Mobile Safari UI/WKWebView'
major: '9'
minor: '3'
major:
minor:
patch:

- user_agent_string: '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'
family: 'Safari'
major: '12'
minor: '1'
patch: '2'

- user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148'
family: 'Mobile Safari UI/WKWebView'
major:
minor:
patch:

- user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 12_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 ManagedBrowser/20181024.1'
family: 'Mobile Safari UI/WKWebView'
major:
minor:
patch:

- user_agent_string: 'Mozilla/5.0 (iPod touch; CPU iPhone OS 9_3_2 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/13F69'
family: 'Mobile Safari UI/WKWebView'
major:
minor:
patch:

- user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 7_1_2 like Mac OS X) AppleWebKit/537.51.2 (KHTML, like Gecko) Mobile/11D257'
family: 'Mobile Safari UI/WKWebView'
major: '7'
minor: '1'
patch: '2'
major:
minor:
patch:

- user_agent_string: 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.3a1) Gecko/20100208 MozillaDeveloperPreview/3.7a1 (.NET CLR 3.5.30729)'
family: 'MozillaDeveloperPreview'
Expand Down Expand Up @@ -6826,9 +6850,9 @@ test_cases:

- user_agent_string: 'Mozilla/5.0 (iPad; U; CPU OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Mobile'
family: 'Mobile Safari UI/WKWebView'
major: '4'
minor: '3'
patch: '2'
major:
minor:
patch:

- user_agent_string: 'Mozilla/5.0 (iPad; U; CPU OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari'
family: 'Mobile Safari'
Expand Down Expand Up @@ -8073,7 +8097,7 @@ test_cases:
major: '9'
minor: '9'
patch:

- user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X) AppleWebKit/603.2.4 (KHTML, like Gecko) Mobile/14F89 Safari/603.2.4 EdgiOS/41.1.35.1'
family: 'Edge Mobile'
major: '41'
Expand Down