Skip to content

Commit 91cb4ef

Browse files
committed
redact auth keys for stats table
1 parent 5dd2cff commit 91cb4ef

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

bin/helpers/constants.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,10 @@ const LATEST_VERSION_SYNTAX_REGEX = /\d*.latest(.\d*)?/gm
231231

232232
const AUTH_REGEX = /"auth" *: *{[\s\S]*?}/g
233233

234+
const CLI_ARGS_REGEX = /(?<=("u"|"username"|"k"|"key"):)"[^,]*/g
235+
236+
const RAW_ARGS_REGEX = /(?<=("-u"|"-username"|"-k"|"-key"),)"[^,\]]*/g
237+
234238
const ERROR_EXIT_CODE = 1;
235239

236240
const BUILD_FAILED_EXIT_CODE = 3;
@@ -260,7 +264,10 @@ module.exports = Object.freeze({
260264
LATEST_VERSION_SYNTAX_REGEX,
261265
ERROR_EXIT_CODE,
262266
AUTH_REGEX,
267+
CLI_ARGS_REGEX,
268+
RAW_ARGS_REGEX,
263269
REDACTED_AUTH,
270+
REDACTED,
264271
BUILD_FAILED_EXIT_CODE,
265272
SPEC_TIMEOUT_LIMIT
266273
});

bin/helpers/usageReporting.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const config = require('./config'),
99
fileLogger = require('./logger').fileLogger,
1010
utils = require('./utils');
1111

12-
const { AUTH_REGEX, REDACTED_AUTH } = require("./constants");
12+
const { AUTH_REGEX, REDACTED_AUTH, REDACTED, CLI_ARGS_REGEX, RAW_ARGS_REGEX } = require("./constants");
1313

1414
function get_version(package_name) {
1515
try {
@@ -185,10 +185,12 @@ function send(args) {
185185
runSettings = bsConfig.run_settings;
186186
data.cypress_version = bsConfig.run_settings.cypress_version;
187187
}
188-
188+
189189
sanitizedbsConfig = `${(typeof bsConfig === 'string') ? bsConfig :
190190
JSON.stringify(bsConfig)}`.replace(AUTH_REGEX, REDACTED_AUTH);
191-
191+
args.cli_args = args.cli_args && JSON.stringify(args.cli_args).replace(CLI_ARGS_REGEX, REDACTED);
192+
args.raw_args = args.raw_args && JSON.stringify(args.raw_args).replace(RAW_ARGS_REGEX, REDACTED);
193+
192194
delete args.bstack_config;
193195

194196
let zipUploadDetails = {

0 commit comments

Comments
 (0)