1
1
diff --git a/pkg/embedded/uap/regexes.yml b/pkg/embedded/uap/regexes.yml
2
- index 302e4b5..34ab79c 100644
2
+ index 26a64f1..826c764 100644
3
3
--- a/pkg/embedded/uap/regexes.yml
4
4
+++ b/pkg/embedded/uap/regexes.yml
5
5
@@ -1,3 +1,4 @@
@@ -10,7 +10,7 @@ index 302e4b5..34ab79c 100644
10
10
@@ -149,6 +150,7 @@ user_agent_parsers:
11
11
12
12
# Bots
13
- - regex: '(CSimpleSpider|Cityreview Robot|CrawlDaddy|CrawlFire|Finderbots|Index crawler|Job Roboter|KiwiStatus Spider|Lijit Crawler|QuerySeekerSpider|ScollSpider|Trends Crawler|USyd-NLP-Spider|SiteCat Webbot|BotName\/\$BotVersion|123metaspider-Bot|1470\.net crawler|50\.nu|8bo Crawler Bot|Aboundex|Accoona-[A-z]{1,30}-Agent|AdsBot-Google(?:-[a-z]{1,30}|)|altavista|AppEngine-Google|archive.{0,30}\.org_bot|archiver|Ask Jeeves|[Bb]ai[Dd]u[Ss]pider(?:-[A-Za-z]{1,30})(?:-[A-Za-z]{1,30}|)|bingbot|BingPreview|blitzbot|BlogBridge|Bloglovin|BoardReader Blog Indexer|BoardReader Favicon Fetcher|boitho.com-dc|BotSeer|BUbiNG|\b\w{0,30}favicon\w{0,30}\b|\bYeti(?:-[a-z]{1,30}|)|Catchpoint(?: bot|)|[Cc]harlotte|Checklinks|clumboot|Comodo HTTP\(S\) Crawler|Comodo-Webinspector-Crawler|ConveraCrawler|CRAWL-E|CrawlConvera|Daumoa(?:-feedfetcher|)|Feed Seeker Bot|Feedbin|findlinks|Flamingo_SearchEngine|FollowSite Bot|furlbot|Genieo|gigabot|GomezAgent|gonzo1|(?:[a-zA-Z]{1,30}-|)Googlebot(?:-[a-zA-Z]{1,30}|)|Google SketchUp|grub-client|gsa-crawler|heritrix|HiddenMarket|holmes|HooWWWer|htdig|ia_archiver|ICC-Crawler|Icarus6j|ichiro(?:/mobile|)|IconSurf|IlTrovatore(?:-Setaccio|)|InfuzApp|Innovazion Crawler|InternetArchive|IP2[a-z]{1,30}Bot|jbot\b|KaloogaBot|Kraken|Kurzor|larbin|LEIA|LesnikBot|Linguee Bot|LinkAider|LinkedInBot|Lite Bot|Llaut|lycos|Mail\.RU_Bot|masscan|masidani_bot|Mediapartners-Google|Microsoft .{0,30} Bot|mogimogi|mozDex|MJ12bot|msnbot(?:-media {0,2}|)|msrbot|Mtps Feed Aggregation System|netresearch|Netvibes|NewsGator[^/]{0,30}|^NING|Nutch[^/]{0,30}|Nymesis|ObjectsSearch|OgScrper|Orbiter|OOZBOT|PagePeeker|PagesInventory|PaxleFramework|Peeplo Screenshot Bot|PHPCrawl|PlantyNet_WebRobot|Pompos|Qwantify|Read%20Later|Reaper|RedCarpet|Retreiver|Riddler|Rival IQ|scooter|Scrapy|Scrubby|searchsight|seekbot|semanticdiscovery|SemrushBot|Simpy|SimplePie|SEOstats|SimpleRSS|SiteCon|Slackbot-LinkExpanding|Slack-ImgProxy|Slurp|snappy|Speedy Spider|Squrl Java|Stringer|TheUsefulbot|ThumbShotsBot|Thumbshots\.ru|Tiny Tiny RSS|Twitterbot|WhatsApp|URL2PNG|Vagabondo|VoilaBot|^vortex|Votay bot|^voyager|WASALive.Bot|Web-sniffer|WebThumb|WeSEE:[A-z]{1,30}|WhatWeb|WIRE|WordPress|Wotbox|www\.almaden\.ibm\.com|Xenu(?:.s|) Link Sleuth|Xerka [A-z]{1,30}Bot|yacy(?:bot|)|YahooSeeker|Yahoo! Slurp|Yandex\w{1,30}|YodaoBot(?:-[A-z]{1,30}|)|YottaaMonitor|Yowedo|^Zao|^Zao-Crawler|ZeBot_www\.ze\.bz|ZooShot|ZyBorg|ArcGIS Hub Indexer)(?:[ /]v?(\d+)(?:\.(\d+)(?:\.(\d+)|)|)|)'
13
+ - regex: '(CSimpleSpider|Cityreview Robot|CrawlDaddy|CrawlFire|Finderbots|Index crawler|Job Roboter|KiwiStatus Spider|Lijit Crawler|QuerySeekerSpider|ScollSpider|Trends Crawler|USyd-NLP-Spider|SiteCat Webbot|BotName\/\$BotVersion|123metaspider-Bot|1470\.net crawler|50\.nu|8bo Crawler Bot|Aboundex|Accoona-[A-z]{1,30}-Agent|AdsBot-Google(?:-[a-z]{1,30}|)|altavista|AppEngine-Google|archive.{0,30}\.org_bot|archiver|Ask Jeeves|[Bb]ai[Dd]u[Ss]pider(?:-[A-Za-z]{1,30})(?:-[A-Za-z]{1,30}|)|bingbot|BingPreview|blitzbot|BlogBridge|Bloglovin|BoardReader Blog Indexer|BoardReader Favicon Fetcher|boitho.com-dc|BotSeer|BUbiNG|\b\w{0,30}favicon\w{0,30}\b|\bYeti(?:-[a-z]{1,30}|)|Catchpoint(?: bot|)|[Cc]harlotte|Checklinks|clumboot|Comodo HTTP\(S\) Crawler|Comodo-Webinspector-Crawler|ConveraCrawler|CRAWL-E|CrawlConvera|Daumoa(?:-feedfetcher|)|Feed Seeker Bot|Feedbin|findlinks|Flamingo_SearchEngine|FollowSite Bot|furlbot|Genieo|gigabot|GomezAgent|gonzo1|(?:[a-zA-Z]{1,30}-|)Googlebot(?:-[a-zA-Z]{1,30}|)|GoogleOther|Google SketchUp|grub-client|gsa-crawler|heritrix|HiddenMarket|holmes|HooWWWer|htdig|ia_archiver|ICC-Crawler|Icarus6j|ichiro(?:/mobile|)|IconSurf|IlTrovatore(?:-Setaccio|)|InfuzApp|Innovazion Crawler|InternetArchive|IP2[a-z]{1,30}Bot|jbot\b|KaloogaBot|Kraken|Kurzor|larbin|LEIA|LesnikBot|Linguee Bot|LinkAider|LinkedInBot|Lite Bot|Llaut|lycos|Mail\.RU_Bot|masscan|masidani_bot|Mediapartners-Google|Microsoft .{0,30} Bot|mogimogi|mozDex|MJ12bot|msnbot(?:-media {0,2}|)|msrbot|Mtps Feed Aggregation System|netresearch|Netvibes|NewsGator[^/]{0,30}|^NING|Nutch[^/]{0,30}|Nymesis|ObjectsSearch|OgScrper|Orbiter|OOZBOT|PagePeeker|PagesInventory|PaxleFramework|Peeplo Screenshot Bot|PHPCrawl|PlantyNet_WebRobot|Pompos|Qwantify|Read%20Later|Reaper|RedCarpet|Retreiver|Riddler|Rival IQ|scooter|Scrapy|Scrubby|searchsight|seekbot|semanticdiscovery|SemrushBot|Simpy|SimplePie|SEOstats|SimpleRSS|SiteCon|Slackbot-LinkExpanding|Slack-ImgProxy|Slurp|snappy|Speedy Spider|Squrl Java|Stringer|TheUsefulbot|ThumbShotsBot|Thumbshots\.ru|Tiny Tiny RSS|Twitterbot|WhatsApp|URL2PNG|Vagabondo|VoilaBot|^vortex|Votay bot|^voyager|WASALive.Bot|Web-sniffer|WebThumb|WeSEE:[A-z]{1,30}|WhatWeb|WIRE|WordPress|Wotbox|www\.almaden\.ibm\.com|Xenu(?:.s|) Link Sleuth|Xerka [A-z]{1,30}Bot|yacy(?:bot|)|YahooSeeker|Yahoo! Slurp|Yandex\w{1,30}|YodaoBot(?:-[A-z]{1,30}|)|YottaaMonitor|Yowedo|^Zao|^Zao-Crawler|ZeBot_www\.ze\.bz|ZooShot|ZyBorg|ArcGIS Hub Indexer|GPTBot)(?:[ /]v?(\d+)(?:\.(\d+)(?:\.(\d+)|)|)|)'
14
14
+ family_replacement: 'bot'
15
15
16
16
# AWS S3 Clients
@@ -29,7 +29,7 @@ index 302e4b5..34ab79c 100644
29
29
30
30
# HbbTV standard defines what features the browser should understand.
31
31
# but it's like targeting "HTML5 browsers", effective browser support depends on the model
32
- @@ -247 ,30 +252 ,30 @@ user_agent_parsers:
32
+ @@ -250 ,30 +255 ,30 @@ user_agent_parsers:
33
33
34
34
# Firefox
35
35
- regex: '(Fennec)/(\d+)\.(\d+)\.?([ab]?\d+[a-z]*)'
@@ -71,7 +71,7 @@ index 302e4b5..34ab79c 100644
71
71
72
72
# e.g.: Flock/2.0b2
73
73
- regex: '(Flock)/(\d+)\.(\d+)(b\d+?)'
74
- @@ -301 ,18 +306 ,18 @@ user_agent_parsers:
74
+ @@ -304 ,18 +309 ,18 @@ user_agent_parsers:
75
75
- regex: '(Opera Tablet).{0,200}Version/(\d+)\.(\d+)(?:\.(\d+)|)'
76
76
- regex: '(Opera Mini)(?:/att|)/?(\d+|)(?:\.(\d+)|)(?:\.(\d+)|)'
77
77
- regex: '(Opera)/.{1,100}Opera Mobi.{1,100}Version/(\d+)\.(\d+)'
@@ -95,7 +95,7 @@ index 302e4b5..34ab79c 100644
95
95
96
96
# Opera >=15 for Desktop is similar to Chrome but includes an "OPR" Version string.
97
97
- regex: '(?:Chrome).{1,300}(OPR)/(\d+)\.(\d+)\.(\d+)'
98
- @@ -320 ,15 +325 ,15 @@ user_agent_parsers:
98
+ @@ -323 ,15 +328 ,15 @@ user_agent_parsers:
99
99
100
100
# Opera Coast
101
101
- regex: '(Coast)/(\d+).(\d+).(\d+)'
@@ -114,7 +114,7 @@ index 302e4b5..34ab79c 100644
114
114
115
115
# Palm WebOS looks a lot like Safari.
116
116
- regex: '(hpw|web)OS/(\d+)\.(\d+)(?:\.(\d+)|)'
117
- @@ -420 ,9 +425 ,9 @@ user_agent_parsers:
117
+ @@ -423 ,9 +428 ,9 @@ user_agent_parsers:
118
118
119
119
# Edge Mobile
120
120
- regex: 'Windows Phone .{0,200}(Edge)/(\d+)\.(\d+)'
@@ -125,8 +125,17 @@ index 302e4b5..34ab79c 100644
125
125
+ family_replacement: 'Edge'
126
126
127
127
# Oculus Browser, should go before Samsung Internet
128
- - regex: '(OculusBrowser)/(\d+)\.(\d+).0.0(?:\.([0-9\-]+)|)'
129
- @@ -472,7 +477,7 @@ user_agent_parsers:
128
+ - regex: '(OculusBrowser)/(\d+)\.(\d+)(?:\.([0-9\-]+)|)'
129
+ @@ -447,7 +452,7 @@ user_agent_parsers:
130
+ - regex: '(baidubrowser)[/\s](\d+)(?:\.(\d+)|)(?:\.(\d+)|)'
131
+ family_replacement: 'Baidu Browser'
132
+ - regex: '(FlyFlow)/(\d+)\.(\d+)'
133
+ - family_replacement: 'Baidu Explorer'
134
+ + family_replacement: 'Baidu Browser'
135
+
136
+ # MxBrowser is Maxthon. Must go before Mobile Chrome for Android
137
+ - regex: '(MxBrowser)/(\d+)\.(\d+)(?:\.(\d+)|)'
138
+ @@ -475,7 +480,7 @@ user_agent_parsers:
130
139
131
140
# Google Search App on Android, eg:
132
141
- regex: 'Mozilla.{1,200}Android.{1,200}(GSA)/(\d+)\.(\d+)\.(\d+)'
@@ -135,7 +144,7 @@ index 302e4b5..34ab79c 100644
135
144
136
145
# QQ Browsers
137
146
- regex: '(MQQBrowser/Mini)(?:(\d+)(?:\.(\d+)|)(?:\.(\d+)|)|)'
138
- @@ -484 ,11 +489 ,11 @@ user_agent_parsers:
147
+ @@ -487 ,11 +492 ,11 @@ user_agent_parsers:
139
148
140
149
# DuckDuckGo
141
150
- regex: 'Mozilla.{1,200}Mobile.{1,100}(DuckDuckGo)/(\d+)'
@@ -149,7 +158,7 @@ index 302e4b5..34ab79c 100644
149
158
- regex: 'Mozilla.{1,200}(Ddg)/(\d+)(?:\.(\d+)|)'
150
159
family_replacement: 'DuckDuckGo'
151
160
152
- @@ -498 ,9 +503 ,9 @@ user_agent_parsers:
161
+ @@ -501 ,9 +506 ,9 @@ user_agent_parsers:
153
162
154
163
# Ecosia on iOS / Android
155
164
- regex: '(Ecosia) ios@(\d+)(?:\.(\d+)|)(?:\.(\d+)|)(?:\.(\d+)|)'
@@ -161,7 +170,7 @@ index 302e4b5..34ab79c 100644
161
170
162
171
# VivoBrowser
163
172
- regex: '(VivoBrowser)\/(\d+)\.(\d+)\.(\d+)\.(\d+)'
164
- @@ -510 ,17 +515 ,17 @@ user_agent_parsers:
173
+ @@ -513 ,17 +518 ,17 @@ user_agent_parsers:
165
174
166
175
# Chrome Mobile
167
176
- regex: 'Version/.{1,300}(Chrome)/(\d+)\.(\d+)\.(\d+)\.(\d+)'
@@ -185,15 +194,15 @@ index 302e4b5..34ab79c 100644
185
194
186
195
# Chrome Frame must come before MSIE.
187
196
- regex: '(chromeframe)/(\d+)\.(\d+)\.(\d+)'
188
- @@ -684 ,6 +689 ,7 @@ user_agent_parsers:
197
+ @@ -766 ,6 +771 ,7 @@ user_agent_parsers:
189
198
190
199
# Chrome/Chromium/major_version.minor_version
191
200
- regex: '(Chromium|Chrome)/(\d+)\.(\d+)(?:\.(\d+)|)(?:\.(\d+)|)'
192
201
+ family_replacement: 'Chrome'
193
202
194
203
##########
195
204
# IE Mobile needs to happen before Android to catch cases such as:
196
- @@ -695 ,7 +701 ,7 @@ user_agent_parsers:
205
+ @@ -777 ,7 +783 ,7 @@ user_agent_parsers:
197
206
198
207
# IE Mobile
199
208
- regex: '(IEMobile)[ /](\d+)\.(\d+)'
@@ -202,7 +211,7 @@ index 302e4b5..34ab79c 100644
202
211
203
212
# Baca Berita App News Reader
204
213
- regex: '(BacaBerita App)\/(\d+)\.(\d+)\.(\d+)'
205
- @@ -845 ,15 +851 ,15 @@ user_agent_parsers:
214
+ @@ -927 ,15 +933 ,15 @@ user_agent_parsers:
206
215
- regex: '(iPod|iPhone|iPad).{1,200}GSA/(\d+)\.(\d+)\.(\d+)(?:\.(\d+)|) Mobile'
207
216
family_replacement: 'Google'
208
217
- regex: '(iPod|iPhone|iPad).{1,200}Version/(\d+)\.(\d+)(?:\.(\d+)|).{1,200}[ +]Safari'
@@ -223,7 +232,7 @@ index 302e4b5..34ab79c 100644
223
232
- regex: '(Watch)(\d+),(\d+)'
224
233
family_replacement: 'Apple $1 App'
225
234
226
- @@ -928 ,7 +934 ,7 @@ user_agent_parsers:
235
+ @@ -1010 ,7 +1016 ,7 @@ user_agent_parsers:
227
236
228
237
# WebKit Nightly
229
238
- regex: '(AppleWebKit)/(\d+)(?:\.(\d+)|)\+ .{0,200} Safari'
@@ -232,7 +241,7 @@ index 302e4b5..34ab79c 100644
232
241
233
242
# Safari
234
243
- regex: '(Version)/(\d+)\.(\d+)(?:\.(\d+)|).{0,100}Safari/'
235
- @@ -1173 ,7 +1179 ,7 @@ os_parsers:
244
+ @@ -1255 ,7 +1261 ,7 @@ os_parsers:
236
245
# Ex: Mozilla/5.0 (Fuchsia) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 CrKey/1.56.500000
237
246
# These are some intermediate "Nest Hub" Chromecast devices running Fuchsia.
238
247
- regex: 'Fuchsia.*(CrKey)(?:[/](\d+)\.(\d+)(?:\.(\d+)|)|)'
@@ -241,7 +250,7 @@ index 302e4b5..34ab79c 100644
241
250
242
251
# Ex: Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.225 Safari/537.36 CrKey/1.56.500000 DeviceType/SmartSpeaker
243
252
- regex: 'Linux.*(CrKey)(?:[/](\d+)\.(\d+)(?:\.(\d+)|)|).*DeviceType/SmartSpeaker'
244
- @@ -1182 ,7 +1188 ,7 @@ os_parsers:
253
+ @@ -1264 ,7 +1270 ,7 @@ os_parsers:
245
254
# Ex: Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.225 Safari/537.36 CrKey/1.56.500000 DeviceType/Chromecast
246
255
# These are the oldest Chromecast devices that ran Linux.
247
256
- regex: 'Linux.*(CrKey)(?:[/](\d+)\.(\d+)(?:\.(\d+)|)|)'
@@ -250,7 +259,7 @@ index 302e4b5..34ab79c 100644
250
259
251
260
##########
252
261
# Android
253
- @@ -1357 ,35 +1363 ,35 @@ os_parsers:
262
+ @@ -1439 ,35 +1445 ,35 @@ os_parsers:
254
263
# @ref: http://www.puredarwin.org/curious/versions
255
264
##########
256
265
- regex: '((?:Mac[ +]?|; )OS[ +]X)[\s+/](?:(\d+)[_.](\d+)(?:[_.](\d+)|)|Mach-O)'
@@ -293,7 +302,7 @@ index 302e4b5..34ab79c 100644
293
302
os_v1_replacement: '10'
294
303
os_v2_replacement: '9'
295
304
# Yosemite is Darwin/14.x but patch versions are inconsistent in the Darwin string;
296
- @@ -1393 ,7 +1399 ,7 @@ os_parsers:
305
+ @@ -1475 ,7 +1481 ,7 @@ os_parsers:
297
306
298
307
# IE on Mac doesn't specify version number
299
308
- regex: 'Mac_PowerPC'
@@ -302,7 +311,7 @@ index 302e4b5..34ab79c 100644
302
311
303
312
# builds before tiger don't seem to specify version?
304
313
305
- @@ -1402 ,14 +1408 ,14 @@ os_parsers:
314
+ @@ -1484 ,14 +1490 ,14 @@ os_parsers:
306
315
307
316
# Box Drive and Box Sync on Mac OS X use OSX version numbers, not Darwin
308
317
- regex: '^Box.{0,200};(Darwin)/(10)\.(1\d)(?:\.(\d+)|)'
@@ -319,7 +328,7 @@ index 302e4b5..34ab79c 100644
319
328
320
329
##########
321
330
# iOS
322
- @@ -1463 ,11 +1469 ,11 @@ os_parsers:
331
+ @@ -1545 ,11 +1551 ,11 @@ os_parsers:
323
332
os_replacement: 'iOS'
324
333
os_v1_replacement: '8'
325
334
- regex: '(CF)(Network)/(720)\.(\d)'
@@ -333,7 +342,7 @@ index 302e4b5..34ab79c 100644
333
342
os_v1_replacement: '10'
334
343
os_v2_replacement: '11'
335
344
- regex: 'CFNetwork/7.{0,100} Darwin/15\.4\.\d+'
336
- @@ -1502 ,15 +1508 ,15 @@ os_parsers:
345
+ @@ -1584 ,15 +1590 ,15 @@ os_parsers:
337
346
# @ref: https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
338
347
##########
339
348
- regex: 'CFNetwork/.{0,100} Darwin/17\.\d+.{0,100}\(x86_64\)'
@@ -352,7 +361,7 @@ index 302e4b5..34ab79c 100644
352
361
os_v1_replacement: '10'
353
362
os_v2_replacement: '11'
354
363
##########
355
- @@ -1881 ,7 +1887 ,8 @@ os_parsers:
364
+ @@ -1963 ,7 +1969 ,8 @@ os_parsers:
356
365
# Generic patterns
357
366
# since the majority of os cases are very specific, these go last
358
367
##########
@@ -362,7 +371,7 @@ index 302e4b5..34ab79c 100644
362
371
363
372
# Gentoo Linux + Kernel Version
364
373
- regex: '(Linux)[ /](\d+)\.(\d+)(?:\.(\d+)|).{0,100}gentoo'
365
- @@ -1892 ,7 +1899 ,9 @@ os_parsers:
374
+ @@ -1974 ,7 +1981 ,9 @@ os_parsers:
366
375
367
376
# just os
368
377
- regex: '(Windows|Android|WeTab|Maemo|Web0S)'
@@ -373,7 +382,7 @@ index 302e4b5..34ab79c 100644
373
382
# Linux + Kernel Version
374
383
- regex: '(Linux)(?:[ /](\d+)\.(\d+)(?:\.(\d+)|)|)'
375
384
- regex: 'SunOS'
376
- @@ -1901 ,7 +1910 ,7 @@ os_parsers:
385
+ @@ -1983 ,7 +1992 ,7 @@ os_parsers:
377
386
- regex: '\(linux-gnu\)'
378
387
os_replacement: 'Linux'
379
388
- regex: '\(x86_64-redhat-linux-gnu\)'
@@ -382,7 +391,7 @@ index 302e4b5..34ab79c 100644
382
391
- regex: '\((freebsd)(\d+)\.(\d+)\)'
383
392
os_replacement: 'FreeBSD'
384
393
- regex: 'linux'
385
- @@ -1917 ,7 +1926 ,7 @@ os_parsers:
394
+ @@ -1999 ,7 +2008 ,7 @@ os_parsers:
386
395
# APN/1.0 HashiCorp/1.0 Terraform/1.8.1 (+https://www.terraform.io) terraform-provider-aws/4.67.0 (+https://registry.terraform.io/providers/hashicorp/aws) aws-sdk-go-v2/1.18.0 os/macos lang/go/1.19.8 md/GOOS/darwin md/GOARCH/arm64 api/identitystore/1.16.11
387
396
##########
388
397
- regex: 'os\/macos[#]?(\d*)[.]?(\d*)[.]?(\d*)'
0 commit comments