mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Redact stack traces with forward and backslashes

Browse source
This commit is contained in:
Daniel Gasienica 2018-04-06 13:19:41 -04:00
parent b0da7d965e
commit a8a7525609
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/modules/privacy.js
View file

@ -37,10 +37,16 @@ exports._redactPath = (filePath) => {
// _pathToRegExp :: Path -> Maybe RegExp
exports._pathToRegExp = (filePath) => {
try {
const pathWithNormalizedSlashes = filePath.replace(/\//g, '\\');
const urlEncodedPath = encodeURI(filePath);
// Safe `String::replaceAll`:
// https://github.com/lodash/lodash/issues/1084#issuecomment-86698786
const urlEncodedAppRootPath = escapeRegExp(encodeURI(filePath));
return new RegExp(`${escapeRegExp(filePath)}|${urlEncodedAppRootPath}`, 'g');
const patternString = [
filePath,
pathWithNormalizedSlashes,
urlEncodedPath,
].map(escapeRegExp).join('|');
return new RegExp(patternString, 'g');
} catch (error) {
return null;
}