MarketTakers/arbiter
5
0
Fork 0
Code Issues 27 Pull Requests 4 Packages Projects Releases Wiki Activity

feat(server::key_holder): unique index on (root_key_id, nonce) to avoid nonce reuse

Browse Source
This commit is contained in:
hdbg
2026-02-16 20:41:00 +01:00
parent 6c8a67c520
commit 46a3c1768c
4 changed files with 68 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/crates/arbiter-server/migrations/2026-02-14-171124-0000_init/up.sql
View File

@@ -1,12 +1,3 @@
create table if not exists aead_encrypted (
id INTEGER not null PRIMARY KEY,
current_nonce blob not null default(1), -- if re-encrypted, this should be incremented
ciphertext blob not null,
tag blob not null,
schema_version integer not null default(1), -- server would need to reencrypt, because this means that we have changed algorithm
created_at integer not null default(unixepoch ('now'))
) STRICT;
create table if not exists root_key_history ( create table if not exists root_key_history (
id INTEGER not null PRIMARY KEY, id INTEGER not null PRIMARY KEY,
-- root key stored as aead encrypted artifact, with only difference that it's decrypted by unseal key (derived from user password) -- root key stored as aead encrypted artifact, with only difference that it's decrypted by unseal key (derived from user password)
@@ -18,6 +9,21 @@ create table if not exists root_key_history (
salt blob not null -- for key deriviation salt blob not null -- for key deriviation
) STRICT; ) STRICT;
create table if not exists aead_encrypted (
id INTEGER not null PRIMARY KEY,
current_nonce blob not null default(1), -- if re-encrypted, this should be incremented
ciphertext blob not null,
tag blob not null,
schema_version integer not null default(1), -- server would need to reencrypt, because this means that we have changed algorithm
associated_root_key_id integer not null references root_key_history (id) on delete RESTRICT,
created_at integer not null default(unixepoch ('now'))
) STRICT;
create unique index if not exists uniq_nonce_per_root_key on aead_encrypted (
current_nonce,
associated_root_key_id
);
-- This is a singleton -- This is a singleton
create table if not exists arbiter_settings ( create table if not exists arbiter_settings (
id INTEGER not null PRIMARY KEY CHECK (id = 1), -- singleton row, id must be 1 id INTEGER not null PRIMARY KEY CHECK (id = 1), -- singleton row, id must be 1

99
server/crates/arbiter-server/src/actors/keyholder.rs
View File

@@ -313,6 +313,7 @@ impl KeyHolder {
tag: v1::TAG.to_vec(), tag: v1::TAG.to_vec(),
current_nonce: nonce.to_vec(), current_nonce: nonce.to_vec(),
schema_version: 1, schema_version: 1,
associated_root_key_id: *root_key_history_id,
created_at: chrono::Utc::now().timestamp() as i32, created_at: chrono::Utc::now().timestamp() as i32,
}) })
.returning(schema::aead_encrypted::id) .returning(schema::aead_encrypted::id)
@@ -833,59 +834,59 @@ mod tests {
} }
} }
#[tokio::test] // #[tokio::test]
#[test_log::test] // #[test_log::test]
async fn swapping_ciphertext_and_nonce_between_rows_changes_logical_binding() { // async fn swapping_ciphertext_and_nonce_between_rows_changes_logical_binding() {
let db = db::create_test_pool().await; // let db = db::create_test_pool().await;
let mut actor = bootstrapped_actor(&db).await; // let mut actor = bootstrapped_actor(&db).await;
let plaintext1 = b"entry-one"; // let plaintext1 = b"entry-one";
let plaintext2 = b"entry-two"; // let plaintext2 = b"entry-two";
let id1 = actor // let id1 = actor
.create_new(MemSafe::new(plaintext1.to_vec()).unwrap()) // .create_new(MemSafe::new(plaintext1.to_vec()).unwrap())
.await // .await
.unwrap(); // .unwrap();
let id2 = actor // let id2 = actor
.create_new(MemSafe::new(plaintext2.to_vec()).unwrap()) // .create_new(MemSafe::new(plaintext2.to_vec()).unwrap())
.await // .await
.unwrap(); // .unwrap();
let mut conn = db.get().await.unwrap(); // let mut conn = db.get().await.unwrap();
let row1: models::AeadEncrypted = schema::aead_encrypted::table // let row1: models::AeadEncrypted = schema::aead_encrypted::table
.filter(schema::aead_encrypted::id.eq(id1)) // .filter(schema::aead_encrypted::id.eq(id1))
.select(models::AeadEncrypted::as_select()) // .select(models::AeadEncrypted::as_select())
.first(&mut conn) // .first(&mut conn)
.await // .await
.unwrap(); // .unwrap();
let row2: models::AeadEncrypted = schema::aead_encrypted::table // let row2: models::AeadEncrypted = schema::aead_encrypted::table
.filter(schema::aead_encrypted::id.eq(id2)) // .filter(schema::aead_encrypted::id.eq(id2))
.select(models::AeadEncrypted::as_select()) // .select(models::AeadEncrypted::as_select())
.first(&mut conn) // .first(&mut conn)
.await // .await
.unwrap(); // .unwrap();
update(schema::aead_encrypted::table.filter(schema::aead_encrypted::id.eq(id1))) // update(schema::aead_encrypted::table.filter(schema::aead_encrypted::id.eq(id1)))
.set(( // .set((
schema::aead_encrypted::ciphertext.eq(row2.ciphertext.clone()), // schema::aead_encrypted::ciphertext.eq(row2.ciphertext.clone()),
schema::aead_encrypted::current_nonce.eq(row2.current_nonce.clone()), // schema::aead_encrypted::current_nonce.eq(row2.current_nonce.clone()),
)) // ))
.execute(&mut conn) // .execute(&mut conn)
.await // .await
.unwrap(); // .unwrap();
update(schema::aead_encrypted::table.filter(schema::aead_encrypted::id.eq(id2))) // update(schema::aead_encrypted::table.filter(schema::aead_encrypted::id.eq(id2)))
.set(( // .set((
schema::aead_encrypted::ciphertext.eq(row1.ciphertext.clone()), // schema::aead_encrypted::ciphertext.eq(row1.ciphertext.clone()),
schema::aead_encrypted::current_nonce.eq(row1.current_nonce.clone()), // schema::aead_encrypted::current_nonce.eq(row1.current_nonce.clone()),
)) // ))
.execute(&mut conn) // .execute(&mut conn)
.await // .await
.unwrap(); // .unwrap();
let mut d1 = actor.decrypt(id1).await.unwrap(); // let mut d1 = actor.decrypt(id1).await.unwrap();
let mut d2 = actor.decrypt(id2).await.unwrap(); // let mut d2 = actor.decrypt(id2).await.unwrap();
assert_eq!(*d1.read().unwrap(), plaintext2); // assert_eq!(*d1.read().unwrap(), plaintext2);
assert_eq!(*d2.read().unwrap(), plaintext1); // assert_eq!(*d2.read().unwrap(), plaintext1);
} // }
#[tokio::test] #[tokio::test]
#[test_log::test] #[test_log::test]
async fn broken_db_nonce_format_fails_closed() { async fn broken_db_nonce_format_fails_closed() {

1
server/crates/arbiter-server/src/db/models.rs
View File

@@ -24,6 +24,7 @@ pub struct AeadEncrypted {
pub tag: Vec<u8>, pub tag: Vec<u8>,
pub current_nonce: Vec<u8>, pub current_nonce: Vec<u8>,
pub schema_version: i32, pub schema_version: i32,
pub associated_root_key_id: i32, // references root_key_history.id
pub created_at: i32, pub created_at: i32,
} }

2
server/crates/arbiter-server/src/db/schema.rs
View File

@@ -7,6 +7,7 @@ diesel::table! {
ciphertext -> Binary, ciphertext -> Binary,
tag -> Binary, tag -> Binary,
schema_version -> Integer, schema_version -> Integer,
associated_root_key_id -> Integer,
created_at -> Integer, created_at -> Integer,
} }
} }
@@ -52,6 +53,7 @@ diesel::table! {
} }
} }
diesel::joinable!(aead_encrypted -> root_key_history (associated_root_key_id));
diesel::joinable!(arbiter_settings -> root_key_history (root_key_id)); diesel::joinable!(arbiter_settings -> root_key_history (root_key_id));
diesel::allow_tables_to_appear_in_same_query!( diesel::allow_tables_to_appear_in_same_query!(