mongodb-redact 1.2.2 → 1.3.0

package/dist/.esm-wrapper.mjs

@@ -2,3 +2,5 @@ import mod from "./index.js";
 
 export default mod["default"];
 export const redact = mod.redact;
+export const redactConnectionString = mod.redactConnectionString;
+export const shouldRedactCommand = mod.shouldRedactCommand;

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import type { Secret } from './secrets';
 export declare function redact<T>(message: T, secrets?: Secret[] | undefined): T;
+export { shouldRedactCommand } from './should-redact-command';
+export { redactConnectionString } from './redact-connection-string';
 export default redact;
 export type { Secret } from './secrets';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAgB,MAAM,CAAC,CAAC,EACtB,OAAO,EAAE,CAAC,EACV,OAAO,GAAE,MAAM,EAAE,GAAG,SAAqB,GACxC,CAAC,CAsCH;AAED,eAAe,MAAM,CAAC;AACtB,YAAY,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAgB,MAAM,CAAC,CAAC,EACtB,OAAO,EAAE,CAAC,EACV,OAAO,GAAE,MAAM,EAAE,GAAG,SAAqB,GACxC,CAAC,CAsCH;AAED,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEpE,eAAe,MAAM,CAAC;AACtB,YAAY,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC"}

package/dist/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.redactConnectionString = exports.shouldRedactCommand = void 0;
 exports.redact = redact;
 const regexes_1 = require("./regexes");
 const utils_1 = require("./utils");
@@ -26,5 +27,9 @@ function redact(message, secrets = undefined) {
     }
     return message;
 }
+var should_redact_command_1 = require("./should-redact-command");
+Object.defineProperty(exports, "shouldRedactCommand", { enumerable: true, get: function () { return should_redact_command_1.shouldRedactCommand; } });
+var redact_connection_string_1 = require("./redact-connection-string");
+Object.defineProperty(exports, "redactConnectionString", { enumerable: true, get: function () { return redact_connection_string_1.redactConnectionString; } });
 exports.default = redact;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAKA,wBAyCC;AA9CD,uCAAoC;AACpC,mCAAwC;AACxC,uCAAkD;AAGlD,SAAgB,MAAM,CACpB,OAAU,EACV,UAAgC,SAAS;IAEzC,IAAI,IAAA,qBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAE3B,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YAC5C,GAAG;YACH,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC;SACvB,CAAC,CACE,CAAC;QAIP,OAAO,MAAM,CAAC,cAAc,CAC1B,UAAU,EACV,MAAM,CAAC,cAAc,CAAC,OAAO,CAAkB,CAChD,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAE3B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAM,CAAC;IACzD,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAEhC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,GAAG,IAAA,+BAAqB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAGD,KAAK,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,iBAAO,EAAE,CAAC;QAG3C,OAAO,GAAI,OAAsB,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAe,CAAC;IAC9E,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAKA,wBAyCC;AA9CD,uCAAoC;AACpC,mCAAwC;AACxC,uCAAkD;AAGlD,SAAgB,MAAM,CACpB,OAAU,EACV,UAAgC,SAAS;IAEzC,IAAI,IAAA,qBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAE3B,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;YAC5C,GAAG;YACH,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC;SACvB,CAAC,CACE,CAAC;QAIP,OAAO,MAAM,CAAC,cAAc,CAC1B,UAAU,EACV,MAAM,CAAC,cAAc,CAAC,OAAO,CAAkB,CAChD,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAE3B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAM,CAAC;IACzD,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAEhC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,GAAG,IAAA,+BAAqB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAGD,KAAK,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,iBAAO,EAAE,CAAC;QAG3C,OAAO,GAAI,OAAsB,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,CAAe,CAAC;IAC9E,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAC5B,uEAAoE;AAA3D,kIAAA,sBAAsB,OAAA;AAE/B,kBAAe,MAAM,CAAC"}

package/dist/redact-connection-string.d.ts

@@ -0,0 +1,2 @@
+export declare function redactConnectionString(uri: string): string;
+//# sourceMappingURL=redact-connection-string.d.ts.map

package/dist/redact-connection-string.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redact-connection-string.d.ts","sourceRoot":"","sources":["../src/redact-connection-string.ts"],"names":[],"mappings":"AAEA,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1D"}

package/dist/redact-connection-string.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redactConnectionString = redactConnectionString;
+const mongodb_connection_string_url_1 = require("mongodb-connection-string-url");
+function redactConnectionString(uri) {
+    return (0, mongodb_connection_string_url_1.redactConnectionString)(uri);
+}
+//# sourceMappingURL=redact-connection-string.js.map

