mexon/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

jappixmini: wait for client secret to be set

Browse source
This commit is contained in:
Leberwurscht 2012-04-15 22:57:25 +02:00
parent cc1f35c61b
commit 6034ba3263
2 changed files with 77 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
jappixmini/jappixmini.php
View file

@ -270,7 +270,9 @@ function jappixmini_settings(&$a, &$s) {
if (friendica_password) {
jappixmini_addon_set_client_secret(friendica_password.value);
password.value = jappixmini_addon_encrypt_password(clear_password.value);
jappixmini_addon_encrypt_password(clear_password.value, function(encrypted_password){
password.value = encrypted_password;
});
}
}
else {
@ -283,7 +285,9 @@ function jappixmini_settings(&$a, &$s) {
password = document.getElementById('jappixmini-password');
clear_password = document.getElementById('jappixmini-clear-password');
if (encrypt) {
clear_password.value = jappixmini_addon_decrypt_password(password.value);
jappixmini_addon_decrypt_password(password.value, function(decrypted_password){
clear_password.value = decrypted_password;
});
}
else {
clear_password.value = password.value;

66
jappixmini/lib.js
View file

@ -24,33 +24,43 @@ function jappixmini_addon_set_client_secret(password) {
client_secret2 = str_sha1(salt2+password);
client_secret = client_secret1 + client_secret2;
setDB('jappix-mini', 'client_secret', client_secret);
setDB('jappix-mini', 'client-secret', client_secret);
console.log("client secret set");
}
function jappixmini_addon_get_client_secret() {
client_secret = getDB('jappix-mini', 'client_secret');
function jappixmini_addon_get_client_secret(callback) {
client_secret = getDB('jappix-mini', 'client-secret');
if (client_secret===null) {
div = $('<div style="position:fixed;padding:1em;background-color:#F00;color:#fff;top:50px;left:50px;">Retype your Friendica password for chatting:</div>');
div.append($("<br>"));
input = $('<input type="password">')
div = document.getElementById("#jappixmini-password-query-div");
if (!div) {
div = $('<div id="jappixmini-password-query-div" style="position:fixed;padding:1em;background-color:#F00;color:#fff;top:50px;left:50px;">Retype your Friendica password for chatting:<br></div>');
input = $('<input type="password" id="jappixmini-password-query-input">')
div.append(input);
button = $('<input type="button" value="OK">');
button.click(function(){
password = input.val();
jappixmini_addon_set_client_secret(password);
div.remove();
});
button = $('<input type="button" value="OK" id="jappixmini-password-query-button">');
div.append(button);
$("body").append(div);
}
return client_secret;
button.click(function(){
password = $("#jappixmini-password-query-input").val();
jappixmini_addon_set_client_secret(password);
div.remove();
client_secret = getDB('jappix-mini', 'client-secret');
callback(client_secret);
});
}
else {
callback(client_secret);
}
}
function jappixmini_addon_encrypt_password(password) {
client_secret = jappixmini_addon_get_client_secret();
function jappixmini_addon_encrypt_password(password, callback) {
jappixmini_addon_get_client_secret(function(client_secret){
// add \0 to password until it has the same length as secret
if (password.length>client_secret.length-1) throw "password too long";
while (password.length<client_secret.length) {
@ -61,22 +71,24 @@ function jappixmini_addon_encrypt_password(password) {
encrypted_password = jappixmini_addon_xor(client_secret, password);
encrypted_password = encodeURI(encrypted_password)
return encrypted_password;
callback(encrypted_password);
});
}
function jappixmini_addon_decrypt_password(encrypted_password) {
function jappixmini_addon_decrypt_password(encrypted_password, callback) {
encrypted_password = decodeURI(encrypted_password);
client_secret = jappixmini_addon_get_client_secret();
jappixmini_addon_get_client_secret(function(client_secret){
// xor password with secret
password = jappixmini_addon_xor(client_secret, encrypted_password);
// remove \0
first_null = password.indexOf("\0")
// TODO: check first_null==null
password = password.substr(0, first_null);
return password;
callback(password);
});
}
function jappixmini_manage_roster(contacts, autoapprove, autosubscribe) {
@ -119,10 +131,7 @@ function jappixmini_addon_subscribe() {
}
function jappixmini_addon_start(server, username, bosh, encrypted, password, nickname) {
// decrypt password
if (encrypted)
password = jappixmini_addon_decrypt_password(password);
handler = function(password){
// check if settings have changed, reinitialize jappix mini if this is the case
settings_identifier = str_sha1(server);
settings_identifier += str_sha1(username);
@ -141,4 +150,11 @@ function jappixmini_addon_start(server, username, bosh, encrypted, password, nic
// start jappix mini
MINI_NICKNAME = nickname;
launchMini(true, false, server, username, password);
}
// decrypt password if necessary
if (encrypted)
jappixmini_addon_decrypt_password(password, handler);
else
handler(password);
}