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

Remove newlines from group IDs

Browse source
This commit is contained in:
Daniel Gasienica 2018-05-03 11:46:21 -04:00
parent ae7d6aa900
commit 5c8f734e67
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/modules/privacy.js
View file

@ -73,7 +73,7 @@ exports.redactGroupIds = text => {
return text.replace(
GROUP_ID_PATTERN,
(match, before, id, after) =>
`${before}${REDACTION_PLACEHOLDER}${id.slice(-3)}${after}`
`${before}${REDACTION_PLACEHOLDER}${removeNewlines(id).slice(-3)}${after}`
);
};
@ -86,3 +86,5 @@ exports.redactAll = compose(
exports.redactGroupIds,
exports.redactPhoneNumbers
);
const removeNewlines = text => text.replace(/\r?\n|\r/g, '');

12
test/modules/privacy_test.js
View file

@ -33,6 +33,18 @@ describe('Privacy', () => {
'and group([REDACTED]hij)';
assert.equal(actual, expected);
});
it('should remove newlines from redacted group IDs', () => {
const text =
'This is a log line with two group IDs: group(12345678\n9)\n' +
'and group(abc\ndefghij)';
const actual = Privacy.redactGroupIds(text);
const expected =
'This is a log line with two group IDs: group([REDACTED]789)\n' +
'and group([REDACTED]hij)';
assert.equal(actual, expected);
});
});
describe('redactAll', () => {