fixing security bugs (#70)

* fixing security bugs + adding a request from a team , changing travis target
yahoo · Mar 9, 2020 · d926183 · d926183
1 parent 8bb3a38
commit d926183
Show file tree

Hide file tree

Showing 4 changed files with 1,476 additions and 1,196 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 sudo: false
 language: node_js
 node_js:
-- 7
-- 6
+- 8
+- 9
+- 10
 addons:
   sauce_connect: true
 env:
@@ -16,4 +17,3 @@ deploy:
   on:
     repo: yahoo/protractor-retry
     branch: master
-
diff --git a/lib/retry.js b/lib/retry.js
@@ -77,17 +77,24 @@ function afterLaunch(configRetry) {
         protractorCommand.push('--disableChecks');
         /* the remaining command arg */
         var usedCommandKeys = ['$0', '_', 'test', 'specs', 'retry' , 'suite', 'help', 'version'];
-        Object.keys(argv).forEach(function(key) {
-            if (usedCommandKeys.indexOf(key) === -1) {
-                if(key === 'params') {
-                    Object.keys(argv[key]).forEach(function(param) {
-                        protractorCommand.push('--params.'+param, argv[key][param]);
-                    });
-                } else {
-                    protractorCommand.push('--'+key, argv[key]);
-                }
-            }
-        });
+
+        const keyify = (obj, prefix = '--') =>
+           Object.keys(obj).forEach(objectKey => {
+               if (usedCommandKeys.indexOf(objectKey) === -1) {
+                   if(Array.isArray(obj[objectKey]) ) {
+                       Object.keys(obj[objectKey]).forEach(value =>  {
+                           protractorCommand.push(prefix + objectKey, obj[objectKey][value]);
+                       });
+                   }
+                   else if (typeof obj[objectKey] === 'object' && obj[objectKey] !== null) {
+                       keyify(obj[objectKey], prefix + objectKey + '.');
+                   } else {
+                       protractorCommand.push(prefix + objectKey, obj[objectKey]);
+                   }
+               }
+           }, []);
+
+        keyify(argv);
 
         if (retryCount <= retry) {
             retryLogger(retryCount, fixedSpecList);