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

Redact group ids in logging

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-09-25 16:41:57 -07:00
parent 4c48d12dc3
commit 314b29e426
No known key found for this signature in database
GPG key ID: A4931C09644C654B
3 changed files with 70 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

45
js/models/conversations.js
View file

@ -51,6 +51,14 @@
};
},
idForLogging: function() {
if (this.isPrivate()) {
return this.id;
}
return 'group(' + this.id + ')';
},
handleMessageError: function(message, errors) {
this.trigger('messageError', message, errors);
},
@ -195,7 +203,7 @@
}.bind(this)).catch(function(error) {
console.log(
'getIdentityKeys error for conversation',
this.id,
this.idForLogging(),
error && error.stack ? error.stack : error
);
return lookup;
@ -207,7 +215,7 @@
}).catch(function(error) {
console.log(
'getIdentityKeys error for group member',
contact.id,
contact.idForLogging(),
error && error.stack ? error.stack : error
);
});
@ -230,7 +238,7 @@
if (this.get('decryptedOldIncomingKeyErrors')) {
return Promise.resolve();
}
console.log('decryptOldIncomingKeyErrors start for', this.id);
console.log('decryptOldIncomingKeyErrors start for', this.idForLogging());
var messages = this.messageCollection.filter(function(message) {
var errors = message.get('errors');
@ -245,7 +253,7 @@
});
var markComplete = function() {
console.log('decryptOldIncomingKeyErrors complete for', this.id);
console.log('decryptOldIncomingKeyErrors complete for', this.idForLogging());
return new Promise(function(resolve) {
this.save({decryptedOldIncomingKeyErrors: true}).always(resolve);
}.bind(this));
@ -414,7 +422,13 @@
},
addKeyChange: function(id) {
console.log('adding key change advisory for', this.id, id, this.get('timestamp'));
console.log(
'adding key change advisory for',
this.idForLogging(),
id,
this.get('timestamp')
);
var timestamp = Date.now();
var message = new Whisper.Message({
conversationId : this.id,
@ -437,7 +451,12 @@
var lastMessage = this.get('timestamp') || Date.now();
console.log('adding verified change advisory for', this.id, id, lastMessage);
console.log(
'adding verified change advisory for',
this.idForLogging(),
id,
lastMessage
);
var timestamp = Date.now();
var message = new Whisper.Message({
@ -548,7 +567,10 @@
queueJob: function(callback) {
var previous = this.pending || Promise.resolve();
var taskWithTimeout = textsecure.createTaskWithTimeout(callback, 'conversation ' + this.id);
var taskWithTimeout = textsecure.createTaskWithTimeout(
callback,
'conversation ' + this.idForLogging()
);
var current = this.pending = previous.then(taskWithTimeout, taskWithTimeout);
@ -564,7 +586,14 @@
sendMessage: function(body, attachments) {
this.queueJob(function() {
var now = Date.now();
console.log('Sending message to conversation', this.id, 'with timestamp', now);
console.log(
'Sending message to conversation',
this.idForLogging(),
'with timestamp',
now
);
var message = this.messageCollection.add({
body : body,
conversationId : this.id,