update
This commit is contained in:
@@ -574,21 +574,27 @@ function TS_decrypt(input, secret, callback, table, id) {
|
|||||||
decryptedUtf8 = words.toString(CryptoJS.enc.Latin1);
|
decryptedUtf8 = words.toString(CryptoJS.enc.Latin1);
|
||||||
} catch (latinErr) {
|
} catch (latinErr) {
|
||||||
console.warn('TS_decrypt: failed to decode decrypted bytes', utfErr, latinErr);
|
console.warn('TS_decrypt: failed to decode decrypted bytes', utfErr, latinErr);
|
||||||
try { callback(input, false); } catch (ee) { }
|
try { callback(input, "error"); } catch (ee) { }
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var parsed = null;
|
var parsed = null;
|
||||||
try { parsed = JSON.parse(decryptedUtf8); } catch (pe) { parsed = decryptedUtf8; }
|
try {
|
||||||
|
parsed = JSON.parse(decryptedUtf8);
|
||||||
|
} catch (pe) {
|
||||||
|
parsed = decryptedUtf8;
|
||||||
|
try { callback(parsed, "error2"); } catch (ee) { console.error(ee); }
|
||||||
|
return;
|
||||||
|
}
|
||||||
try { callback(parsed, true); } catch (e) { console.error(e); }
|
try { callback(parsed, true); } catch (e) { console.error(e); }
|
||||||
// Keep encrypted at-rest: if table/id provided, ensure DB stores encrypted payload (input)
|
// Keep encrypted at-rest: if table/id provided, ensure DB stores encrypted payload (input)
|
||||||
if (table && id && window.DB && DB.put) {
|
// if (table && id && window.DB && DB.put) {
|
||||||
DB.put(table, id, input).catch(() => {});
|
// DB.put(table, id, input).catch(() => {});
|
||||||
}
|
// }
|
||||||
return;
|
return;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('TS_decrypt: invalid encrypted payload', e);
|
console.error('TS_decrypt: invalid encrypted payload', e);
|
||||||
try { callback(input, false); } catch (ee) { }
|
try { callback(input, "error"); } catch (ee) { }
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -893,9 +899,13 @@ function TS_IndexElement(
|
|||||||
switch (key.type) {
|
switch (key.type) {
|
||||||
case "_encrypted": {
|
case "_encrypted": {
|
||||||
const tdEncrypted = document.createElement("td");
|
const tdEncrypted = document.createElement("td");
|
||||||
tdEncrypted.innerText = data["_encrypted__"]
|
if (data["_encrypted__"] === true) {
|
||||||
? "🔒"
|
tdEncrypted.innerText = "🔒"
|
||||||
: "";
|
} else if (data["_encrypted__"] === "error" || data["_encrypted__"] === "error2" || data["_encrypted__"] === undefined) {
|
||||||
|
tdEncrypted.innerText = "⚠️ Error";
|
||||||
|
} else {
|
||||||
|
tdEncrypted.innerText = "";
|
||||||
|
}
|
||||||
new_tr.appendChild(tdEncrypted);
|
new_tr.appendChild(tdEncrypted);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ PAGES.login = {
|
|||||||
localStorage.setItem('TELESEC_COUCH_DBNAME', dbname);
|
localStorage.setItem('TELESEC_COUCH_DBNAME', dbname);
|
||||||
localStorage.setItem('TELESEC_COUCH_USER', user);
|
localStorage.setItem('TELESEC_COUCH_USER', user);
|
||||||
localStorage.setItem('TELESEC_COUCH_PASS', pass);
|
localStorage.setItem('TELESEC_COUCH_PASS', pass);
|
||||||
localStorage.setItem('TELESEC_SECRET', secret);
|
localStorage.setItem('TELESEC_SECRET', secret.toUpperCase());
|
||||||
SECRET = secret;
|
SECRET = secret.toUpperCase();
|
||||||
try {
|
try {
|
||||||
DB.init({ secret: SECRET, remoteServer: "https://" + url, username: user, password: pass, dbname: dbname || undefined });
|
DB.init({ secret: SECRET, remoteServer: "https://" + url, username: user, password: pass, dbname: dbname || undefined });
|
||||||
toastr.success('Iniciando sincronización con CouchDB');
|
toastr.success('Iniciando sincronización con CouchDB');
|
||||||
|
|||||||
Reference in New Issue
Block a user