package/dist/redact-connection-string.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redact-connection-string.js","sourceRoot":"","sources":["../src/redact-connection-string.ts"],"names":[],"mappings":";;AAEA,wDAEC;AAJD,iFAAqG;AAErG,SAAgB,sBAAsB,CAAC,GAAW;IAChD,OAAO,IAAA,sDAA0B,EAAC,GAAG,CAAC,CAAC;AACzC,CAAC"}

package/dist/regexes.d.ts

@@ -1,2 +1,2 @@
-export declare const regexes: readonly [readonly [RegExp, "$1$2$4<base64>$5"], readonly [RegExp, "<certificate>"], readonly [RegExp, "<private key>"], readonly [RegExp, "$1$2/<user>/"], readonly [RegExp, "$1$2\\<user>\\"], readonly [RegExp, "$1<email>$6"], readonly [RegExp, "<ip address>"], readonly [RegExp, "<url>"], readonly [RegExp, "<mongodb uri>"], readonly [RegExp, "#schema/<namespace>"]];
+export declare const regexes: readonly [readonly [RegExp, "$1$2$4<base64>$5"], readonly [RegExp, "<certificate>"], readonly [RegExp, "<private key>"], readonly [RegExp, "$1$2/<user>/"], readonly [RegExp, "$1$2\\<user>\\"], readonly [RegExp, "$1<email>$6"], readonly [RegExp, "<mongodb uri>"], readonly [RegExp, "<ip address>"], readonly [RegExp, "<url>"], readonly [RegExp, "#schema/<namespace>"]];
 //# sourceMappingURL=regexes.d.ts.map

