cory/tildefriends
4
5
Fork 1
Code Issues 33 Pull Requests 1 Actions Releases 27 Wiki Activity

Looks like I can round-trip an SSB identity, now.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4733 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams 2024-01-04 01:17:30 +00:00
parent 8ab53f2da3
commit d89a7a5556
6 changed files with 104 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/identity.json
View File

@ -1,5 +1,5 @@
{ {
"type": "tildefriends-app", "type": "tildefriends-app",
"emoji": "🪪", "emoji": "🪪",
"previous": "&XHcSLE9zb9QH0hFGAza/5wuIv8jj2NKARlOvMBpMAzc=.sha256" "previous": "&1RskhkBW1UheJRrw7xcTjS8ELDMnBXNAuKqW5BiT72c=.sha256"
} }

28
apps/identity/app.js
View File

@ -3,33 +3,35 @@ import * as tfrpc from '/tfrpc.js';
tfrpc.register(async function get_private_key(id) { tfrpc.register(async function get_private_key(id) {
return bip39Words(await ssb.getPrivateKey(id)); return bip39Words(await ssb.getPrivateKey(id));
}); });
tfrpc.register(async function add_id(id) {
return await ssb.addIdentity(bip39Bytes(id));
});
async function main() { async function main() {
/*
let words = 'body hair useful camp warm into cause riot two bamboo kick educate dinosaur advice seed type crisp where guilt avocado output rely lunch goddess';
let bytes = base64Decode('GO0Lv5BvcuuJJdHrokHoo0PmCDC/XjO/SZ6H+ddq4UvWd/VPW1RJrjd1aCUIfPIojFXrWMb8R54vVerU2TwjdQ==').slice(0, 32);
let data = {
ids: ids,
words: bip39Words(bytes),
bytes: base64Encode(bip39Bytes(words)),
round: bip39Words((await bip39Bytes(words)).slice(0, 32)),
privates: (await Promise.all(ids.map(id => ssb.getPrivateKey(id)))).map(x => bip39Words(x)),
};*/
let ids = await ssb.getIdentities(); let ids = await ssb.getIdentities();
await app.setDocument(`<body style="color: #fff"> await app.setDocument(`<body style="color: #fff">
<script type="module"> <script type="module">
import * as tfrpc from '/static/tfrpc.js'; import * as tfrpc from '/static/tfrpc.js';
async function export_id(event) { async function export_id(event) {
let id = event.srcElement.innerHTML; let id = event.srcElement.innerHTML;
document.body.insertBefore(document.createTextNode(await tfrpc.rpc.get_private_key(id)), event.srcElement.parentNode.nextSibling); document.body.insertBefore(document.createTextNode(await tfrpc.rpc.get_private_key(id)), event.srcElement.parentNode.nextSibling);
event.srcElement.disabled = true; event.srcElement.disabled = true;
} }
async function add_id(event) {
let id = document.getElementById('add_id').value;
await tfrpc.rpc.add_id(id);
}
window.addEventListener('load', function() { window.addEventListener('load', function() {
for (let button of document.getElementsByTagName('button')) { for (let button of document.getElementsByTagName('button')) {
button.onclick = export_id; if (button.id == "add") {
button.onclick = add_id;
} else {
button.onclick = export_id;
}
} }
}); });
</script>`+ </script>
<input type="text" id="add_id"></input><button id="add">Add ID</button>`+
ids.map(id => `<div><button>${id}</button></div>`).join('\n')+ ids.map(id => `<div><button>${id}</button></div>`).join('\n')+
`</body>`); `</body>`);
} }

9
core/core.js
View File

