FirefoxDriver.executeScript should not define enumerable properties on script

arguments or return values.

Fixes issue 8128

Author: jleyba

javascript/firefox-driver/js/firefoxDriver.js

@@ -257,21 +257,21 @@ function injectAndExecuteScript(respond, parameters, isAsync, timer) {
   };
 
   var runScript = function() {
-    // Since Firefox 15 we have to populate __exposedProps__
-    // when passing objects from chrome to content due to security reasons
-    if (bot.userAgent.isProductVersion(4)) {
-      for (var i = 0; i < converted.length; i++) {
-        if (goog.typeOf(converted[i]) === "object") {
-          var keys = Object.keys(converted[i]);
-          for (var key in keys) {
-            if (converted[i].__exposedProps__ == undefined) {
-              converted[i].__exposedProps__ = {};
-            }
-            converted[i].__exposedProps__[keys[key]] = "rw";
-          }
-        }
+    converted.forEach(function(value) {
+      if (goog.typeOf(value) === 'object') {
+        var props = {};
+        Object.keys(value).forEach(function(key) {
+          props[key] = 'rw';
+        });
+
+        Object.defineProperty(value, '__exposedProps__', {
+          enumerable: false,
+          configurable: false,
+          writable: false,
+          value: props
+        });
       }
-    }
+    });
 
     unwrappedDoc['__webdriver_evaluate']['args'] = converted;
     unwrappedDoc['__webdriver_evaluate']['async'] = isAsync;

javascript/firefox-driver/js/moz.js

@@ -109,7 +109,7 @@ fxdriver.moz.unwrap = function(thing) {
   }
 
   if (thing['wrappedJSObject']) {
-    thing.wrappedJSObject.__fxdriver_unwrapped = true;
+    fxdriver.moz.markUnwrapped_(thing.wrappedJSObject);
     return thing.wrappedJSObject;
   }
 
@@ -119,7 +119,7 @@ fxdriver.moz.unwrap = function(thing) {
     if (isWrapper) {
       var unwrapped = XPCNativeWrapper.unwrap(thing);
       var toReturn = !!unwrapped ? unwrapped : thing;
-      toReturn.__fxdriver_unwrapped = true;
+      fxdriver.moz.markUnwrapped_(toReturn);
       return toReturn;
     }
   } catch (e) {
@@ -130,6 +130,22 @@ fxdriver.moz.unwrap = function(thing) {
   return thing;
 };
 
+
+/**
+ * Defines a property on the given object to signal it has been unwrapped.
+ * @param {!Object} thing The object to mark.
+ * @private
+ */
+fxdriver.moz.markUnwrapped_ = function(thing) {
+  Object.defineProperty(thing, '__fxdriver_unwrapped', {
+    enumerable: false,
+    configurable: false,
+    writable: false,
+    value: true
+  });
+};
+
+
 /**
  * For Firefox 4, some objects (like the Window) are wrapped to make them safe
  * to access from privileged code but this hides fields we need, like the

javascript/node/selenium-webdriver/CHANGES.md

@@ -3,6 +3,10 @@
 * Promise rejections are now always coerced to Error-like objects (an object
     with a string `message` property). We do not guarantee `instanceof Error`
     since the rejection value may come from another context.
+* FIXED: 8128: When the FirefoxDriver marshals an object to the page for
+    `executeScript`, it defines additional properties (required by the driver's
+    implementation). These properties will no longer be enumerable and should
+    be omitted (i.e. they won't show up in JSON.stringify output).
 
 ## v2.44.0
 

javascript/node/selenium-webdriver/test/execute_script_test.js

@@ -235,6 +235,11 @@ test.suite(function(env) {
           assert(result[0].color).equalTo('red');
         });
       });
+
+      test.it('does not modify object literal parameters', function() {
+        var input = {color: 'red'};
+        execute('return arguments[0];', input).then(verifyJson(input));
+      });
     });
   });