package/dist/regexes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"regexes.d.ts","sourceRoot":"","sources":["../src/regexes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,iXAiDV,CAAC"}
+{"version":3,"file":"regexes.d.ts","sourceRoot":"","sources":["../src/regexes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,iXA8CV,CAAC"}

package/dist/regexes.js

@@ -23,6 +23,7 @@ exports.regexes = [
         /(^|[ \t\r\n\v\f"'`])([a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]{1,64}@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(["'`]?)){1,500})/gim,
         '$1<email>$6',
     ],
+    [/mongodb(?:\+srv)?:\/\/\S+/gim, '<mongodb uri>'],
     [
         /((1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])\.){3}(1?[0-9][0-9]?|2[0-4][0-9]|25[0-5])/gm,
         '<ip address>',
@@ -31,10 +32,6 @@ exports.regexes = [
         /(http(s)?:\/\/)(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/gim,
         '<url>',
     ],
-    [
-        /(mongodb:\/\/)(www\.)?[-a-zA-Z0-9@:%._+~#=,]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/gim,
-        '<mongodb uri>',
-    ],
     [/#schema\/\w+\.\w+/, '#schema/<namespace>'],
 ];
 //# sourceMappingURL=regexes.js.map

package/dist/regexes.js.map

@@ -1 +1 @@
-{"version":3,"file":"regexes.js","sourceRoot":"","sources":["../src/regexes.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG;IACrB;QACE,4EAA4E;QAC5E,kBAAkB;KACnB;IAGD,CAAC,0DAA0D,EAAE,eAAe,CAAC;IAC7E;QACE,kEAAkE;QAClE,eAAe;KAChB;IAGD;QACE,uHAAuH;QACvH,cAAc;KACf;IACD;QACE,uHAAuH;QACvH,gBAAgB;KACjB;IAGD;QACE,0KAA0K;QAC1K,aAAa;KACd;IAGD;QACE,iFAAiF;QACjF,cAAc;KACf;IAGD;QACE,oGAAoG;QACpG,OAAO;KACR;IAGD;QACE,oGAAoG;QACpG,eAAe;KAChB;IAGD,CAAC,mBAAmB,EAAE,qBAAqB,CAAC;CACpC,CAAC"}
+{"version":3,"file":"regexes.js","sourceRoot":"","sources":["../src/regexes.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG;IACrB;QACE,4EAA4E;QAC5E,kBAAkB;KACnB;IAGD,CAAC,0DAA0D,EAAE,eAAe,CAAC;IAC7E;QACE,kEAAkE;QAClE,eAAe;KAChB;IAGD;QACE,uHAAuH;QACvH,cAAc;KACf;IACD;QACE,uHAAuH;QACvH,gBAAgB;KACjB;IAGD;QACE,0KAA0K;QAC1K,aAAa;KACd;IAGD,CAAC,8BAA8B,EAAE,eAAe,CAAC;IAGjD;QACE,iFAAiF;QACjF,cAAc;KACf;IAGD;QACE,oGAAoG;QACpG,OAAO;KACR;IAGD,CAAC,mBAAmB,EAAE,qBAAqB,CAAC;CACpC,CAAC"}

package/dist/secrets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../src/secrets.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,6FASd,CAAC;AAEX,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtD,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC3B,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EACpD,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,MAAM,EAAE,GAChB,CAAC,CAcH"}
+{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../src/secrets.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,6FASd,CAAC;AAEX,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtD,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC3B,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EACpD,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,MAAM,EAAE,GAChB,CAAC,CAiBH"}

package/dist/secrets.js

@@ -22,7 +22,8 @@ function redactSecretsOnString(content, secrets) {
         if (!exports.SECRET_KIND.includes(kind)) {
             throw new Error(`Unknown secret kind ${kind}. Valid types: ${exports.SECRET_KIND.join(', ')}`);
         }
-        const regex = new RegExp(`\\b${(0, regexp_escape_1.default)(value)}\\b`, 'g');
+        const escapedValue = (0, regexp_escape_1.default)(value);
+        const regex = new RegExp(`(?<!\\w)${escapedValue}(?!\\w)`, 'g');
         result = result.replace(regex, `<${kind}>`);
     }
     return result;

package/dist/secrets.js.map

@@ -1 +1 @@
-{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../src/secrets.ts"],"names":[],"mappings":";;;;;;AAsBA,sDAiBC;AArCD,kEAAmC;AAEtB,QAAA,WAAW,GAAG;IACzB,QAAQ;IACR,aAAa;IACb,MAAM;IACN,UAAU;IACV,OAAO;IACP,IAAI;IACJ,KAAK;IACL,aAAa;CACL,CAAC;AASX,SAAgB,qBAAqB,CACnC,OAAU,EACV,OAAiB;IAEjB,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;QACtC,IAAI,CAAC,mBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CACb,uBAAuB,IAAI,kBAAkB,mBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtE,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,IAAA,uBAAM,EAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,IAAI,GAAG,CAAM,CAAC;IACnD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../src/secrets.ts"],"names":[],"mappings":";;;;;;AAsBA,sDAoBC;AAxCD,kEAAmC;AAEtB,QAAA,WAAW,GAAG;IACzB,QAAQ;IACR,aAAa;IACb,MAAM;IACN,UAAU;IACV,OAAO;IACP,IAAI;IACJ,KAAK;IACL,aAAa;CACL,CAAC;AASX,SAAgB,qBAAqB,CACnC,OAAU,EACV,OAAiB;IAEjB,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;QACtC,IAAI,CAAC,mBAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CACb,uBAAuB,IAAI,kBAAkB,mBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtE,CAAC;QACJ,CAAC;QAID,MAAM,YAAY,GAAG,IAAA,uBAAM,EAAC,KAAK,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,WAAW,YAAY,SAAS,EAAE,GAAG,CAAC,CAAC;QAChE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,IAAI,GAAG,CAAM,CAAC;IACnD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/should-redact-command.d.ts

@@ -0,0 +1,2 @@
+export declare function shouldRedactCommand(input: string): boolean;
+//# sourceMappingURL=should-redact-command.d.ts.map

package/dist/should-redact-command.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"should-redact-command.d.ts","sourceRoot":"","sources":["../src/should-redact-command.ts"],"names":[],"mappings":"AAuBA,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAG1D"}

package/dist/should-redact-command.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldRedactCommand = shouldRedactCommand;
+const HIDDEN_COMMANDS = String.raw `\b(createUser|auth|updateUser|changeUserPassword|connect|Mongo)\b`;
+function shouldRedactCommand(input) {
+    const hiddenCommands = new RegExp(HIDDEN_COMMANDS, 'g');
+    return hiddenCommands.test(input);
+}
+//# sourceMappingURL=should-redact-command.js.map

package/dist/should-redact-command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"should-redact-command.js","sourceRoot":"","sources":["../src/should-redact-command.ts"],"names":[],"mappings":";;AAuBA,kDAGC;AApBD,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAA,mEAAmE,CAAC;AAiBtG,SAAgB,mBAAmB,CAAC,KAAa;IAC/C,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IACxD,OAAO,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC"}

package/package.json

@@ -13,7 +13,7 @@
     "email": "compass@mongodb.com"
   },
   "homepage": "https://github.com/mongodb-js/devtools-shared",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/devtools-shared.git"
@@ -71,7 +71,8 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
+    "mongodb-connection-string-url": "^3.0.1 || ^7.0.0",
     "regexp.escape": "^2.0.1"
   },
-  "gitHead": "8928faef983172b1ade2647008b9f6a0183e4a13"
+  "gitHead": "b029fbfa4ad92a2486a78c021ff33a66a274a77a"
 }