Update version number to 0.7.24

Fix potential ReDoS vulnerability as reported by Doyensec
Merge pull request #479 from joeyparrish/develop
2025-11-17 07:31:51 +03:00 · 2021-02-12 10:01:25 +07:00 · 2021-02-12 09:53:26 +07:00 · 2021-02-10 15:41:56 +07:00 · 2021-02-09 12:42:27 -08:00 · 2021-02-09 12:24:17 -08:00
12 changed files with 95 additions and 21 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+arch:
+ - amd64
+ - ppc64le
 language: node_js
 node_js:
    - stable
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "ua-parser-js",
-  "version": "0.7.23",
+  "version": "0.7.24",
  "authors": [
    "Faisal Salman <f@faisalman.com>"
  ],
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
--- a/dist/ua-parser.pack.js
+++ b/dist/ua-parser.pack.js
--- a/license.md
+++ b/license.md
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2012-2019 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2021 Faisal Salman <<f@faisalman.com>>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
  name: 'faisalman:ua-parser-js',
-  version: '0.7.23',
+  version: '0.7.24',
  summary: 'Lightweight JavaScript-based user-agent string parser',
  git: 'https://github.com/faisalman/ua-parser-js.git',
  documentation: 'readme.md'
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "title": "UAParser.js",
  "name": "ua-parser-js",
-  "version": "0.7.23",
+  "version": "0.7.24",
  "author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
  "description": "Lightweight JavaScript-based user-agent string parser",
  "keywords": [
@@ -15,7 +15,7 @@
    "jquery-plugin",
    "ecosystem:jquery"
  ],
