Import fixtures from upstream

.gitignore

@@ -29,3 +29,7 @@ hs_err_pid*
 
 # Maven target directory
 /target/
+
+# Development and release scripts and instructions
+import-regexes.sh
+release-process.md

src/main/resources/regexes/bots.yml

@@ -100,6 +100,14 @@
     name: 'Sarosys LLC'
     url: 'http://www.sarosys.com/'
 
+- regex: 'AspiegelBot'
+  name: 'AspiegelBot'
+  category: 'Crawler'
+  url: 'https://aspiegel.com/'
+  producer:
+    name: 'Huawei'
+    url: 'https://www.huawei.com/'
+
 - regex: 'Castro 2, Episode Duration Lookup'
   name: 'Castro 2'
   category: 'Service Agent'
@@ -641,7 +649,7 @@
     name: 'Visual Meta'
     url: 'https://www.shopalike.cz/'
 
-- regex: 'Googlebot(-Mobile|-Image|-Video|-News)?|Feedfetcher-Google|Google Web Preview|AdsBot-Google(-Mobile)?|APIs-Google|Mediapartners-Google|Google.*/\+/web/snippet|GoogleProducer|Google[ -]Publisher[ -]Plugin|Google-(AMPHTML|Test|Site-Verification|Shopping-Quality|Adwords-DisplayAds|Assess|AdWords-Express|Adwords-Instant|speakr|Read-Aloud|Youtube-Links|HotelAdsVerifier)?'
+- regex: 'AdsBot-Google(-Mobile)?|Adwords-(DisplayAds|Express|Instant)|Google Web Preview|Google[ -]Publisher[ -]Plugin|Google-(Adwords|AMPHTML|Assess|HotelAdsVerifier|Read-Aloud|Shopping-Quality|Site-Verification|speakr|Test|Youtube-Links)|(APIs|DuplexWeb|Feedfetcher|Mediapartners)-Google|Googlebot(-Mobile|-Image|-Video|-News)?|GoogleProducer|Google.*/\+/web/snippet'
   name: 'Googlebot'
   category: 'Search bot'
   url: 'http://www.google.com/bot.html'
@@ -1577,6 +1585,14 @@
     name: 'Wotbox'
     url: 'http://www.wotbox.com'
 
+- regex: 'XenForo'
+  name: 'XenForo'
+  category: 'Service Agent'
+  url: 'https://xenforo.com/'
+  producer:
+    name: 'XenForo Ltd.'
+    url: 'https://xenforo.com/'
+
 - regex: 'yacybot'
   name: 'YaCy'
   category: 'Search bot'
@@ -2016,6 +2032,14 @@
     name: 'Startpagina B.V.'
     url: 'https://www.startpagina.nl/'
 
+- regex: 'GTmetrix'
+  name: 'GTmetrix'
+  category: 'Crawler'
+  url: 'https://gtmetrix.com/'
+  producer:
+    name: 'Carbon60 Operating Co. Ltd.'
+    url: 'https://www.carbon60.com/'
+
 # Generic detections
 
 - regex: 'Nutch'

src/main/resources/regexes/client/browser_engine.yml

@@ -34,3 +34,6 @@
 
 - regex: 'Servo'
   name: 'Servo'
+
+- regex: 'Goanna'
+  name: 'Goanna'

src/main/resources/regexes/client/browser_family.yml

@@ -69,6 +69,13 @@ Chrome:
   - Vivaldi
   - Web Explorer
   - Whale Browser
+  - Atom
+  - 115 Browser
+  - Steam In-Game Overlay
+  - Elements Browser
+  - AOL Desktop
+  - VMware AirWatch
+  - Origin In-Game Overlay
 
 Firefox:
   - Basilisk
@@ -94,6 +101,10 @@ Firefox:
   - t-online.de Browser
   - TenFourFox
   - Waterfox
+  - Mypal
+  - Arctic Fox
+  - Centaury
+  - Light
 
 Internet Explorer:
   - Internet Explorer

src/main/resources/regexes/client/browsers.yml

@@ -5,6 +5,42 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+
+# VMware AirWatch (https://www.air-watch.com/)
+- regex: 'AirWatch Browser v(?:(\d+[\.\d]+))?'
+  name: 'VMware AirWatch'
+  version: '$1'
+
+# AOL Desktop (https://beta.aol.com/projects/desktop/windows)
+- regex: 'ADG/(?:(\d+[\.\d]+))?'
+  name: 'AOL Desktop'
+  version: '$1'
+
+# Elements Browser (https://elementsbrowser.com/)
+- regex: 'Elements Browser/(?:(\d+[\.\d]+))?'
+  name: 'Elements Browser'
+  version: '$1'
+
+# Light (https://sourceforge.net/projects/lightfirefox/)
+- regex: 'Light/(\d+[\.\d]+)'
+  name: 'Light'
+  version: '$1'
+
+# Steam (https://www.valvesoftware.com/)
+- regex: 'Valve Steam GameOverlay/(?:(\d+[\.\d]+))?'
+  name: 'Steam In-Game Overlay'
+  version: '$1'
+
+# 115 Browser (https://pc.115.com/)
+- regex: '115Browser/(?:(\d+[\.\d]+))?'
+  name: '115 Browser'
+  version: '$1'
+
+# Atom (https://browser.ru/)
+- regex: 'Atom/(?:(\d+[\.\d]+))?'
+  name: 'Atom'
+  version: '$1'
+
 # Firefox Reality (https://mixedreality.mozilla.org/firefox-reality/)
 - regex: 'Mobile VR.+Firefox'
   name: 'Firefox Reality'
