Hide password values from raw HTTP logs.

lib/http/request.js

@@ -10,6 +10,7 @@ const Auth = require('./auth.js');
 const Formatter = require('./formatter.js');
 const HttpResponse = require('./response.js');
 const Utils = require('./../utils');
+const {Key} = require('selenium-webdriver');
 const {Logger, isString} = Utils;
 const {DEFAULT_RUNNER_EVENTS: {LogCreated}, NightwatchEventHub} = require('../runner/eventHub.js');
 
@@ -126,7 +127,6 @@ class HttpRequest extends EventEmitter {
     this.reqOptions = this.createHttpOptions(options);
     this.hostname = Formatter.formatHostname(this.reqOptions.host, this.reqOptions.port, this.use_ssl);
     this.retryAttempts = this.httpOpts.retry_attempts;
-    this.redact = options.redact || false;
 
     return this;
   }
@@ -253,6 +253,11 @@ class HttpRequest extends EventEmitter {
 
         return arg;
       });
+    } else if (this.reqOptions.method === 'POST' && this.reqOptions.path.includes('/value')) {
+      if (params.text.startsWith(Key.NULL)){
+        params.text = '****';
+        params.value = '****'.split('');
+      }
     }
 
     const content = `  Request ${[this.reqOptions.method, this.hostname + this.reqOptions.path, retryStr + ' '].join(' ')}`;

lib/transport/selenium-webdriver/method-mappings.js

@@ -1,4 +1,4 @@
-const {WebElement, WebDriver, Origin, By, until, Condition} = require('selenium-webdriver');
+const {WebElement, WebDriver, Origin, By, until, Condition, Key} = require('selenium-webdriver');
 const {Locator} = require('../../element');
 const NightwatchLocator = require('../../element/locator-factory.js');
 const {isString} = require('../../utils');
@@ -590,9 +590,17 @@ module.exports = class MethodMappings {
           return null;
         },
 
-        setElementValueRedacted(...args) {
-          // FIXME: redact password in verbose HTTP logs, it's only redacted in the command logs
-          return this.methods.session.setElementValue.call(this, ...args);
+        setElementValueRedacted(webElementOrId, value) {
+          let redactedValue;
+          if (value instanceof Array) {
+            value.unshift(Key.NULL);
+            redactedValue = value;
+          } else {
+            // Can be String or number.
+            redactedValue = Key.NULL + value;
+          }
+
+          return this.methods.session.setElementValue.call(this, webElementOrId, redactedValue);
         },
 
         async setElementValue(webElementOrId, value) {

test/src/api/commands/element/testSetPassword.js

@@ -1,4 +1,5 @@
 const assert = require('assert');
+const {Key} = require('selenium-webdriver');
 const MockServer  = require('../../../../lib/mockserver.js');
 const CommandGlobals = require('../../../../lib/globals/commands.js');
 
@@ -17,8 +18,8 @@ describe('setPassword', function() {
       url: '/wd/hub/session/1352110219202/element/0/value',
       method: 'POST',
       postdata: {
-        text: 'password',
-        value: ['p', 'a', 's', 's', 'w', 'o', 'r', 'd']
+        text: Key.NULL + 'password',
+        value: [Key.NULL, 'p', 'a', 's', 's', 'w', 'o', 'r', 'd']
       },
       response: {
         sessionId: '1352110219202',