@ -395,6 +395,15 @@ async function getProcessBlob(blobId, key, options) {
return ssb.createIdentity(process.credentials.session.name); return ssb.createIdentity(process.credentials.session.name);
} }
}; };
imports.ssb.addIdentity = function(id) {
if (process.credentials &&
process.credentials.session &&
process.credentials.session.name) {
return Promise.resolve(imports.core.permissionTest('ssb_id_add')).then(function() {
return ssb.addIdentity(process.credentials.session.name, id);
});
}
};
imports.ssb.getOwnerIdentities = function() { imports.ssb.getOwnerIdentities = function() {
if (options.packageOwner) { if (options.packageOwner) {
return ssb.getIdentities(options.packageOwner); return ssb.getIdentities(options.packageOwner);

4
src/bip39.c
View File

@ -113,10 +113,10 @@ bool tf_bip39_words_to_bytes(const char* words, uint8_t* out_bytes, size_t bytes
} }
uint8_t data[33]; uint8_t data[33];
crypto_hash_sha256(data, bytes, bytes_size); crypto_hash_sha256(data, bytes, 32);
if (data[0] != bytes[32]) if (data[0] != bytes[32])
{ {
tf_printf("%s: Checksum mismatch.\n", __func__); tf_printf("%s: Checksum mismatch (%d vs. %d).\n", __func__, data[0], bytes[32]);
return false; return false;
} }

76
src/ssb.js.c
View File

@ -10,6 +10,7 @@
#include "sodium/crypto_box.h" #include "sodium/crypto_box.h"
#include "sodium/crypto_scalarmult.h" #include "sodium/crypto_scalarmult.h"
#include "sodium/crypto_scalarmult_curve25519.h" #include "sodium/crypto_scalarmult_curve25519.h"
#include "sodium/crypto_scalarmult_ed25519.h"
#include "sodium/crypto_secretbox.h" #include "sodium/crypto_secretbox.h"
#include "sodium/crypto_sign.h" #include "sodium/crypto_sign.h"
#include "sodium/randombytes.h" #include "sodium/randombytes.h"
@ -64,6 +65,80 @@ static JSValue _tf_ssb_createIdentity(JSContext* context, JSValueConst this_val,
return result; return result;
} }
static JSValue _tf_ssb_addIdentity(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
{
tf_ssb_t* ssb = JS_GetOpaque(this_val, _tf_ssb_classId);
JSValue result = JS_UNDEFINED;
if (ssb)
{
const char* user = JS_ToCString(context, argv[0]);
JSValue buffer = JS_UNDEFINED;
size_t length = 0;
uint8_t* array = tf_util_try_get_array_buffer(context, &length, argv[1]);
if (!array)
{
size_t offset;
size_t element_size;
buffer = tf_util_try_get_typed_array_buffer(context, argv[1], &offset, &length, &element_size);
if (!JS_IsException(buffer))
{
array = tf_util_try_get_array_buffer(context, &length, buffer);
}
}
if (array)
{
if (length == crypto_sign_SECRETKEYBYTES / 2)
{
uint8_t public_key[crypto_sign_PUBLICKEYBYTES];
unsigned char seed[crypto_sign_SEEDBYTES];
uint8_t secret_key[crypto_sign_SECRETKEYBYTES] = { 0 };
memcpy(secret_key, array, sizeof(secret_key) / 2);
if (crypto_sign_ed25519_sk_to_seed(seed, secret_key) == 0 &&
crypto_sign_seed_keypair(public_key, secret_key, seed) == 0)
{
char public_key_b64[512];
tf_base64_encode(public_key, sizeof(public_key), public_key_b64, sizeof(public_key_b64));
snprintf(public_key_b64 + strlen(public_key_b64), sizeof(public_key_b64) - strlen(public_key_b64), ".ed25519");
uint8_t combined[crypto_sign_SECRETKEYBYTES];
memcpy(combined, array, length);
memcpy(combined + length, public_key, sizeof(public_key));
char combined_b64[512];
tf_base64_encode(combined, sizeof(combined), combined_b64, sizeof(combined_b64));
snprintf(combined_b64 + strlen(combined_b64), sizeof(combined_b64) - strlen(combined_b64), ".ed25519");
if (tf_ssb_db_identity_add(ssb, user, public_key_b64, combined_b64))
{
result = JS_TRUE;
}
else
{
tf_printf("Unable to add the identity.");
}
}
}
else
{
tf_printf("Unexpected private key size: %zd vs. %d\n", length, crypto_sign_SECRETKEYBYTES);
}
}
else
{
tf_printf("didn't find array\n");
}
JS_FreeValue(context, buffer);
JS_FreeCString(context, user);
}
else
{
tf_printf("no ssb\n");
}
return result;
}
static JSValue _set_server_following_internal(tf_ssb_t* ssb, JSValueConst this_val, JSValue id, JSValue following) static JSValue _set_server_following_internal(tf_ssb_t* ssb, JSValueConst this_val, JSValue id, JSValue following)
{ {
JSContext* context = tf_ssb_get_context(ssb); JSContext* context = tf_ssb_get_context(ssb);
@ -1644,6 +1719,7 @@ void tf_ssb_register(JSContext* context, tf_ssb_t* ssb)
/* Requires an identity. */ /* Requires an identity. */
JS_SetPropertyStr(context, object, "createIdentity", JS_NewCFunction(context, _tf_ssb_createIdentity, "createIdentity", 1)); JS_SetPropertyStr(context, object, "createIdentity", JS_NewCFunction(context, _tf_ssb_createIdentity, "createIdentity", 1));
JS_SetPropertyStr(context, object, "addIdentity", JS_NewCFunction(context, _tf_ssb_addIdentity, "addIdentity", 2));
JS_SetPropertyStr(context, object, "setServerFollowingMe", JS_NewCFunction(context, _tf_ssb_set_server_following_me, "setServerFollowingMe", 3)); JS_SetPropertyStr(context, object, "setServerFollowingMe", JS_NewCFunction(context, _tf_ssb_set_server_following_me, "setServerFollowingMe", 3));
JS_SetPropertyStr(context, object, "getIdentities", JS_NewCFunction(context, _tf_ssb_getIdentities, "getIdentities", 1)); JS_SetPropertyStr(context, object, "getIdentities", JS_NewCFunction(context, _tf_ssb_getIdentities, "getIdentities", 1));
JS_SetPropertyStr(context, object, "getPrivateKey", JS_NewCFunction(context, _tf_ssb_getPrivateKey, "getPrivateKey", 2)); JS_SetPropertyStr(context, object, "getPrivateKey", JS_NewCFunction(context, _tf_ssb_getPrivateKey, "getPrivateKey", 2));

2
src/util.js.c
View File

@ -159,7 +159,7 @@ static JSValue _util_bip39_words(JSContext* context, JSValueConst this_val, int
static JSValue _util_bip39_bytes(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv) static JSValue _util_bip39_bytes(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
{ {
const char* words = JS_ToCString(context, argv[0]); const char* words = JS_ToCString(context, argv[0]);
uint8_t bytes[33] = { 0 }; uint8_t bytes[32] = { 0 };
bool success = tf_bip39_words_to_bytes(words, bytes, sizeof(bytes)); bool success = tf_bip39_words_to_bytes(words, bytes, sizeof(bytes));
JS_FreeCString(context, words); JS_FreeCString(context, words);
if (success) if (success)