@@ -146,7 +182,7 @@
   name: 'Basilisk'
   version: '$1'
   engine:
-    default: 'Gecko'
+    default: 'Goanna'
 
 # Sputnik Browser (https://play.google.com/store/apps/details?id=ru.sputnik.browser)
 - regex: 'SputnikBrowser(?:/(\d+[\.\d]+))?'
@@ -309,8 +345,8 @@
   name: 'Aloha Browser'
   version: '$1'
 
-#Avast Secure Browser
-- regex: 'Avast(?:/(\d+[\.\d]+))?'
+# Avast Secure Browser | Avast SafeZone Browser (https://www.avast.com/)
+- regex: '(?:Avast|ASW)(?:/(\d+[\.\d]+))?'
   name: 'Avast Secure Browser'
   version: '$1'
 
@@ -405,6 +441,11 @@
 
 
 #Pale Moon
+- regex: '.*Goanna.*PaleMoon(?:/(\d+[\.\d]+))?'
+  name: 'Pale Moon'
+  version: '$1'
+  engine:
+    default: 'Goanna'
 - regex: 'PaleMoon(?:/(\d+[\.\d]+))?'
   name: 'Pale Moon'
   version: '$1'
@@ -453,6 +494,11 @@
   engine:
     default: 'Gecko'
 
+# Origin (https://www.origin.com/)
+- regex: 'Origin/(?:(\d+[\.\d]+))?'
+  name: 'Origin In-Game Overlay'
+  version: '$1'
+
 #Cunaguaro
 - regex: 'Cunaguaro(?:/(\d+[\.\d]+))?'
   name: 'Cunaguaro'
@@ -470,6 +516,27 @@
   engine:
     default: '' # multi engine
 
+# ArcticFox (https://github.com/wicknix/Arctic-Fox)
+- regex: 'ArcticFox(?:/(\d+[\.\d]+))?'
+  name: 'Arctic Fox'
+  version: '$1'
+  engine:
+    default: 'Goanna'
+
+# Mypal (https://github.com/Feodor2/Mypal)
+- regex: 'Mypal(?:/(\d+[\.\d]+))?'
+  name: 'Mypal'
+  version: '$1'
+  engine:
+    default: 'Goanna'
+
+# Centaury (https://github.com/Feodor2/Centaury)
+- regex: 'Centaury(?:/(\d+[\.\d]+))?'
+  name: 'Centaury'
+  version: '$1'
+  engine:
+    default: 'Goanna'
+
 #Firefox Focus / Firefox Klar
 - regex: '(?:Focus|Klar)(?:/(\d+[\.\d]+))?'
   name: 'Firefox Focus'
@@ -1539,6 +1606,13 @@
   name: 'Qutebrowser'
   version: '$1'
 
+# surf (https://surf.suckless.org/)
+- regex: 'Surf(?:/(\d+[\.\d]+))?'
+  name: 'surf'
+  version: '$1'
+  engine:
+    default: 'WebKit'
+
 #Safari
 - regex: '(?:(?:iPod|iPad|iPhone).+Version|MobileSafari)/(\d+[\.\d]+)'
   name: 'Mobile Safari'
@@ -1581,4 +1655,4 @@
 # SimpleBrowser (https://github.com/SimpleBrowserDotNet/SimpleBrowser)
 - regex: 'SimpleBrowser'
   name: 'SimpleBrowser'
-  version: ''
+  version: ''

src/main/resources/regexes/client/mobile_apps.yml

@@ -214,3 +214,15 @@
   regex: 'Crosswalk(?!.*Streamy)/([\d\.]+)?'
   name: 'CrosswalkApp'
   version: '$1'
+-
+  regex: 'Twitter for iPhone[/]?([\d\.]+)?'
+  name: 'Twitter'
+  version: '$1'
+-
+  regex: 'TopBuzz/([\d\.]+)'
+  name: 'TopBuzz'
+  version: '$1'
+-
+  regex: 'Snapchat/([\d\.]+)'
+  name: 'Snapchat'
+  version: '$1'

src/main/resources/regexes/device/consoles.yml

@@ -35,6 +35,6 @@ Sega:
   model: 'Dreamcast'
 
 Sony:
-  regex: 'PlayStation (3|4|Portable|Vita)'
+  regex: 'PlayStation (3|4 Pro|4|Portable|Vita)'
   device: 'console'
   model: 'PlayStation $1'