Prevent altering the result when supplied user-agent is different fro…

…m current user-agent
faisalman · Mar 29, 2023 · b098789 · b098789
1 parent 30de983
commit b098789
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/dist/ua-parser.min.js b/dist/ua-parser.min.js
diff --git a/dist/ua-parser.pack.js b/dist/ua-parser.pack.js
diff --git a/readme.md b/readme.md
@@ -477,7 +477,7 @@ http.createServer(function (req, res) {
     res.setHeader('Accept-CH', getHighEntropyValues);
     res.setHeader('Critical-CH', getHighEntropyValues);
     
-    var ua = uap(req.headers);
+    var ua = uap(req.headers).withClientHints();
 
     // END since@2.0 */
 

diff --git a/src/ua-parser.js b/src/ua-parser.js
@@ -932,26 +932,27 @@
             ['data', createUAParserData(itemType, ua, rgxMap, uaCH)]
         ]);
         this.parse();
+        var isSelfNav = NAVIGATOR && NAVIGATOR.userAgent == ua;
         switch(this.itemType) {
             case UA_BROWSER:
                 // Brave-specific detection
-                if (NAVIGATOR && NAVIGATOR.userAgent == ua && NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
+                if (isSelfNav && NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
                     this.set(NAME, 'Brave');
                 }
                 this.set(MAJOR, majorize(this.get(VERSION)));
                 break;
             case UA_DEVICE:
-                if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
+                if (isSelfNav && !this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
                     this.set(TYPE, MOBILE);
                 }
                 // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
-                if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
+                if (isSelfNav && this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
                     this.set(MODEL, 'iPad')
                         .set(TYPE, TABLET);
                 }
                 break;
             case UA_OS:
-                if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM] && NAVIGATOR_UADATA[PLATFORM] != 'Unknown') {
+                if (isSelfNav && !this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
                     this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
                 }
                 break;

diff --git a/src/ua-parser.mjs b/src/ua-parser.mjs
@@ -936,26 +936,27 @@ const window = undefined;
             ['data', createUAParserData(itemType, ua, rgxMap, uaCH)]
         ]);
         this.parse();
+        var isSelfNav = NAVIGATOR && NAVIGATOR.userAgent == ua;
         switch(this.itemType) {
             case UA_BROWSER:
                 // Brave-specific detection
-                if (NAVIGATOR && NAVIGATOR.userAgent == ua && NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
+                if (isSelfNav && NAVIGATOR.brave && typeof NAVIGATOR.brave.isBrave == FUNC_TYPE) {
                     this.set(NAME, 'Brave');
                 }
                 this.set(MAJOR, majorize(this.get(VERSION)));
                 break;
             case UA_DEVICE:
-                if (!this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
+                if (isSelfNav && !this.get(TYPE) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[MOBILE]) {
                     this.set(TYPE, MOBILE);
                 }
                 // iPadOS-specific detection: identified as Mac, but has some iOS-only properties
-                if (this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
+                if (isSelfNav && this.get(MODEL) == 'Macintosh' && NAVIGATOR && typeof NAVIGATOR.standalone !== UNDEF_TYPE && NAVIGATOR.maxTouchPoints && NAVIGATOR.maxTouchPoints > 2) {
                     this.set(MODEL, 'iPad')
                         .set(TYPE, TABLET);
                 }
                 break;
             case UA_OS:
-                if (!this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM] && NAVIGATOR_UADATA[PLATFORM] != 'Unknown') {
+                if (isSelfNav && !this.get(NAME) && NAVIGATOR_UADATA && NAVIGATOR_UADATA[PLATFORM]) {
                     this.set(NAME, NAVIGATOR_UADATA[PLATFORM]);
                 }
                 break;