quenousimporte
/
notes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feat/openpgp'

This commit is contained in:
quenousimporte 2023-07-13 14:18:34 +02:00
parent 575a47ce50 723caa07ed
commit 5ecf1b721b
4 changed files with 69 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -18,7 +18,7 @@
<body onload="init()" onkeydown="mainkeydownhandler()" onresize="resize()" onstorage="loadstorage()"> <body onload="init()" onkeydown="mainkeydownhandler()" onresize="resize()" onstorage="loadstorage()">
<script src="libs/showdown.min.js"></script> <script src="libs/showdown.min.js"></script>
<script src="libs/vis-network.min.js"></script> <script src="libs/vis-network.min.js"></script>
<script src="libs/openpgp.min.js"></script>
<script src="main.js"></script> <script src="main.js"></script>
<div id="networkpage" hidden> <div id="networkpage" hidden>

17
libs/openpgp.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

56
main.js
View File

@ -341,6 +341,10 @@ var commands = [
hint: "Send by SMS", hint: "Send by SMS",
action: sms, action: sms,
remoteonly: true remoteonly: true
},
{
hint: "Edit pgp keys",
action: editpgpkeys
}]; }];
var snippets = [ var snippets = [
@ -877,6 +881,15 @@ function editsettings()
}); });
} }
function editpgpkeys()
{
bindfile(
{
title: "pgpkeys",
content: localStorage.getItem("pgpkeys")
});
}
function showtemporaryinfo(info) function showtemporaryinfo(info)
{ {
alert(info); alert(info);
@ -1200,6 +1213,7 @@ function addfakehistory()
{ {
history.pushState({}, '', '.'); history.pushState({}, '', '.');
} }
function init() function init()
{ {
loadsettings(); loadsettings();
@ -1397,7 +1411,7 @@ function checkevents()
.catch(remotecallfailed); .catch(remotecallfailed);
} }
function queryremote(params) async function queryremote(params)
{ {
return new Promise( (apply, failed) => { return new Promise( (apply, failed) => {
@ -1424,7 +1438,7 @@ function queryremote(params)
failed("XMLHttpRequest error"); failed("XMLHttpRequest error");
} }
xhr.onload = function() xhr.onload = async function()
{ {
if (xhr.status !== 200) if (xhr.status !== 200)
{ {
@ -1435,7 +1449,22 @@ function queryremote(params)
var data = {}; var data = {};
try try
{ {
data = JSON.parse(xhr.responseText); var response = xhr.responseText;
if (localStorage.getItem("pgpkeys") && response.startsWith("-----BEGIN PGP MESSAGE-----"))
{
console.log("decrypting...");
var key = localStorage.getItem("pgpkeys").split("-----END PGP PUBLIC KEY BLOCK-----")[1];
var privateKey = await openpgp.readKey({ armoredKey: key });
var decrypted = await openpgp.decrypt({
message: await openpgp.readMessage({ armoredMessage: response }),
decryptionKeys: privateKey });
const chunks = [];
for await (const chunk of decrypted.data) {
chunks.push(chunk);
}
response = chunks.join('');
}
data = JSON.parse(response);
if (data.error) if (data.error)
{ {
@ -1825,7 +1854,7 @@ function postpone()
}); });
} }
function save() async function save()
{ {
clearTimeout(workerid); clearTimeout(workerid);
@ -1837,6 +1866,12 @@ function save()
saved = true; saved = true;
return; return;
} }
else if (currentnote.title == "pgpkeys")
{
localStorage.setItem("pgpkeys", md.value);
saved = true;
return;
}
if (!localdata) if (!localdata)
{ {
@ -1872,10 +1907,21 @@ function save()
if (isremote()) if (isremote())
{ {
var datatosend = JSON.stringify(localdata);
if (localStorage.getItem("pgpkeys"))
{
console.log("encrypting...");
var key = localStorage.getItem("pgpkeys").split("-----BEGIN PGP PRIVATE KEY BLOCK-----")[0];
var publicKey = await openpgp.readKey({ armoredKey: key });
datatosend = await openpgp.encrypt({
message: await openpgp.createMessage({ text: datatosend }),
encryptionKeys: publicKey });
}
console.log("sending data to php server..."); console.log("sending data to php server...");
pending = true; pending = true;
queryremote({action: "push", data: JSON.stringify(localdata)}) queryremote({action: "push", data: datatosend})
.then(() => .then(() =>
{ {
console.log("...data saved on server"); console.log("...data saved on server");

1
tools/nodeclient/settings.json
View File

@ -1,7 +1,6 @@
{ {
"password": "", "password": "",
"url": "http://localhost:8000", "url": "http://localhost:8000",
"maxcount": 50
"maxcount": 50, "maxcount": 50,
"command": "sublime_text.exe -w" "command": "sublime_text.exe -w"
} }