colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Escape special characters in file path

Browse Source
This commit is contained in:
Daniel Gasienica
2018-03-07 10:57:39 -05:00
parent 44b81f68dd
commit ea07915e6b
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/modules/privacy.js
View File

@@ -2,15 +2,25 @@
const Path = require('path'); const Path = require('path');
const isString = require('lodash/isString');
const compose = require('lodash/fp/compose'); const compose = require('lodash/fp/compose');
const escapeRegExp = require('lodash/escapeRegExp');
const isRegExp = require('lodash/isRegExp');
const isString = require('lodash/isString');
const PHONE_NUMBER_PATTERN = /\+\d{7,12}(\d{3})/g; const PHONE_NUMBER_PATTERN = /\+\d{7,12}(\d{3})/g;
const GROUP_ID_PATTERN = /(group\()([^)]+)(\))/g; const GROUP_ID_PATTERN = /(group\()([^)]+)(\))/g;
const APP_ROOT_PATH = Path.join(__dirname, '..', '..', '..'); const APP_ROOT_PATH = Path.join(__dirname, '..', '..', '..');
const APP_ROOT_PATH_PATTERN = new RegExp(APP_ROOT_PATH, 'g'); const APP_ROOT_PATH_PATTERN = (() => {
try {
// Safe `String::replaceAll`:
// https://github.com/lodash/lodash/issues/1084#issuecomment-86698786
return new RegExp(escapeRegExp(APP_ROOT_PATH), 'g');
} catch (error) {
return null;
}
})();
const REDACTION_PLACEHOLDER = '[REDACTED]'; const REDACTION_PLACEHOLDER = '[REDACTED]';
@@ -42,6 +52,10 @@ exports.redactSensitivePaths = (text) => {
throw new TypeError('`text` must be a string'); throw new TypeError('`text` must be a string');
} }
if (!isRegExp(APP_ROOT_PATH_PATTERN)) {
return text;
}
return text.replace(APP_ROOT_PATH_PATTERN, REDACTION_PLACEHOLDER); return text.replace(APP_ROOT_PATH_PATTERN, REDACTION_PLACEHOLDER);
}; };