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

Standardize some whitespace

Browse source 
The preferred style is 4 spaces.
This commit is contained in:
lilia 2014-10-19 17:53:17 -07:00
parent e568e2c528
commit 03cc667e48
2 changed files with 797 additions and 797 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

610
js/api.js
View file

@ -1,4 +1,4 @@
/* vim: ts=4:sw=4 /* vim: ts=4:sw=4:expandtab
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
@ -17,354 +17,354 @@
window.textsecure = window.textsecure || {}; window.textsecure = window.textsecure || {};
window.textsecure.api = function() { window.textsecure.api = function() {
'use strict'; 'use strict';
var self = {}; var self = {};
/************************************************ /************************************************
*** Utilities to communicate with the server *** *** Utilities to communicate with the server ***
************************************************/ ************************************************/
// Staging server // Staging server
var URL_BASE = "https://textsecure-service-staging.whispersystems.org"; var URL_BASE = "https://textsecure-service-staging.whispersystems.org";
self.relay = "textsecure-service-staging.whispersystems.org"; self.relay = "textsecure-service-staging.whispersystems.org";
// This is the real server // This is the real server
//var URL_BASE = "https://textsecure-service.whispersystems.org"; //var URL_BASE = "https://textsecure-service.whispersystems.org";
var URL_CALLS = {}; var URL_CALLS = {};
URL_CALLS['accounts'] = "/v1/accounts"; URL_CALLS['accounts'] = "/v1/accounts";
URL_CALLS['devices'] = "/v1/devices"; URL_CALLS['devices'] = "/v1/devices";
URL_CALLS['keys'] = "/v2/keys"; URL_CALLS['keys'] = "/v2/keys";
URL_CALLS['push'] = "/v1/websocket"; URL_CALLS['push'] = "/v1/websocket";
URL_CALLS['temp_push'] = "/v1/temp_websocket"; URL_CALLS['temp_push'] = "/v1/temp_websocket";
URL_CALLS['messages'] = "/v1/messages"; URL_CALLS['messages'] = "/v1/messages";
URL_CALLS['attachment'] = "/v1/attachments"; URL_CALLS['attachment'] = "/v1/attachments";
/** /**
* REQUIRED PARAMS: * REQUIRED PARAMS:
* call: URL_CALLS entry * call: URL_CALLS entry
* httpType: POST/GET/PUT/etc * httpType: POST/GET/PUT/etc
* OPTIONAL PARAMS: * OPTIONAL PARAMS:
* success_callback: function(response object) called on success * success_callback: function(response object) called on success
* error_callback: function(http status code = -1 or != 200) called on failure * error_callback: function(http status code = -1 or != 200) called on failure
* urlParameters: crap appended to the url (probably including a leading /) * urlParameters: crap appended to the url (probably including a leading /)
* user: user name to be sent in a basic auth header * user: user name to be sent in a basic auth header
* password: password to be sent in a basic auth headerA * password: password to be sent in a basic auth headerA
* do_auth: alternative to user/password where user/password are figured out automagically * do_auth: alternative to user/password where user/password are figured out automagically
* jsonData: JSON data sent in the request body * jsonData: JSON data sent in the request body
*/ */
var doAjax = function(param) { var doAjax = function(param) {
if (param.urlParameters === undefined) if (param.urlParameters === undefined)
param.urlParameters = ""; param.urlParameters = "";
if (param.do_auth) { if (param.do_auth) {
param.user = textsecure.storage.getUnencrypted("number_id"); param.user = textsecure.storage.getUnencrypted("number_id");
param.password = textsecure.storage.getEncrypted("password"); param.password = textsecure.storage.getEncrypted("password");
} }
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
$.ajax(URL_BASE + URL_CALLS[param.call] + param.urlParameters, { $.ajax(URL_BASE + URL_CALLS[param.call] + param.urlParameters, {
type : param.httpType, type : param.httpType,
data : param.jsonData && textsecure.utils.jsonThing(param.jsonData), data : param.jsonData && textsecure.utils.jsonThing(param.jsonData),
contentType : 'application/json; charset=utf-8', contentType : 'application/json; charset=utf-8',
dataType : 'json', dataType : 'json',
beforeSend : function(xhr) { beforeSend : function(xhr) {
if (param.user !== undefined && if (param.user !== undefined &&
param.password !== undefined) param.password !== undefined)
xhr.setRequestHeader("Authorization", "Basic " + btoa(getString(param.user) + ":" + getString(param.password))); xhr.setRequestHeader("Authorization", "Basic " + btoa(getString(param.user) + ":" + getString(param.password)));
}, },
success : function(response, textStatus, jqXHR) { success : function(response, textStatus, jqXHR) {
resolve(response); resolve(response);
}, },
error : function(jqXHR, textStatus, errorThrown) { error : function(jqXHR, textStatus, errorThrown) {
var code = jqXHR.status; var code = jqXHR.status;
if (code == 200) { if (code == 200) {
// happens sometimes when we get no response // happens sometimes when we get no response
// (TODO: Fix server to return 204? instead) // (TODO: Fix server to return 204? instead)
resolve(null); resolve(null);
return; return;
} }
if (code > 999 || code < 100) if (code > 999 || code < 100)
code = -1; code = -1;
try { try {
switch (code) { switch (code) {
case -1: case -1:
textsecure.throwHumanError(code, "HTTPError", "Failed to connect to the server, please check your network connection."); textsecure.throwHumanError(code, "HTTPError", "Failed to connect to the server, please check your network connection.");
case 413: case 413:
textsecure.throwHumanError(code, "HTTPError", "Rate limit exceeded, please try again later."); textsecure.throwHumanError(code, "HTTPError", "Rate limit exceeded, please try again later.");
case 403: case 403:
textsecure.throwHumanError(code, "HTTPError", "Invalid code, please try again."); textsecure.throwHumanError(code, "HTTPError", "Invalid code, please try again.");
case 417: case 417:
// TODO: This shouldn't be a thing?, but its in the API doc? // TODO: This shouldn't be a thing?, but its in the API doc?
textsecure.throwHumanError(code, "HTTPError", "Number already registered."); textsecure.throwHumanError(code, "HTTPError", "Number already registered.");
case 401: case 401:
textsecure.throwHumanError(code, "HTTPError", "Invalid authentication, most likely someone re-registered and invalidated our registration."); textsecure.throwHumanError(code, "HTTPError", "Invalid authentication, most likely someone re-registered and invalidated our registration.");
case 404: case 404:
textsecure.throwHumanError(code, "HTTPError", "Number is not registered with TextSecure."); textsecure.throwHumanError(code, "HTTPError", "Number is not registered with TextSecure.");
default: default:
textsecure.throwHumanError(code, "HTTPError", "The server rejected our query, please file a bug report."); textsecure.throwHumanError(code, "HTTPError", "The server rejected our query, please file a bug report.");
} }
} catch (e) { } catch (e) {
if (jqXHR.responseJSON) if (jqXHR.responseJSON)
e.response = jqXHR.responseJSON; e.response = jqXHR.responseJSON;
reject(e); reject(e);
} }
} }
}); });
}); });
}; };
function requestVerificationCode(number, transport) { function requestVerificationCode(number, transport) {
return doAjax({ return doAjax({
call : 'accounts', call : 'accounts',
httpType : 'GET', httpType : 'GET',
urlParameters : '/' + transport + '/code/' + number, urlParameters : '/' + transport + '/code/' + number,
}); });
}; };
self.requestVerificationSMS = function(number) { self.requestVerificationSMS = function(number) {
return requestVerificationCode(number, 'sms'); return requestVerificationCode(number, 'sms');
}; };
self.requestVerificationVoice = function(number) { self.requestVerificationVoice = function(number) {
return requestVerificationCode(number, 'voice'); return requestVerificationCode(number, 'voice');
}; };
self.confirmCode = function(number, code, password, self.confirmCode = function(number, code, password,
signaling_key, registrationId, single_device) { signaling_key, registrationId, single_device) {
var call = single_device ? 'accounts' : 'devices'; var call = single_device ? 'accounts' : 'devices';
var urlPrefix = single_device ? '/code/' : '/'; var urlPrefix = single_device ? '/code/' : '/';
return doAjax({ return doAjax({
call : call, call : call,
httpType : 'PUT', httpType : 'PUT',
urlParameters : urlPrefix + code, urlParameters : urlPrefix + code,
user : number, user : number,
password : password, password : password,
jsonData : { signalingKey : btoa(getString(signaling_key)), jsonData : { signalingKey : btoa(getString(signaling_key)),
supportsSms : false, supportsSms : false,
fetchesMessages : true, fetchesMessages : true,
registrationId : registrationId}, registrationId : registrationId},
}); });
}; };
self.registerKeys = function(genKeys) { self.registerKeys = function(genKeys) {
var keys = {}; var keys = {};
keys.identityKey = btoa(getString(genKeys.identityKey)); keys.identityKey = btoa(getString(genKeys.identityKey));
keys.signedPreKey = {keyId: genKeys.signedPreKey.keyId, publicKey: btoa(getString(genKeys.signedPreKey.publicKey)), keys.signedPreKey = {keyId: genKeys.signedPreKey.keyId, publicKey: btoa(getString(genKeys.signedPreKey.publicKey)),
signature: btoa(getString(genKeys.signedPreKey.signature))}; signature: btoa(getString(genKeys.signedPreKey.signature))};
keys.preKeys = []; keys.preKeys = [];
var j = 0; var j = 0;
for (var i in genKeys.preKeys) for (var i in genKeys.preKeys)
keys.preKeys[j++] = {keyId: i, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))}; keys.preKeys[j++] = {keyId: i, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))};
//TODO: This is just to make the server happy (v2 clients should choke on publicKey), //TODO: This is just to make the server happy (v2 clients should choke on publicKey),
// it needs removed before release // it needs removed before release
keys.lastResortKey = {keyId: 0x7fffFFFF, publicKey: btoa("42")}; keys.lastResortKey = {keyId: 0x7fffFFFF, publicKey: btoa("42")};
return doAjax({ return doAjax({
call : 'keys', call : 'keys',
httpType : 'PUT', httpType : 'PUT',
do_auth : true, do_auth : true,
jsonData : keys, jsonData : keys,
}); });
}; };
self.getKeysForNumber = function(number, deviceId) { self.getKeysForNumber = function(number, deviceId) {
if (deviceId === undefined) if (deviceId === undefined)
deviceId = "*"; deviceId = "*";
return doAjax({ return doAjax({
call : 'keys', call : 'keys',
httpType : 'GET', httpType : 'GET',
do_auth : true, do_auth : true,
urlParameters : "/" + number + "/" + deviceId, urlParameters : "/" + number + "/" + deviceId,
}).then(function(res) { }).then(function(res) {
var promises = []; var promises = [];
res.identityKey = base64DecToArr(res.identityKey); res.identityKey = base64DecToArr(res.identityKey);
for (var i = 0; i < res.devices.length; i++) { for (var i = 0; i < res.devices.length; i++) {
res.devices[i].signedPreKey.publicKey = base64DecToArr(res.devices[i].signedPreKey.publicKey); res.devices[i].signedPreKey.publicKey = base64DecToArr(res.devices[i].signedPreKey.publicKey);
res.devices[i].signedPreKey.signature = base64DecToArr(res.devices[i].signedPreKey.signature); res.devices[i].signedPreKey.signature = base64DecToArr(res.devices[i].signedPreKey.signature);
promises[i] = window.textsecure.crypto.Ed25519Verify(res.identityKey, res.devices[i].signedPreKey.publicKey, res.devices[i].signedPreKey.signature); promises[i] = window.textsecure.crypto.Ed25519Verify(res.identityKey, res.devices[i].signedPreKey.publicKey, res.devices[i].signedPreKey.signature);
res.devices[i].preKey.publicKey = base64DecToArr(res.devices[i].preKey.publicKey); res.devices[i].preKey.publicKey = base64DecToArr(res.devices[i].preKey.publicKey);
//TODO: Is this still needed? //TODO: Is this still needed?
//if (res.devices[i].keyId === undefined) //if (res.devices[i].keyId === undefined)
// res.devices[i].keyId = 0; // res.devices[i].keyId = 0;
} }
return Promise.all(promises).then(function() { return Promise.all(promises).then(function() {
return res; return res;
}); });
}); });
}; };
self.sendMessages = function(destination, messageArray) { self.sendMessages = function(destination, messageArray) {
//TODO: Do this conversion somewhere else? //TODO: Do this conversion somewhere else?
for (var i = 0; i < messageArray.length; i++) for (var i = 0; i < messageArray.length; i++)
messageArray[i].body = btoa(messageArray[i].body); messageArray[i].body = btoa(messageArray[i].body);
var jsonData = { messages: messageArray }; var jsonData = { messages: messageArray };
if (messageArray[0].relay !== undefined) if (messageArray[0].relay !== undefined)
jsonData.relay = messageArray[0].relay; jsonData.relay = messageArray[0].relay;
return doAjax({
call : 'messages',
httpType : 'PUT',
urlParameters : '/' + destination,
do_auth : true,
jsonData : jsonData,
});
};
self.getAttachment = function(id) { return doAjax({
return doAjax({ call : 'messages',
call : 'attachment', httpType : 'PUT',
httpType : 'GET', urlParameters : '/' + destination,
urlParameters : '/' + id, do_auth : true,
do_auth : true, jsonData : jsonData,
}).then(function(response) { });
return new Promise(function(resolve, reject) { };
$.ajax(response.location, {
type : "GET",
xhrFields: {
responseType: "arraybuffer"
},
headers: {
"Content-Type": "application/octet-stream"
},
success : function(response, textStatus, jqXHR) { self.getAttachment = function(id) {
resolve(response); return doAjax({
}, call : 'attachment',
httpType : 'GET',
urlParameters : '/' + id,
do_auth : true,
}).then(function(response) {
return new Promise(function(resolve, reject) {
$.ajax(response.location, {
type : "GET",
xhrFields: {
responseType: "arraybuffer"
},
headers: {
"Content-Type": "application/octet-stream"
},
error : function(jqXHR, textStatus, errorThrown) { success : function(response, textStatus, jqXHR) {
var code = jqXHR.status; resolve(response);
if (code > 999 || code < 100) },
code = -1;
var e = new Error(code); error : function(jqXHR, textStatus, errorThrown) {
e.name = "HTTPError"; var code = jqXHR.status;
if (jqXHR.responseJSON) if (code > 999 || code < 100)
e.response = jqXHR.responseJSON; code = -1;
reject(e);
}
});
});
});
};
self.putAttachment = function(encryptedBin) { var e = new Error(code);
return doAjax({ e.name = "HTTPError";
call : 'attachment', if (jqXHR.responseJSON)
httpType : 'GET', e.response = jqXHR.responseJSON;
do_auth : true, reject(e);
}).then(function(response) { }
return new Promise(function(resolve, reject) { });
$.ajax(response.location, { });
type : "PUT", });
headers: { };
"Content-Type": "application/octet-stream"
},
data: encryptedBin,
success : function() { self.putAttachment = function(encryptedBin) {
resolve(response.id); return doAjax({
}, call : 'attachment',
httpType : 'GET',
do_auth : true,
}).then(function(response) {
return new Promise(function(resolve, reject) {
$.ajax(response.location, {
type : "PUT",
headers: {
"Content-Type": "application/octet-stream"
},
data: encryptedBin,
error : function(jqXHR, textStatus, errorThrown) { success : function() {
var code = jqXHR.status; resolve(response.id);
if (code > 999 || code < 100) },
code = -1;
var e = new Error(code); error : function(jqXHR, textStatus, errorThrown) {
e.name = "HTTPError"; var code = jqXHR.status;
if (jqXHR.responseJSON) if (code > 999 || code < 100)
e.response = jqXHR.responseJSON; code = -1;
reject(e);
}
});
});
});
};
var getWebsocket = function(url, auth, reconnectTimeout) { var e = new Error(code);
var URL = URL_BASE.replace(/^http/g, 'ws') + url + '/?'; e.name = "HTTPError";
if (auth) { if (jqXHR.responseJSON)
var user = textsecure.storage.getUnencrypted("number_id"); e.response = jqXHR.responseJSON;
var password = textsecure.storage.getEncrypted("password"); reject(e);
var params = $.param({ }
login: '+' + getString(user).substring(1), });
password: getString(password) });
}); });
} else };
var params = $.param({});
var reconnectSemaphore = 0; var getWebsocket = function(url, auth, reconnectTimeout) {
var socketWrapper = { onmessage: function() {}, ondisconnect: function() {}, onconnect: function() {} }; var URL = URL_BASE.replace(/^http/g, 'ws') + url + '/?';
if (auth) {
var user = textsecure.storage.getUnencrypted("number_id");
var password = textsecure.storage.getEncrypted("password");
var params = $.param({
login: '+' + getString(user).substring(1),
password: getString(password)
});
} else
var params = $.param({});
var connect = function() { var reconnectSemaphore = 0;
reconnectSemaphore++; var socketWrapper = { onmessage: function() {}, ondisconnect: function() {}, onconnect: function() {} };
if (reconnectSemaphore <= 0)
return;
var socket = new WebSocket(URL+params); var connect = function() {
reconnectSemaphore++;
if (reconnectSemaphore <= 0)
return;
socket.onerror = function(socketEvent) { var socket = new WebSocket(URL+params);
console.log('Server is down :(');
reconnectSemaphore--;
setTimeout(function() { connect(); }, reconnectTimeout);
socketWrapper.ondisconnect();
};
socket.onclose = function(socketEvent) { socket.onerror = function(socketEvent) {
console.log('Server closed :('); console.log('Server is down :(');
reconnectSemaphore--; reconnectSemaphore--;
setTimeout(function() { connect(); }, reconnectTimeout); setTimeout(function() { connect(); }, reconnectTimeout);
socketWrapper.ondisconnect(); socketWrapper.ondisconnect();
}; };
socket.onopen = function(socketEvent) { socket.onclose = function(socketEvent) {
console.log('Connected to server!'); console.log('Server closed :(');
socketWrapper.onconnect(); reconnectSemaphore--;
}; setTimeout(function() { connect(); }, reconnectTimeout);
socketWrapper.ondisconnect();
};
//TODO: wrap onmessage so that we reconnect on missing pong socket.onopen = function(socketEvent) {
socket.onmessage = function(response) { console.log('Connected to server!');
try { socketWrapper.onconnect();
var message = JSON.parse(response.data); };
} catch (e) {
console.log('Error parsing server JSON message: ' + response);
return;
}
if ((message.type === undefined && message.id !== undefined) || message.type === 4) //TODO: wrap onmessage so that we reconnect on missing pong
socketWrapper.onmessage(message); socket.onmessage = function(response) {
else try {
console.log("Got invalid message from server: " + message); var message = JSON.parse(response.data);
}; } catch (e) {
console.log('Error parsing server JSON message: ' + response);
return;
}
socketWrapper.send = function(msg) { if ((message.type === undefined && message.id !== undefined) || message.type === 4)
socket.send(msg); socketWrapper.onmessage(message);
} else
}; console.log("Got invalid message from server: " + message);
connect(); };
return socketWrapper; socketWrapper.send = function(msg) {
} socket.send(msg);
}
};
connect();
self.getMessageWebsocket = function() { return socketWrapper;
return getWebsocket(URL_CALLS['push'], true, 60000); }
}
self.getTempWebsocket = function() { self.getMessageWebsocket = function() {
//XXX return getWebsocket(URL_CALLS['push'], true, 60000);
var socketWrapper = { onmessage: function() {}, ondisconnect: function() {}, onconnect: function() {} }; }
setTimeout(function() {
socketWrapper.onmessage({uuid: "404-42-magic"});
}, 1000);
return socketWrapper;
//return getWebsocket(URL_CALLS['temp_push'], false, 5000);
}
return self; self.getTempWebsocket = function() {
//XXX
var socketWrapper = { onmessage: function() {}, ondisconnect: function() {}, onconnect: function() {} };
setTimeout(function() {
socketWrapper.onmessage({uuid: "404-42-magic"});
}, 1000);
return socketWrapper;
//return getWebsocket(URL_CALLS['temp_push'], false, 5000);
}
return self;
}(); }();

984
js/helpers.js
View file

File diff suppressed because it is too large Load diff