thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add isNumberSane to textsecure.utils for basic validation

Browse source
This commit is contained in:
Matt Corallo 2015-01-13 11:33:11 -10:00
parent 6b933455e3
commit 17782660e2
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
js/helpers.js
View file

@ -90,6 +90,11 @@ window.textsecure.utils = function() {
return number.split("."); return number.split(".");
}; };
self.isNumberSane = function(number) {
return number[0] == "+" &&
/^[0-9]+$/.test(number.substring(1));
}
/************************** /**************************
*** JSON'ing Utilities *** *** JSON'ing Utilities ***
**************************/ **************************/
@ -189,9 +194,11 @@ textsecure.processDecrypted = function(decrypted, source) {
if (decrypted.group.avatar !== null) if (decrypted.group.avatar !== null)
promises.push(handleAttachment(decrypted.group.avatar)); promises.push(handleAttachment(decrypted.group.avatar));
if (existingGroup.filter(function(number) { decrypted.group.members.indexOf(number) < 0 }).length != 0) { if (decrypted.group.members.filter(function(number) { return !textsecure.utils.isNumberSane(number); }).length != 0)
throw new Error("Invalid number in new group members");
if (existingGroup.filter(function(number) { decrypted.group.members.indexOf(number) < 0 }).length != 0)
throw new Error("Attempted to remove numbers from group with an UPDATE"); throw new Error("Attempted to remove numbers from group with an UPDATE");
}
decrypted.group.added = decrypted.group.members.filter(function(number) { return existingGroup.indexOf(number) < 0; }); decrypted.group.added = decrypted.group.members.filter(function(number) { return existingGroup.indexOf(number) < 0; });
var newGroup = textsecure.storage.groups.addNumbers(decrypted.group.id, decrypted.group.added); var newGroup = textsecure.storage.groups.addNumbers(decrypted.group.id, decrypted.group.added);
@ -205,8 +212,6 @@ textsecure.processDecrypted = function(decrypted, source) {
return; return;
} }
//TODO: Strictly verify all numbers (ie dont let verifyNumber do any user-magic tweaking)
decrypted.body = null; decrypted.body = null;
decrypted.attachments = []; decrypted.attachments = [];