Merge eff7f15 into 59caadd

codemanki · Mar 10, 2019 · 406b5bc · 406b5bc
2 parents 59caadd + eff7f15
commit 406b5bc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -2,6 +2,23 @@ var vm = require('vm');
 var requestModule = require('request-promise');
 var errors = require('./errors');
 
+var USER_AGENTS = [
+  'Ubuntu Chromium/34.0.1847.116 Chrome/34.0.1847.116 Safari/537.36',
+  'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) konqueror/4.14.10 Safari/537.21',
+  'Mozilla/5.0 (iPad; CPU OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko ) Version/5.1 Mobile/9B176 Safari/7534.48.3',
+  'Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10',
+  'Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; SLCC2; Media Center PC 6.0; InfoPath.3; MS-RTC LM 8; Zune 4.7)',
+  'Mozilla/5.0 (Windows Phone 8.1; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 630) like Gecko',
+  'Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 920)',
+  'Mozilla/5.0 (Linux; U; Android 2.2; en-us; Sprint APA9292KT Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
+  'Mozilla/5.0 (X11; Linux x86_64; rv:2.2a1pre) Gecko/20100101 Firefox/4.2a1pre',
+  'Mozilla/5.0 (SymbianOS/9.1; U; en-us) AppleWebKit/413 (KHTML, like Gecko) Safari/413 es65',
+  'Mozilla/5.0 (Linux; Android 6.0; Nexus 5X Build/MDB08L) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.124 Mobile Safari/537.36',
+  'Mozilla/5.0 (X11; U; FreeBSD i386; de-CH; rv:1.9.2.8) Gecko/20100729 Firefox/3.6.8'
+];
+
+var DEFAULT_USER_AGENT = randomUA();
+
 var VM_OPTIONS = {
   timeout: 5000
 };
@@ -17,7 +34,7 @@ function defaults (params) {
     // Cookies should be enabled
     jar: requestModule.jar(),
     headers: {
-      'User-Agent': 'Ubuntu Chromium/34.0.1847.116 Chrome/34.0.1847.116 Safari/537.36',
+      'User-Agent': DEFAULT_USER_AGENT,
       'Cache-Control': 'private',
       'Accept': 'application/xml,application/xhtml+xml,text/html;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5'
     },
@@ -314,3 +331,7 @@ function processResponseBody (options, response, body) {
 
   callback(null, response, body);
 }
+
+function randomUA () {
+  return USER_AGENTS[Math.floor(Math.random() * USER_AGENTS.length)];
+}
diff --git a/test/helper.js b/test/helper.js
@@ -11,7 +11,7 @@ var defaultParams = {
   jar: request.jar(),
   uri: 'http://example-site.dev/path/',
   headers: {
-    'User-Agent': 'Ubuntu Chromium/34.0.1847.116 Chrome/34.0.1847.116 Safari/537.36',
+    'User-Agent': sinon.match.string,
     'Cache-Control': 'private',
     'Accept': 'application/xml,application/xhtml+xml,text/html;q=0.9, text/plain;q=0.8,image/png,*/*;q=0.5'
   },