cory/tildefriends
4
5
Fork 1
Code Issues 29 Pull Requests 1 Actions Releases 26 Wiki Activity

Tidied up getting an auth key slightly.

Browse Source
This commit is contained in:
Cory McWilliams 2024-04-01 12:53:00 -04:00
parent b04eccdbda
commit 3fa1c6c420
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/httpd.js.c
View File

@ -1127,27 +1127,24 @@ static void _visit_auth_identity(const char* identity, void* user_data)
} }
} }
static const char* _make_session_jwt(tf_ssb_t* ssb, const char* name) static bool _get_auth_private_key(tf_ssb_t* ssb, uint8_t* out_private_key)
{ {
char id[k_id_base64_len] = { 0 }; char id[k_id_base64_len] = { 0 };
tf_ssb_db_identity_visit(ssb, ":auth", _visit_auth_identity, id); tf_ssb_db_identity_visit(ssb, ":auth", _visit_auth_identity, id);
if (!*id) if (*id)
{ {
uint8_t public_key[crypto_sign_PUBLICKEYBYTES]; return tf_ssb_db_identity_get_private_key(ssb, ":auth", id, out_private_key, crypto_sign_SECRETKEYBYTES);
uint8_t private_key[crypto_sign_SECRETKEYBYTES]; }
if (tf_ssb_db_identity_create(ssb, ":auth", public_key, private_key)) else
{ {
tf_ssb_id_bin_to_str(id, sizeof(id), public_key); return tf_ssb_db_identity_create(ssb, ":auth", out_private_key + crypto_sign_PUBLICKEYBYTES, out_private_key);
}
} }
}
if (!*id) static const char* _make_session_jwt(tf_ssb_t* ssb, const char* name)
{ {
return NULL; uint8_t private_key[crypto_sign_SECRETKEYBYTES] = { 0 };
} if (!_get_auth_private_key(ssb, private_key))
uint8_t private_key[crypto_sign_SECRETKEYBYTES];
if (!tf_ssb_db_identity_get_private_key(ssb, ":auth", id, private_key, sizeof(private_key)))
{ {
return NULL; return NULL;
} }
@ -1174,6 +1171,7 @@ static const char* _make_session_jwt(tf_ssb_t* ssb, const char* name)
uint8_t signature[crypto_sign_BYTES]; uint8_t signature[crypto_sign_BYTES];
unsigned long long signature_length = 0; unsigned long long signature_length = 0;
char signature_base64[256] = { 0 }; char signature_base64[256] = { 0 };
if (crypto_sign_detached(signature, &signature_length, (const uint8_t*)payload_base64, strlen(payload_base64), private_key) == 0) if (crypto_sign_detached(signature, &signature_length, (const uint8_t*)payload_base64, strlen(payload_base64), private_key) == 0)
{ {
sodium_bin2base64(signature_base64, sizeof(signature_base64), signature, sizeof(signature), sodium_base64_VARIANT_URLSAFE_NO_PADDING); sodium_bin2base64(signature_base64, sizeof(signature_base64), signature, sizeof(signature), sodium_base64_VARIANT_URLSAFE_NO_PADDING);

6
src/ssb.db.c
View File

@ -1059,9 +1059,15 @@ bool tf_ssb_db_identity_create(tf_ssb_t* ssb, const char* user, uint8_t* out_pub
char private[512]; char private[512];
tf_ssb_generate_keys_buffer(public, sizeof(public), private, sizeof(private)); tf_ssb_generate_keys_buffer(public, sizeof(public), private, sizeof(private));
if (tf_ssb_db_identity_add(ssb, user, public, private)) if (tf_ssb_db_identity_add(ssb, user, public, private))
{
if (out_public_key)
{ {
tf_ssb_id_str_to_bin(out_public_key, public); tf_ssb_id_str_to_bin(out_public_key, public);
}
if (out_private_key)
{
tf_ssb_id_str_to_bin(out_private_key, private); tf_ssb_id_str_to_bin(out_private_key, private);
}
return true; return true;
} }
} }