mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-09-03 01:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(mobile): add embedded runtime and managed network updates (#2532)

Browse Source 
* feat(mobile): add embedded iOS runtime API

Add a thin panic-safe C ABI crate for embedding no-TUN instances
on iOS. Expose lifecycle, status, JSON-RPC, string ownership, and
error handling.

Build device and simulator XCFramework static libraries on macOS.
Add exact named-instance deletion to the iOS and Android wrappers.
Cover wrapper lifecycle and the port-forward patch flow on host
targets.

* fix(gateway): recover TCP port-forward listeners

Release an unusable TCP port-forward listener after an accept
failure. Retry binding until the forward is cancelled. Keep the old
listener released while rebinding so mobile sockets can recover.

Expose opt-in iOS diagnostics for listener and connection events.
Trace configuration removal and adapter shutdown. Add tests for
recovery, release-before-rebind, and cancellation.

* feat(web): persist incremental managed config patches

Add a revision-CAS PATCH contract for managed configs while keeping
the existing Full PUT path for compatibility and recovery.

Apply Full and Patch mutations with their revision in one SQLite
transaction. Reject ownership conflicts and invalidate revisions on
alternate web-owned writes.

Document limits, failure semantics, rollout order, and verification.
Cover delta updates, conflicts, idempotency, and transaction rollback.

* feat(web): apply managed config patches to live sessions

Carry Patch fences and touched instance IDs into live sessions.
Reconcile only those instances when the applied revision matches the
Patch base. Fall back to Full reconciliation for gaps and restarts.

Invalidate the applied revision around every direct runtime mutation.
Fence revision advancement with the runtime cache epoch so stale
reconcile rounds cannot overwrite a newer invalidation.

Require deletion responses to confirm each requested instance before
advancing the revision. Raise the managed PUT and PATCH body limit to
32 MiB and return typed conflicts for publisher recovery.

* fix(core): retry transient accepted TCP errors

Keep TCP tunnel listeners alive when an accepted socket fails during
upgrade with a retryable connection-state error.

Share the retryable I/O classifier with the socket listener. Cover a
rejected connection followed by success and propagation of permanent
errors.

* feat(core): add internal Peer Relay edge projection

Derive the local advertised OSPF row from physical adjacency and transport-authenticated credential relay coverage. Keep full local adjacency only in the temporary SPF snapshot so direct destinations retain a fallback route.

Leave Peer Relay disabled at the public configuration seam. A follow-up change can expose the preference without coupling route projection to credential reauthorization.

feat(config): expose Peer Relay routing preference

Add prefer_peer_relay to public protobuf, TOML, management patch, and
hosted runtime surfaces.

Read the preference from live peer context so runtime config updates take
effect. Refresh authenticated peer metadata when the option is enabled.

Cover dynamic enable and disable in a five-node, dual-admin credential
topology, including forwarded relay coverage and local fallback.
This commit is contained in:
KKRainbow
2026-08-28 00:43:26 +08:00
committed by GitHub
parent abf03ca521
commit 4a10d1c2b9
38 changed files with 5614 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier-web/src/db/mod.rs
+541 -133
View File
@@ -7,10 +7,11 @@ use easytier_core::management::remote_client::{ListNetworkProps, Storage};
use entity::user_running_network_configs;
use sea_orm::{
ColumnTrait as _, DatabaseConnection, DbErr, EntityTrait, QueryFilter as _, Set,
SqlxSqliteConnector, TransactionTrait as _, prelude::Expr, sea_query::OnConflict,
SqlxSqliteConnector, TransactionTrait as _, sea_query::OnConflict,
};
use sea_orm_migration::MigratorTrait as _;
use sqlx::{Sqlite, SqlitePool, migrate::MigrateDatabase as _, types::chrono};
use std::collections::{HashMap, HashSet};
#[cfg(unix)]
use std::os::unix::fs::PermissionsExt as _;
use uuid::Uuid;
@@ -20,6 +21,179 @@ use async_trait::async_trait;
pub type UserIdInDb = i32;
#[derive(Debug)]
pub(crate) struct ManagedConfigUpsert {
pub instance_id: Uuid,
pub network_config: NetworkConfig,
}
#[derive(Debug, Clone)]
pub(crate) enum ManagedConfigExpectedRevision {
Any,
Exact(Option<String>),
}
#[derive(Debug)]
pub(crate) enum ManagedConfigUpdate {
Full {
upserts: Vec<ManagedConfigUpsert>,
target_revision: Option<String>,
expected_revision: ManagedConfigExpectedRevision,
},
Patch {
upserts: Vec<ManagedConfigUpsert>,
delete_instance_ids: Vec<Uuid>,
target_revision: String,
expected_revision: String,
},
}
#[derive(Debug, PartialEq, Eq)]
pub(crate) enum ManagedConfigApplyResult {
Applied {
deleted_web_instance_ids: Vec<Uuid>,
},
AlreadyApplied,
RevisionConflict {
expected: Option<String>,
current: Option<String>,
},
OwnershipConflict {
instance_id: Uuid,
},
}
fn sqlx_db_error(error: sqlx::Error) -> DbErr {
DbErr::Custom(error.to_string())
}
async fn read_managed_config_revision(
transaction: &mut sqlx::Transaction<'_, Sqlite>,
user_id: UserIdInDb,
device_id: Uuid,
) -> Result<Option<String>, DbErr> {
sqlx::query_scalar(
r#"
SELECT config_revision
FROM managed_config_revisions
WHERE user_id = ? AND device_id = ?
"#,
)
.bind(user_id)
.bind(device_id.to_string())
.fetch_optional(&mut **transaction)
.await
.map_err(sqlx_db_error)
}
async fn clear_managed_config_revision(
transaction: &mut sqlx::Transaction<'_, Sqlite>,
user_id: UserIdInDb,
device_id: Uuid,
) -> Result<(), DbErr> {
sqlx::query(
r#"
DELETE FROM managed_config_revisions
WHERE user_id = ? AND device_id = ?
"#,
)
.bind(user_id)
.bind(device_id.to_string())
.execute(&mut **transaction)
.await
.map_err(sqlx_db_error)?;
Ok(())
}
async fn write_managed_config_revision(
transaction: &mut sqlx::Transaction<'_, Sqlite>,
user_id: UserIdInDb,
device_id: Uuid,
config_revision: &str,
) -> Result<(), DbErr> {
let now = chrono::Local::now().fixed_offset();
sqlx::query(
r#"
INSERT INTO managed_config_revisions (
user_id, device_id, config_revision, create_time, update_time
) VALUES (?, ?, ?, ?, ?)
ON CONFLICT(user_id, device_id) DO UPDATE SET
config_revision = excluded.config_revision,
update_time = excluded.update_time
"#,
)
.bind(user_id)
.bind(device_id.to_string())
.bind(config_revision)
.bind(now)
.bind(now)
.execute(&mut **transaction)
.await
.map_err(sqlx_db_error)?;
Ok(())
}
async fn read_config_source(
transaction: &mut sqlx::Transaction<'_, Sqlite>,
user_id: UserIdInDb,
device_id: Uuid,
instance_id: Uuid,
) -> Result<Option<String>, DbErr> {
sqlx::query_scalar(
r#"
SELECT source
FROM user_running_network_configs
WHERE user_id = ? AND device_id = ? AND network_instance_id = ?
"#,
)
.bind(user_id)
.bind(device_id.to_string())
.bind(instance_id.to_string())
.fetch_optional(&mut **transaction)
.await
.map_err(sqlx_db_error)
}
async fn upsert_network_config(
transaction: &mut sqlx::Transaction<'_, Sqlite>,
user_id: UserIdInDb,
device_id: Uuid,
instance_id: Uuid,
network_config: &str,
source: ConfigSource,
web_only_update: bool,
) -> Result<bool, DbErr> {
let now = chrono::Local::now().fixed_offset();
let mut query = r#"
INSERT INTO user_running_network_configs (
user_id, device_id, network_instance_id, network_config,
source, disabled, create_time, update_time
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(user_id, device_id, network_instance_id) DO UPDATE SET
network_config = excluded.network_config,
source = excluded.source,
disabled = excluded.disabled,
update_time = excluded.update_time
"#
.to_string();
if web_only_update {
query.push_str(" WHERE user_running_network_configs.source = 'web'");
}
let result = sqlx::query(&query)
.bind(user_id)
.bind(device_id.to_string())
.bind(instance_id.to_string())
.bind(network_config)
.bind(source.as_str())
.bind(false)
.bind(now)
.bind(now)
.execute(&mut **transaction)
.await
.map_err(sqlx_db_error)?;
Ok(result.rows_affected() > 0)
}
#[cfg(unix)]
fn restrict_database_file_permissions(db_path: &str) -> anyhow::Result<()> {
if db_path.ends_with(":memory:") || db_path.contains("mode=memory") {
@@ -214,44 +388,205 @@ impl Db {
Ok(())
}
pub async fn insert_or_update_web_network_config(
pub(crate) async fn apply_managed_config_update(
&self,
(user_id, device_id): (UserIdInDb, Uuid),
network_inst_id: Uuid,
network_config: NetworkConfig,
) -> Result<bool, DbErr> {
let now = chrono::Local::now().fixed_offset();
let network_config =
serde_json::to_string(&network_config).map_err(|e| DbErr::Json(e.to_string()))?;
let source = ConfigSource::Web.as_str();
let result = sqlx::query(
r#"
INSERT INTO user_running_network_configs (
user_id, device_id, network_instance_id, network_config,
source, disabled, create_time, update_time
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(user_id, device_id, network_instance_id) DO UPDATE SET
network_config = excluded.network_config,
source = excluded.source,
disabled = excluded.disabled,
update_time = excluded.update_time
WHERE user_running_network_configs.source = ?
"#,
)
.bind(user_id)
.bind(device_id.to_string())
.bind(network_inst_id.to_string())
.bind(network_config)
.bind(source)
.bind(false)
.bind(now)
.bind(now)
.bind(source)
.execute(&self.db)
.await
.map_err(|e| DbErr::Custom(e.to_string()))?;
update: ManagedConfigUpdate,
) -> Result<ManagedConfigApplyResult, DbErr> {
let (upserts, target_revision, expected_revision) = match &update {
ManagedConfigUpdate::Full {
upserts,
target_revision,
expected_revision,
} => (
upserts,
target_revision.as_deref(),
expected_revision.clone(),
),
ManagedConfigUpdate::Patch {
upserts,
target_revision,
expected_revision,
..
} => (
upserts,
Some(target_revision.as_str()),
ManagedConfigExpectedRevision::Exact(Some(expected_revision.clone())),
),
};
let serialized_upserts = upserts
.iter()
.map(|upsert| {
serde_json::to_string(&upsert.network_config)
.map(|config| (upsert.instance_id, config))
.map_err(|error| DbErr::Json(error.to_string()))
})
.collect::<Result<Vec<_>, _>>()?;
Ok(result.rows_affected() > 0)
let mut transaction = self
.db
.begin_with("BEGIN IMMEDIATE")
.await
.map_err(sqlx_db_error)?;
let current_revision =
read_managed_config_revision(&mut transaction, user_id, device_id).await?;
if target_revision.is_some() && current_revision.as_deref() == target_revision {
transaction.commit().await.map_err(sqlx_db_error)?;
return Ok(ManagedConfigApplyResult::AlreadyApplied);
}
if let ManagedConfigExpectedRevision::Exact(expected) = &expected_revision
&& current_revision.as_ref() != expected.as_ref()
{
let result = ManagedConfigApplyResult::RevisionConflict {
expected: expected.clone(),
current: current_revision,
};
transaction.commit().await.map_err(sqlx_db_error)?;
return Ok(result);
}
let mut existing_sources = HashMap::new();
match &update {
ManagedConfigUpdate::Full { .. } => {
let rows = sqlx::query_as::<_, (String, String)>(
r#"
SELECT network_instance_id, source
FROM user_running_network_configs
WHERE user_id = ? AND device_id = ?
"#,
)
.bind(user_id)
.bind(device_id.to_string())
.fetch_all(&mut *transaction)
.await
.map_err(sqlx_db_error)?;
for (instance_id, source) in rows {
if let Ok(instance_id) = Uuid::parse_str(&instance_id) {
existing_sources.insert(instance_id, source);
}
}
}
ManagedConfigUpdate::Patch {
delete_instance_ids,
..
} => {
for instance_id in upserts
.iter()
.map(|upsert| upsert.instance_id)
.chain(delete_instance_ids.iter().copied())
{
if let Some(source) =
read_config_source(&mut transaction, user_id, device_id, instance_id)
.await?
{
existing_sources.insert(instance_id, source);
}
}
}
}
let strict_ownership = target_revision.is_some();
if strict_ownership
&& let Some(instance_id) = serialized_upserts
.iter()
.map(|(instance_id, _)| *instance_id)
.chain(match &update {
ManagedConfigUpdate::Patch {
delete_instance_ids,
..
} => delete_instance_ids.iter().copied(),
ManagedConfigUpdate::Full { .. } => [].iter().copied(),
})
.find(|instance_id| {
existing_sources
.get(instance_id)
.is_some_and(|source| source != ConfigSource::Web.as_str())
})
{
transaction.commit().await.map_err(sqlx_db_error)?;
return Ok(ManagedConfigApplyResult::OwnershipConflict { instance_id });
}
let desired_ids = serialized_upserts
.iter()
.map(|(instance_id, _)| *instance_id)
.collect::<HashSet<_>>();
for (instance_id, network_config) in &serialized_upserts {
if !strict_ownership
&& existing_sources
.get(instance_id)
.is_some_and(|source| source != ConfigSource::Web.as_str())
{
continue;
}
let updated = upsert_network_config(
&mut transaction,
user_id,
device_id,
*instance_id,
network_config,
ConfigSource::Web,
true,
)
.await?;
if !updated {
transaction.rollback().await.map_err(sqlx_db_error)?;
return Ok(ManagedConfigApplyResult::OwnershipConflict {
instance_id: *instance_id,
});
}
}
let delete_instance_ids = match &update {
ManagedConfigUpdate::Full { .. } => existing_sources
.iter()
.filter_map(|(instance_id, source)| {
(source == ConfigSource::Web.as_str() && !desired_ids.contains(instance_id))
.then_some(*instance_id)
})
.collect::<Vec<_>>(),
ManagedConfigUpdate::Patch {
delete_instance_ids,
..
} => delete_instance_ids
.iter()
.filter(|instance_id| {
existing_sources
.get(instance_id)
.is_some_and(|source| source == ConfigSource::Web.as_str())
})
.copied()
.collect(),
};
for instance_id in &delete_instance_ids {
sqlx::query(
r#"
DELETE FROM user_running_network_configs
WHERE user_id = ? AND device_id = ? AND network_instance_id = ?
AND source = 'web'
"#,
)
.bind(user_id)
.bind(device_id.to_string())
.bind(instance_id.to_string())
.execute(&mut *transaction)
.await
.map_err(sqlx_db_error)?;
}
match target_revision {
Some(revision) => {
write_managed_config_revision(&mut transaction, user_id, device_id, revision)
.await?;
}
None => {
clear_managed_config_revision(&mut transaction, user_id, device_id).await?;
}
}
transaction.commit().await.map_err(sqlx_db_error)?;
Ok(ManagedConfigApplyResult::Applied {
deleted_web_instance_ids: delete_instance_ids,
})
}
pub async fn delete_web_network_configs(
@@ -259,19 +594,32 @@ impl Db {
(user_id, device_id): (UserIdInDb, Uuid),
network_inst_ids: &[Uuid],
) -> Result<(), DbErr> {
use entity::user_running_network_configs as urnc;
urnc::Entity::delete_many()
.filter(urnc::Column::UserId.eq(user_id))
.filter(urnc::Column::DeviceId.eq(device_id.to_string()))
.filter(urnc::Column::Source.eq(ConfigSource::Web.as_str()))
.filter(
urnc::Column::NetworkInstanceId
.is_in(network_inst_ids.iter().map(|id| id.to_string())),
let mut transaction = self
.db
.begin_with("BEGIN IMMEDIATE")
.await
.map_err(sqlx_db_error)?;
let mut deleted = false;
for instance_id in network_inst_ids {
let result = sqlx::query(
r#"
DELETE FROM user_running_network_configs
WHERE user_id = ? AND device_id = ? AND network_instance_id = ?
AND source = 'web'
"#,
)
.exec(self.orm_db())
.await?;
.bind(user_id)
.bind(device_id.to_string())
.bind(instance_id.to_string())
.execute(&mut *transaction)
.await
.map_err(sqlx_db_error)?;
deleted |= result.rows_affected() > 0;
}
if deleted {
clear_managed_config_revision(&mut transaction, user_id, device_id).await?;
}
transaction.commit().await.map_err(sqlx_db_error)?;
Ok(())
}
}
@@ -285,42 +633,31 @@ impl Storage<(UserIdInDb, Uuid), user_running_network_configs::Model, DbErr> for
network_config: NetworkConfig,
source: ConfigSource,
) -> Result<(), DbErr> {
let txn = self.orm_db().begin().await?;
use entity::user_running_network_configs as urnc;
let on_conflict = OnConflict::columns([
urnc::Column::UserId,
urnc::Column::DeviceId,
urnc::Column::NetworkInstanceId,
])
.update_columns([
urnc::Column::NetworkConfig,
urnc::Column::Source,
urnc::Column::Disabled,
urnc::Column::UpdateTime,
])
.to_owned();
let insert_m = urnc::ActiveModel {
user_id: sea_orm::Set(user_id),
device_id: sea_orm::Set(device_id.to_string()),
network_instance_id: sea_orm::Set(network_inst_id.to_string()),
network_config: sea_orm::Set(
serde_json::to_string(&network_config).map_err(|e| DbErr::Json(e.to_string()))?,
),
source: sea_orm::Set(source.as_str().to_string()),
disabled: sea_orm::Set(false),
create_time: sea_orm::Set(chrono::Local::now().fixed_offset()),
update_time: sea_orm::Set(chrono::Local::now().fixed_offset()),
..Default::default()
};
urnc::Entity::insert(insert_m)
.on_conflict(on_conflict)
.do_nothing()
.exec(&txn)
.await?;
txn.commit().await
let network_config =
serde_json::to_string(&network_config).map_err(|e| DbErr::Json(e.to_string()))?;
let mut transaction = self
.db
.begin_with("BEGIN IMMEDIATE")
.await
.map_err(sqlx_db_error)?;
let previous_source =
read_config_source(&mut transaction, user_id, device_id, network_inst_id).await?;
upsert_network_config(
&mut transaction,
user_id,
device_id,
network_inst_id,
&network_config,
source,
false,
)
.await?;
if source == ConfigSource::Web
|| previous_source.as_deref() == Some(ConfigSource::Web.as_str())
{
clear_managed_config_revision(&mut transaction, user_id, device_id).await?;
}
transaction.commit().await.map_err(sqlx_db_error)
}
async fn delete_network_configs(
@@ -328,18 +665,35 @@ impl Storage<(UserIdInDb, Uuid), user_running_network_configs::Model, DbErr> for
(user_id, device_id): (UserIdInDb, Uuid),
network_inst_ids: &[Uuid],
) -> Result<(), DbErr> {
use entity::user_running_network_configs as urnc;
urnc::Entity::delete_many()
.filter(urnc::Column::UserId.eq(user_id))
.filter(urnc::Column::DeviceId.eq(device_id.to_string()))
.filter(
urnc::Column::NetworkInstanceId
.is_in(network_inst_ids.iter().map(|id| id.to_string())),
let mut transaction = self
.db
.begin_with("BEGIN IMMEDIATE")
.await
.map_err(sqlx_db_error)?;
let mut deleted_web_config = false;
for instance_id in network_inst_ids {
deleted_web_config |=
read_config_source(&mut transaction, user_id, device_id, *instance_id)
.await?
.as_deref()
== Some(ConfigSource::Web.as_str());
sqlx::query(
r#"
DELETE FROM user_running_network_configs
WHERE user_id = ? AND device_id = ? AND network_instance_id = ?
"#,
)
.exec(self.orm_db())
.await?;
.bind(user_id)
.bind(device_id.to_string())
.bind(instance_id.to_string())
.execute(&mut *transaction)
.await
.map_err(sqlx_db_error)?;
}
if deleted_web_config {
clear_managed_config_revision(&mut transaction, user_id, device_id).await?;
}
transaction.commit().await.map_err(sqlx_db_error)?;
Ok(())
}
@@ -349,20 +703,32 @@ impl Storage<(UserIdInDb, Uuid), user_running_network_configs::Model, DbErr> for
network_inst_id: Uuid,
disabled: bool,
) -> Result<(), DbErr> {
use entity::user_running_network_configs as urnc;
urnc::Entity::update_many()
.filter(urnc::Column::UserId.eq(user_id))
.filter(urnc::Column::DeviceId.eq(device_id.to_string()))
.filter(urnc::Column::NetworkInstanceId.eq(network_inst_id.to_string()))
.col_expr(urnc::Column::Disabled, Expr::value(disabled))
.col_expr(
urnc::Column::UpdateTime,
Expr::value(chrono::Local::now().fixed_offset()),
)
.exec(self.orm_db())
.await?;
let mut transaction = self
.db
.begin_with("BEGIN IMMEDIATE")
.await
.map_err(sqlx_db_error)?;
let source =
read_config_source(&mut transaction, user_id, device_id, network_inst_id).await?;
let result = sqlx::query(
r#"
UPDATE user_running_network_configs
SET disabled = ?, update_time = ?
WHERE user_id = ? AND device_id = ? AND network_instance_id = ?
"#,
)
.bind(disabled)
.bind(chrono::Local::now().fixed_offset())
.bind(user_id)
.bind(device_id.to_string())
.bind(network_inst_id.to_string())
.execute(&mut *transaction)
.await
.map_err(sqlx_db_error)?;
if result.rows_affected() > 0 && source.as_deref() == Some(ConfigSource::Web.as_str()) {
clear_managed_config_revision(&mut transaction, user_id, device_id).await?;
}
transaction.commit().await.map_err(sqlx_db_error)?;
Ok(())
}
@@ -600,17 +966,73 @@ mod tests {
}
#[tokio::test]
async fn test_web_network_config_does_not_replace_user_owned_config() {
async fn web_owned_mutations_invalidate_managed_revision() {
let db = Db::memory_db().await;
let user_id = db.auto_create_user("user-web-race").await.unwrap().id;
let user_id = db
.auto_create_user("managed-revision-invalidation")
.await
.unwrap()
.id;
let device_id = uuid::Uuid::new_v4();
let inst_id = uuid::Uuid::new_v4();
db.insert_or_update_user_network_config(
(user_id, device_id),
inst_id,
NetworkConfig {
network_name: Some("managed".to_string()),
..Default::default()
},
ConfigSource::Web,
)
.await
.unwrap();
db.set_managed_config_revision((user_id, device_id), "rev-before-disable")
.await
.unwrap();
db.update_network_config_state((user_id, device_id), inst_id, true)
.await
.unwrap();
assert!(
db.get_managed_config_revision((user_id, device_id))
.await
.unwrap()
.is_none()
);
db.set_managed_config_revision((user_id, device_id), "rev-before-delete")
.await
.unwrap();
db.delete_network_configs((user_id, device_id), &[inst_id])
.await
.unwrap();
assert!(
db.get_managed_config_revision((user_id, device_id))
.await
.unwrap()
.is_none()
);
}
#[tokio::test]
async fn user_owned_mutation_preserves_managed_revision() {
let db = Db::memory_db().await;
let user_id = db
.auto_create_user("user-revision-preserved")
.await
.unwrap()
.id;
let device_id = uuid::Uuid::new_v4();
let inst_id = uuid::Uuid::new_v4();
db.set_managed_config_revision((user_id, device_id), "rev-user")
.await
.unwrap();
db.insert_or_update_user_network_config(
(user_id, device_id),
inst_id,
NetworkConfig {
network_name: Some("user-owned".to_string()),
network_name: Some("user".to_string()),
..Default::default()
},
ConfigSource::User,
@@ -618,26 +1040,12 @@ mod tests {
.await
.unwrap();
let updated = db
.insert_or_update_web_network_config(
(user_id, device_id),
inst_id,
NetworkConfig {
network_name: Some("web-owned".to_string()),
..Default::default()
},
)
.await
.unwrap();
assert!(!updated);
let saved = db
.get_network_config((user_id, device_id), &inst_id.to_string())
.await
.unwrap()
.unwrap();
assert_eq!(saved.get_network_config_source(), ConfigSource::User);
let saved_config = saved.get_network_config().unwrap();
assert_eq!(saved_config.network_name.as_deref(), Some("user-owned"));
assert_eq!(
db.get_managed_config_revision((user_id, device_id))
.await
.unwrap()
.as_deref(),
Some("rev-user")
);
}
}