-  "homepage": "http://github.com/faisalman/ua-parser-js",
+  "homepage": "https://github.com/faisalman/ua-parser-js",
  "contributors": [
    "Aamir Poonawalla <aamir@urx.com>",
    "Admas <mollases@users.noreply.github.com>",
--- a/readme.md
+++ b/readme.md
@@ -81,7 +81,7 @@ AIX, Amiga OS, Android, Arch, Bada, BeOS, BlackBerry, CentOS, Chromium OS,
 Contiki, Fedora, Firefox OS, FreeBSD, Debian, DragonFly, Fuchsia, Gentoo, GNU,
 Haiku, Hurd, iOS, Joli, KaiOS, Linpus, Linux, Mac OS, Mageia, Mandriva, MeeGo,
 Minix, Mint, Morph OS, NetBSD, Nintendo, OpenBSD, OpenVMS, OS/2, Palm, PC-BSD,
-PCLinuxOS, Plan9, Playstation, QNX, RedHat, RIM Tablet OS, RISC OS, Sailfish,
+PCLinuxOS, Plan9, PlayStation, QNX, RedHat, RIM Tablet OS, RISC OS, Sailfish,
 Series40, Slackware, Solaris, SUSE, Symbian, Tizen, Ubuntu, Unix, VectorLinux,
 WebOS, Windows [Phone/Mobile], Zenwalk, ...

@@ -317,7 +317,7 @@ Do you use & like UAParser.js but you don’t find a way to show some love? If y

 MIT License

-Copyright (c) 2012-2019 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2012-2021 Faisal Salman <<f@faisalman.com>>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -1,9 +1,9 @@
 /*!
- * UAParser.js v0.7.23
+ * UAParser.js v0.7.24
 * Lightweight JavaScript-based User-Agent string parser
 * https://github.com/faisalman/ua-parser-js
 *
- * Copyright © 2012-2019 Faisal Salman <f@faisalman.com>
+ * Copyright © 2012-2021 Faisal Salman <f@faisalman.com>
 * Licensed under MIT License
 */

@@ -16,7 +16,7 @@
    /////////////


-    var LIBVERSION  = '0.7.23',
+    var LIBVERSION  = '0.7.24',
        EMPTY       = '',
        UNKNOWN     = '?',
        FUNC_TYPE   = 'function',
@@ -340,7 +340,10 @@
            /android.+version\/([\w\.]+)\s+(?:mobile\s?safari|safari)*/i        // Android Browser
            ], [VERSION, [NAME, 'Android Browser']], [

-            /(sailfishbrowser)\/([\w\.]+)/i                                     // Sailfish Browser
+            /(coc_coc_browser)\/([\w\.]+)/i                                     // Coc Coc Browser
+            ], [[NAME, 'Coc Coc'], VERSION], [
+
+              /(sailfishbrowser)\/([\w\.]+)/i                                     // Sailfish Browser
            ], [[NAME, 'Sailfish Browser'], VERSION], [

            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i
@@ -448,7 +451,7 @@
            ], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
            /(sd|kf)[0349hijorstuw]+(\sbuild\/|\)).+silk\//i                    // Fire Phone
            ], [[MODEL, mapper.str, maps.device.amazon.model], [VENDOR, 'Amazon'], [TYPE, MOBILE]], [
-            /android.+aft([bms])\sbuild/i                                       // Fire TV
+            /android.+aft([\w])(\sbuild\/|\))/i                                 // Fire TV
            ], [MODEL, [VENDOR, 'Amazon'], [TYPE, SMARTTV]], [

            /\((ip[honed|\s\w*]+);.+(apple)/i                                   // iPod/iPhone
@@ -530,7 +533,7 @@
            /\(dtv[\);].+(aquos)/i                                              // Sharp
            ], [MODEL, [VENDOR, 'Sharp'], [TYPE, SMARTTV]], [

-            /android.+((sch-i[89]0\d|shw-m380s|SM-P605|SM-P610|gt-p\d{4}|gt-n\d+|sgh-t8[56]9|nexus 10))/i,
+            /android.+((sch-i[89]0\d|shw-m380s|SM-P605|SM-P610|SM-P587|gt-p\d{4}|gt-n\d+|sgh-t8[56]9|nexus 10))/i,
            /((SM-T\w+))/i
            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [                  // Samsung
            /smart-tv.+(samsung)/i
@@ -617,7 +620,7 @@
            /android.+[;\/]\s*(Q[T|M][\d\w]+)\s+build/i                         // Verizon Tablet
            ], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [

-            /android.+[;\/]\s+(Barnes[&\s]+Noble\s+|BN[RT])(V?.*)\s+build/i     // Barnes & Noble Tablet
+            /android.+[;\/]\s+(Barnes[&\s]+Noble\s+|BN[RT])(\S(?:.*\S)?)\s+build/i     // Barnes & Noble Tablet
            ], [[VENDOR, 'Barnes & Noble'], MODEL, [TYPE, TABLET]], [

            /android.+[;\/]\s+(TM\d{3}.*\b)\s+build/i                           // Barnes & Noble Tablet
@@ -689,7 +692,10 @@
            ], [[TYPE, SMARTTV]], [

            /(android[\w\.\s\-]{0,9});.+build/i                                 // Generic Android Device
-            ], [MODEL, [VENDOR, 'Generic']]
+            ], [MODEL, [VENDOR, 'Generic']], [
+
+            /(phone)/i
+            ], [[TYPE, MOBILE]]
        ],

        engine : [[
@@ -713,6 +719,9 @@

        os : [[

+            // Xbox, consider this before other Windows-based devices
+            /(xbox);\s+xbox\s([^\);]+)/i,                                       // Microsoft Xbox (360, One, X, S, Series X, Series S)
+
            // Windows based
            /microsoft\s(windows)\s(vista|xp)/i                                 // Windows (iTunes)
            ], [NAME, VERSION], [
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -239,6 +239,16 @@
            "major"   : "16"
        }
    },
+    {
+        "desc"    : "Coc Coc Browser",
+        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) coc_coc_browser/78.0.129 Chrome/72.0.3626.129 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Coc Coc",
+            "version" : "78.0.129",
+            "major"   : "78"
+        }
+    },
    {
        "desc"    : "Dillo",
        "ua"      : "Dillo/2.2",
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -1219,6 +1219,15 @@
            "type": "smarttv"
        }
    },
+    {
+        "desc": "Amazon Fire TV",
+        "ua": "Mozilla/5.0 (Linux; Android 5.1.1; AFTT) AppleWebKit/537.36 (KHTML, like Gecko) Silk/86.3.20 like Chrome/86.0.4240.198 Safari/537.36",
+        "expect": {
+            "vendor": "Amazon",
+            "model": "T",
+            "type": "smarttv"
+        }
+    },
    {
        "desc": "Gigaset Tablet",
        "ua": "Mozilla/5.0 (Linux; Android 4.2.2; Gigaset QV830 Build/JDQ39) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36",
@@ -1326,5 +1335,12 @@
        "model": "LYA-TL00",
        "type": "mobile"
    }
+  },
+  {
+    "desc": "FaceBook Mobile App",
+    "ua": "[FBAN/FBIOS;FBAV/283.0.0.44.117;FBBV/238386386;FBDV/iPhone12,1;FBMD/iPhone;FBSN/iOS;FBSV/13.6.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBRV/240127608]",
+    "expect": {
+        "type": "mobile"
+    }
  }
 ]
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -287,6 +287,42 @@
            "version" : "4"
        }
    },
