fix: address minor issues for v0.9.1 preparation (K-01 mount verification, path validation, legacy-names warning, V1-V2 migration docs)

2026-09-20 17:08:44 +02:00
parent 3693e03494
commit a252393f96
11 changed files with 379 additions and 5 deletions
@@ -127,3 +127,200 @@ fn test_storage_create_and_rename_reject_invalid_names() {

    let _ = std::fs::remove_file(&path);
 }
+
+#[tokio::test]
+async fn test_carrier_fs_rejects_invalid_names() {
+    use dav_server::davpath::DavPath;
+    use dav_server::fs::{DavFileSystem, FsError, OpenOptions};
+    use rand::rngs::OsRng;
+    use rand::RngCore;
+    use sanctum::carrier::CarrierFs;
+    use sanctum::crypto::{
+        derive_kek, generate_dek, generate_salt, wrap_slot0_payload, wrap_slot1_payload, KdfParams,
+        MIN_MEMORY_COST_KIB, MIN_TIME_COST,
+    };
+    use sanctum::storage::Database;
+    use std::sync::Arc;
+
+    let mut path = std::env::temp_dir();
+    let id: u64 = OsRng.next_u64();
+    path.push(format!("sanctum_test_carrier_pathval_{}.sanctum", id));
+    if path.exists() {
+        let _ = std::fs::remove_file(&path);
+    }
+
+    let carrier_size_bytes = 10 * 1024 * 1024;
+    let carrier_name = "system_backup.dat";
+    let pass_decoy = "DecoyPassword2026!";
+    let pass_hidden = "SuperSecretHiddenPassword2026!";
+
+    let kdf_params = KdfParams {
+        memory_cost: MIN_MEMORY_COST_KIB,
+        time_cost: MIN_TIME_COST,
+        parallelism: 1,
+    };
+
+    let salt_0 = generate_salt();
+    let kek_0 = derive_kek(pass_decoy, &salt_0, &kdf_params).unwrap();
+    let dek_0 = generate_dek();
+
+    let salt_1 = generate_salt();
+    let kek_1 = derive_kek(pass_hidden, &salt_1, &kdf_params).unwrap();
+    let dek_1 = generate_dek();
+
+    let carrier_node_id = 3i64;
+    let (wrapped_0, nonce_0, tag_0) = wrap_slot0_payload(&kek_0, &dek_0, carrier_node_id).unwrap();
+    let (wrapped_1, nonce_1, tag_1) =
+        wrap_slot1_payload(&kek_1, &dek_1, &dek_0, carrier_node_id).unwrap();
+
+    let db = Database::open(&path).expect("Open database");
+
+    db.init_schema_with_carrier(
+        &salt_0,
+        &kdf_params,
+        &wrapped_0,
+        &nonce_0,
+        &tag_0,
+        Some((
+            carrier_name,
+            carrier_size_bytes,
+            &salt_1,
+            &kdf_params,
+            &wrapped_1,
+            &nonce_1,
+            &tag_1,
+            &dek_0,
+            &dek_1,
+        )),
+    )
+    .expect("Init carrier schema");
+
+    let cfs = CarrierFs::load(
+        db.clone(),
+        carrier_node_id,
+        Arc::new(dek_0),
+        Arc::new(dek_1),
+        3,
+        false,
+    )
+    .expect("Load CarrierFs");
+
+    // 1. create_dir mit ungültigem Namen (Windows-Reservierung CON, PRN)
+    let p_con = DavPath::new("/CON").unwrap();
+    assert_eq!(cfs.create_dir(&p_con).await, Err(FsError::Forbidden));
+
+    let p_aux = DavPath::new("/aux.txt").unwrap();
+    assert_eq!(cfs.create_dir(&p_aux).await, Err(FsError::Forbidden));
+
+    // 2. open (create) mit ungültigem Namen
+    let p_nul = DavPath::new("/NUL").unwrap();
+    let mut opt_create = OpenOptions::default();
+    opt_create.create = true;
+    opt_create.write = true;
+    assert_eq!(
+        cfs.open(&p_nul, opt_create.clone()).await.err(),
+        Some(FsError::Forbidden)
+    );
+
+    let p_ctrl = DavPath::new("/prn.pdf").unwrap();
+    assert_eq!(
+        cfs.open(&p_ctrl, opt_create.clone()).await.err(),
+        Some(FsError::Forbidden)
+    );
+
+    // 3. Gültige Datei erstellen
+    let p_valid = DavPath::new("/valid.txt").unwrap();
+    let file = cfs.open(&p_valid, opt_create).await;
+    assert!(file.is_ok(), "Valid file should be created");
+    drop(file);
+
+    // 4. rename mit ungültigem Zielnamen
+    let p_com1 = DavPath::new("/COM1.txt").unwrap();
+    assert_eq!(cfs.rename(&p_valid, &p_com1).await, Err(FsError::Forbidden));
+
+    // 5. copy mit ungültigem Zielnamen
+    let p_lpt1 = DavPath::new("/LPT1").unwrap();
+    assert_eq!(cfs.copy(&p_valid, &p_lpt1).await, Err(FsError::Forbidden));
+
+    let _ = std::fs::remove_file(&path);
+}
+
+#[tokio::test]
+async fn test_vfs_rejects_invalid_names() {
+    use dav_server::davpath::DavPath;
+    use dav_server::fs::{DavFileSystem, FsError, OpenOptions};
+    use rand::rngs::OsRng;
+    use rand::RngCore;
+    use sanctum::crypto::{
+        derive_kek, generate_dek, generate_salt, wrap_dek, KdfParams, FORMAT_VERSION,
+        MIN_MEMORY_COST_KIB, MIN_TIME_COST,
+    };
+    use sanctum::storage::Database;
+    use sanctum::vfs::SanctumFs;
+
+    let mut path = std::env::temp_dir();
+    let id: u64 = OsRng.next_u64();
+    path.push(format!("sanctum_test_vfs_pathval_{}.sanctum", id));
+    if path.exists() {
+        let _ = std::fs::remove_file(&path);
+    }
+
+    let password = "TestPassword1234!";
+    let kdf_params = KdfParams {
+        memory_cost: MIN_MEMORY_COST_KIB,
+        time_cost: MIN_TIME_COST,
+        parallelism: 1,
+    };
+    let salt = generate_salt();
+    let kek = derive_kek(password, &salt, &kdf_params).unwrap();
+    let dek = generate_dek();
+    let (wrapped, nonce, tag) = wrap_dek(&kek, &dek).unwrap();
+
+    let db = Database::open(&path).unwrap();
+    db.init_schema(&salt, &kdf_params, &wrapped, &nonce, &tag)
+        .unwrap();
+    db.set_active_slot_and_dek(0, dek.clone());
+
+    let fs = SanctumFs::new(db.clone(), dek, FORMAT_VERSION);
+
+    // 1. create_dir mit ungültigem Namen
+    let p_con = DavPath::new("/CON").unwrap();
+    assert_eq!(fs.create_dir(&p_con).await, Err(FsError::Forbidden));
+
+    let p_aux = DavPath::new("/aux.txt").unwrap();
+    assert_eq!(fs.create_dir(&p_aux).await, Err(FsError::Forbidden));
+
+    // 2. open (create) mit ungültigem Namen
+    let p_nul = DavPath::new("/NUL").unwrap();
+    let mut opt_create = OpenOptions::default();
+    opt_create.create = true;
+    opt_create.write = true;
+    assert_eq!(
+        fs.open(&p_nul, opt_create.clone()).await.err(),
+        Some(FsError::Forbidden)
+    );
+
+    let p_prn = DavPath::new("/prn.pdf").unwrap();
+    assert_eq!(
+        fs.open(&p_prn, opt_create.clone()).await.err(),
+        Some(FsError::Forbidden)
+    );
+
+    // 3. Gültige Datei erstellen
+    let p_valid = DavPath::new("/valid.txt").unwrap();
+    let file = fs.open(&p_valid, opt_create).await;
+    assert!(file.is_ok(), "Valid file should be created");
+    drop(file);
+
+    // 4. rename mit ungültigem Zielnamen
+    let p_com1 = DavPath::new("/COM1.txt").unwrap();
+    assert_eq!(fs.rename(&p_valid, &p_com1).await, Err(FsError::Forbidden));
+
+    // 5. copy mit ungültigem Zielnamen
+    let p_lpt1 = DavPath::new("/LPT1").unwrap();
+    assert_eq!(fs.copy(&p_valid, &p_lpt1).await, Err(FsError::Forbidden));
+
+    drop(fs);
+    drop(db);
+    let _ = std::fs::remove_file(&path);
+}