CalvinBackup/notesnook-sync-server_customPrivateV1
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook-sync-server.git synced 2026-02-12 11:12:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

inbox: send salt in encrypted inbox item (#57)

Browse Source
This commit is contained in:
01zulfi
2025-10-13 11:31:12 +05:00
committed by GitHub
parent d1421d640f
commit a8cc02ef1a
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Notesnook.API/Models/InboxSyncItem.cs
View File

@@ -35,6 +35,15 @@ namespace Notesnook.API.Models
{ {
get; set; get; set;
} }
[DataMember(Name = "salt")]
[JsonPropertyName("salt")]
[MessagePack.Key("salt")]
[Required]
public string Salt
{
get; set;
}
} }
[MessagePack.MessagePackObject] [MessagePack.MessagePackObject]

19
Notesnook.Inbox.API/src/index.ts
View File

@@ -30,16 +30,26 @@ const RawInboxItemSchema = z.object({
interface EncryptedInboxItem { interface EncryptedInboxItem {
v: 1; v: 1;
key: Omit<EncryptedInboxItem, "key" | "iv" | "v">; key: Omit<EncryptedInboxItem, "key" | "iv" | "v" | "salt">;
iv: string; iv: string;
alg: string; alg: string;
cipher: string; cipher: string;
length: number; length: number;
salt: string;
} }
function encrypt(rawData: string, publicKey: string): EncryptedInboxItem { function encrypt(rawData: string, publicKey: string): EncryptedInboxItem {
try { try {
const password = sodium.crypto_aead_xchacha20poly1305_ietf_keygen(); const password = sodium.crypto_aead_xchacha20poly1305_ietf_keygen();
const saltBytes = sodium.randombytes_buf(sodium.crypto_pwhash_SALTBYTES);
const key = sodium.crypto_pwhash(
sodium.crypto_aead_xchacha20poly1305_ietf_KEYBYTES,
password,
saltBytes,
3, // operations limit
1024 * 1024 * 8, // memory limit (8MB)
sodium.crypto_pwhash_ALG_ARGON2I13
);
const nonce = sodium.randombytes_buf( const nonce = sodium.randombytes_buf(
sodium.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES sodium.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
); );
@@ -49,19 +59,19 @@ function encrypt(rawData: string, publicKey: string): EncryptedInboxItem {
null, null,
null, null,
nonce, nonce,
password key
); );
const inboxPublicKey = sodium.from_base64( const inboxPublicKey = sodium.from_base64(
publicKey, publicKey,
base64_variants.URLSAFE_NO_PADDING base64_variants.URLSAFE_NO_PADDING
); );
const encryptedPassword = sodium.crypto_box_seal(password, inboxPublicKey); const encryptedKey = sodium.crypto_box_seal(key, inboxPublicKey);
return { return {
v: 1, v: 1,
key: { key: {
cipher: sodium.to_base64( cipher: sodium.to_base64(
encryptedPassword, encryptedKey,
base64_variants.URLSAFE_NO_PADDING base64_variants.URLSAFE_NO_PADDING
), ),
alg: `xsal-x25519-${base64_variants.URLSAFE_NO_PADDING}`, alg: `xsal-x25519-${base64_variants.URLSAFE_NO_PADDING}`,
@@ -71,6 +81,7 @@ function encrypt(rawData: string, publicKey: string): EncryptedInboxItem {
alg: `xcha-argon2i13-${base64_variants.URLSAFE_NO_PADDING}`, alg: `xcha-argon2i13-${base64_variants.URLSAFE_NO_PADDING}`,
cipher: sodium.to_base64(cipher, base64_variants.URLSAFE_NO_PADDING), cipher: sodium.to_base64(cipher, base64_variants.URLSAFE_NO_PADDING),
length: data.length, length: data.length,
salt: sodium.to_base64(saltBytes, base64_variants.URLSAFE_NO_PADDING),
}; };
} catch (error) { } catch (error) {
throw new Error(`encryption failed: ${error}`); throw new Error(`encryption failed: ${error}`);