+    {
+        "desc"    : "Xbox 360",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox 360) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36",
+        "expect"  :
+        {
+            "name"    : "Xbox",
+            "version" : "360"
+        }
+    },
+    {
+        "desc"    : "Xbox One",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox One; WebView/3.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.19041",
+        "expect"  :
+        {
+            "name"    : "Xbox",
+            "version" : "One"
+        }
+    },
+    {
+        "desc"    : "Xbox X",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02",
+        "expect"  :
+        {
+            "name"    : "Xbox",
+            "version" : "X"
+        }
+    },
+    {
+        "desc"    : "Xbox Series X",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; Win64; x64; Xbox; Xbox Series X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36 Edge/20.02 ",
+        "expect"  :
+        {
+            "name"    : "Xbox",
+            "version" : "Series X"
+        }
+    },
    {
        "desc"    : "Mint",
        "ua"      : "",
Author	SHA1	Message	Date
Faisal Salman	9999815ac8	Update version number to 0.7.24	2021-02-12 10:01:25 +07:00
Faisal Salman	809439e20e	Fix potential ReDoS vulnerability as reported by Doyensec	2021-02-12 09:53:26 +07:00
Faisal Salman	5b83893476	Merge pull request #479 from joeyparrish/develop fix: Xbox OS detection	2021-02-10 15:41:56 +07:00
Joey Parrish	9d154cc41b	chore: Update build	2021-02-09 12:42:27 -08:00
Joey Parrish	7679003f87	fix: Xbox OS detection It is better to detect Xbox devices as having the OS "Xbox". Otherwise, they are detected as "Windows 10", making it difficult to see the difference between Legacy Edge on Windows and the Xbox browser. (Karma (https://github.com/karma-runner/karma) only shows the browser & OS on the status line.) With this change, Xbox 360, Xbox One, Xbox X/S, and Xbox Series X/S are all detected as OS "Xbox" with version "360", "One", etc.	2021-02-09 12:24:17 -08:00
Faisal Salman	45bf76a0fe	Merge pull request #474 from dust-off/master Fallback for Mobile	2021-01-08 14:41:15 +07:00
Dustin	f543c5ad72	facebook movile app with no browser info	2021-01-07 09:41:20 -08:00
Faisal Salman	89a72c27a7	Merge pull request #471 from jishidaaaaa/fix-firetv-detection Fix Detection Rule For Amazon Fire TV	2021-01-05 23:46:45 +07:00
Faisal Salman	314131d003	Merge pull request #472 from GeraldHost/master Update readme playstation typo	2021-01-05 23:44:08 +07:00
Gerald Host	386ebc29f1	feat: update readme playstation Update Playstation to PlayStation as "Playstation" is not a known user agent.	2021-01-05 12:59:41 +00:00
Junki-Ishida	b0f14de2a4	Fix Detection Rule For Amazon Fire TV	2021-01-05 21:19:07 +09:00
Faisal Salman	fd8a583020	Merge pull request #469 from bynice/patch-1 Update ua-parser.js	2021-01-02 11:02:15 +07:00
Faisal Salman	cc2da937c6	Merge pull request #368 from Deliaz/master Add Coc Coc browser detection	2020-12-17 20:07:49 +07:00
Yılmaz	34e2e800c5	Update ua-parser.js Samsung Tablet SM-P587 must be Tablet device type	2020-12-17 15:39:17 +03:00
Deliaz	26c74ef356	Merge branch 'develop' into master	2020-12-16 19:37:22 +02:00
Faisal Salman	e4b3029668	Merge pull request #466 from yoyo837/patch-1 Update homepage	2020-12-13 12:43:11 +07:00
Amumu	b7d4865afd	Update homepage	2020-12-13 10:59:01 +08:00
Faisal Salman	d5ab75a14e	Merge branch 'master' of github.com:faisalman/ua-parser-js	2020-12-10 10:47:08 +07:00
Faisal Salman	83d37b4887	Merge pull request #451 from dineshks1/master Adds travis jobs on ppc64le	2020-12-03 15:32:35 +07:00
dineshks1	da53c35f91	Adds travis jobs on ppc64le	2020-10-28 12:12:40 +00:00
Deliaz	cd3ba72b2f	Add Coc Coc browser detection	2019-03-18 13:17:44 +07:00