Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redact file paths with escaped slashes

Browse Source
This commit is contained in:
Daniel Gasienica
2018-04-06 14:25:55 -04:00
parent d41e3cd6fc
commit 432a6ebd7f
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/modules/privacy.js
View File

@@ -38,12 +38,14 @@ exports._redactPath = (filePath) => {
exports._pathToRegExp = (filePath) => {
try {
const pathWithNormalizedSlashes = filePath.replace(/\//g, '\\');
const pathWithEscapedSlashes = filePath.replace(/\\/g, '\\\\');
const urlEncodedPath = encodeURI(filePath);
// Safe `String::replaceAll`:
// https://github.com/lodash/lodash/issues/1084#issuecomment-86698786
const patternString = [
filePath,
pathWithNormalizedSlashes,
pathWithEscapedSlashes,
urlEncodedPath,
].map(escapeRegExp).join('|');
return new RegExp(patternString, 'g');