mirror of
https://github.com/narrrl/proton-drive-linux.git
synced 2026-11-19 01:55:04 +01:00
implemented shared id permissions
This commit is contained in:
1 parent
7de667b386
commit
551e14b644
8 files changed
+1329
-90
No files matched your search
@@ -177,14 +177,24 @@ impl Db {
|
||||
.collect())
|
||||
}
|
||||
|
||||
/// Persist the synthetic root and its Viewer authority only when its
|
||||
/// presentation state changed. Returning `false` guarantees no node/FTS
|
||||
/// write occurred, which keeps every cached root lookup O(1).
|
||||
pub fn ensure_virtual_root(&self, node: &Node) -> Result<bool> {
|
||||
/// Atomically publish the synthetic root's pinned name, node/FTS state, and
|
||||
/// Viewer authority.
|
||||
///
|
||||
/// The pin is inserted last so any failure there rolls back the node and
|
||||
/// its descendant FTS updates as well as the access row. Returning `false`
|
||||
/// guarantees no write occurred, which keeps cached root lookups O(1).
|
||||
pub fn publish_virtual_root(&self, pinned_name_key: &str, node: &Node) -> Result<bool> {
|
||||
let uid = node.uid.to_string();
|
||||
let desired_parent = node.parent_uid.as_ref().map(NodeUid::to_string);
|
||||
let mut conn = self.conn.lock();
|
||||
let tx = conn.transaction()?;
|
||||
let pinned_name: Option<String> = tx
|
||||
.query_row(
|
||||
"SELECT value FROM sync_state WHERE key = ?1",
|
||||
params![pinned_name_key],
|
||||
|row| row.get(0),
|
||||
)
|
||||
.optional()?;
|
||||
let stored: Option<(Option<String>, String, i64, i64)> = tx
|
||||
.query_row(
|
||||
"SELECT parent_uid, name, is_dir, trashed FROM nodes WHERE uid = ?1",
|
||||
@@ -204,17 +214,19 @@ impl Db {
|
||||
&& name == node.name
|
||||
&& is_dir == 1
|
||||
&& trashed == node.trashed as i64
|
||||
}) && access.as_deref() == Some(Access::Viewer.as_db_str());
|
||||
}) && access.as_deref() == Some(Access::Viewer.as_db_str())
|
||||
&& pinned_name.is_some();
|
||||
if unchanged {
|
||||
tx.commit()?;
|
||||
return Ok(false);
|
||||
}
|
||||
tx.execute(
|
||||
"INSERT INTO share_access (root_uid, access) VALUES (?1, ?2)
|
||||
ON CONFLICT(root_uid) DO UPDATE SET access = excluded.access",
|
||||
params![uid, Access::Viewer.as_db_str()],
|
||||
)?;
|
||||
upsert_share_access_tx(&tx, &uid, Access::Viewer)?;
|
||||
upsert_node_tx(&tx, node)?;
|
||||
tx.execute(
|
||||
"INSERT INTO sync_state (key, value) VALUES (?1, ?2)
|
||||
ON CONFLICT(key) DO NOTHING",
|
||||
params![pinned_name_key, node.name],
|
||||
)?;
|
||||
tx.commit()?;
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
@@ -174,6 +174,28 @@ impl Db {
|
||||
Ok(map)
|
||||
}
|
||||
|
||||
/// Whether `uid` is represented by a mirror location.
|
||||
///
|
||||
/// An on-demand location proves residency through its live inode state.
|
||||
/// Mirror locations have no FUSE state, so their folder root comes from
|
||||
/// `sync_folder` and descendants come from the last successful
|
||||
/// `sync_entry` baseline.
|
||||
pub fn mirror_contains_uid(&self, uid: &str) -> Result<bool> {
|
||||
let conn = self.conn.lock();
|
||||
conn.query_row(
|
||||
"SELECT EXISTS(
|
||||
SELECT 1
|
||||
FROM sync_folder AS folder
|
||||
LEFT JOIN sync_entry AS entry ON entry.folder_id = folder.id
|
||||
WHERE folder.mode = 'mirror'
|
||||
AND (folder.remote_uid = ?1 OR entry.remote_uid = ?1)
|
||||
)",
|
||||
params![uid],
|
||||
|row| row.get(0),
|
||||
)
|
||||
.map_err(Into::into)
|
||||
}
|
||||
|
||||
/// Insert or replace one baseline row.
|
||||
pub fn sync_entry_upsert(&self, folder_id: i64, e: &StoredSyncEntry) -> Result<()> {
|
||||
let conn = self.conn.lock();
|
||||
|
||||
@@ -769,12 +769,18 @@ fn hidden_virtual_root_removes_descendants_from_fts_and_restores_them() {
|
||||
"Findable descendant",
|
||||
);
|
||||
db.upsert_node(&own_root).unwrap();
|
||||
assert!(db.ensure_virtual_root(&virtual_root).unwrap());
|
||||
assert!(
|
||||
db.publish_virtual_root("shared_with_me_name", &virtual_root)
|
||||
.unwrap()
|
||||
);
|
||||
db.upsert_nodes(&[shared, child.clone()]).unwrap();
|
||||
assert_eq!(db.search("Findable", 10).unwrap().len(), 1);
|
||||
|
||||
virtual_root.trashed = true;
|
||||
assert!(db.ensure_virtual_root(&virtual_root).unwrap());
|
||||
assert!(
|
||||
db.publish_virtual_root("shared_with_me_name", &virtual_root)
|
||||
.unwrap()
|
||||
);
|
||||
assert!(db.search("Findable", 10).unwrap().is_empty());
|
||||
assert!(
|
||||
!db.node_by_uid(&child.uid.to_string())
|
||||
@@ -785,10 +791,16 @@ fn hidden_virtual_root_removes_descendants_from_fts_and_restores_them() {
|
||||
);
|
||||
|
||||
virtual_root.trashed = false;
|
||||
assert!(db.ensure_virtual_root(&virtual_root).unwrap());
|
||||
assert!(
|
||||
db.publish_virtual_root("shared_with_me_name", &virtual_root)
|
||||
.unwrap()
|
||||
);
|
||||
assert_eq!(db.search("Findable", 10).unwrap().len(), 1);
|
||||
let before = db.with_conn(|conn| Ok(conn.total_changes())).unwrap();
|
||||
assert!(!db.ensure_virtual_root(&virtual_root).unwrap());
|
||||
assert!(
|
||||
!db.publish_virtual_root("shared_with_me_name", &virtual_root)
|
||||
.unwrap()
|
||||
);
|
||||
let after = db.with_conn(|conn| Ok(conn.total_changes())).unwrap();
|
||||
assert_eq!(
|
||||
before, after,
|
||||
@@ -1941,6 +1953,48 @@ fn pending_mode_is_queued_until_the_mode_is_reached() {
|
||||
assert_eq!(folder.pending_mode, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn mirror_uid_lookup_covers_the_root_and_synced_descendants_only() {
|
||||
let db = Db::open_in_memory().unwrap();
|
||||
let mirror = db
|
||||
.sync_folder_add("/home/me/Mirror", "vol~mirror-root", "share")
|
||||
.unwrap();
|
||||
db.sync_entry_upsert(
|
||||
mirror,
|
||||
&StoredSyncEntry {
|
||||
rel_path: "nested/file.txt".into(),
|
||||
remote_uid: Some("vol~mirror-file".into()),
|
||||
local_mtime: 1,
|
||||
local_size: 2,
|
||||
remote_rev: Some("3".into()),
|
||||
remote_hash: Some("2".into()),
|
||||
},
|
||||
)
|
||||
.unwrap();
|
||||
let ondemand = db
|
||||
.sync_folder_add("/home/me/OnDemand", "vol~ondemand-root", "share")
|
||||
.unwrap();
|
||||
db.sync_folder_set_mode(ondemand, "ondemand").unwrap();
|
||||
db.sync_entry_upsert(
|
||||
ondemand,
|
||||
&StoredSyncEntry {
|
||||
rel_path: "stale.txt".into(),
|
||||
remote_uid: Some("vol~ondemand-stale".into()),
|
||||
local_mtime: 1,
|
||||
local_size: 2,
|
||||
remote_rev: Some("3".into()),
|
||||
remote_hash: Some("2".into()),
|
||||
},
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
assert!(db.mirror_contains_uid("vol~mirror-root").unwrap());
|
||||
assert!(db.mirror_contains_uid("vol~mirror-file").unwrap());
|
||||
assert!(!db.mirror_contains_uid("vol~ondemand-root").unwrap());
|
||||
assert!(!db.mirror_contains_uid("vol~ondemand-stale").unwrap());
|
||||
assert!(!db.mirror_contains_uid("vol~missing").unwrap());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn node_path_resolves_relative_to_a_sync_root_uid() {
|
||||
let db = Db::open_in_memory().unwrap();
|
||||
|
||||
Reference in new issue
Block a user