-
-
+
+
+ Users
+ {{ users.len() }}
+
+
+ UserRole2FAStatusLast sign-in
+
+ {% for u in users %}
+
+
+
+ {{ crate::handlers::user_initial(u.username) }}
+
+ {{ u.username }}
+ {{ u.email }}
+
+
+
+ {% if u.custom_role_id.is_some() %}
+ {% for cr in custom_roles %}{% if u.custom_role_id.as_ref() == Some(cr.id) %}{{ cr.name }} custom{% endif %}{% endfor %}
+ {% else %}
+ {{ crate::handlers::role_label(u.role) }}
+ {% endif %}
+
+
+ {% if u.totp_enrolled %}
+ enrolled
+ {% else if u.totp_required %}
+ required, not set
+ {% else %}
+ 2FA off
+ {% endif %}
+
+
+ {% if u.locked %}
+ locked
+ {% else %}
+ active
+ {% endif %}
+
+
+ {% if let Some(t) = u.last_login_at %}{{ crate::handlers::stats::fmt_ago(t) }}{% else %}never{% endif %}
+
+
+ Manage
+
+
+
+
-
-
-
- Owner — full control, including user management ·
- Administrator — full control except user management ·
- Operator — internal staff who can manage their assigned hostings ·
- Customer — end user with a slim nav, sees only their own hostings ·
- Read-only — view-only on assigned hostings.
-
-
-
-
-
-
-
- | User |
- Role |
- 2FA |
- Status |
- Last sign-in |
- Actions |
-
-
-
- {% for u in users %}
-
- |
- {{ u.username }}
- {{ u.email }}
- |
-
-
- |
-
- {% if u.totp_enrolled %}
- enrolled
- {% else if u.totp_required %}
- required, not set
- {% else %}
- —
- {% endif %}
- |
-
- {% if u.locked %}
- locked
- {% if let Some(r) = u.locked_reason %}
- {{ r }}
- {% endif %}
- {% else %}
- active
- {% endif %}
- |
-
- {% if let Some(t) = u.last_login_at %}
- {{ crate::handlers::stats::fmt_ago(t) }}
- {% else %}
- never
- {% endif %}
- |
-
-
- Actions
-
-
-
-
-
-
- |
-
- {% endfor %}
-
-
-
+
+
+ {% endfor %}
+
+
+ + Add user
+
+
+
+
Each user can enable TOTP two-factor authentication from their
profile. Operator, Customer, and Read-only users
diff --git a/crates/hyperion-core/src/service.rs b/crates/hyperion-core/src/service.rs
index ac70a200..66fb2403 100644
--- a/crates/hyperion-core/src/service.rs
+++ b/crates/hyperion-core/src/service.rs
@@ -23868,7 +23868,19 @@ impl HostingService {
let rows = hyperion_state::web_users::list(&self.pool)
.await
.map_err(|e| RpcError::Internal_with(format!("list: {e}")))?;
- Ok(rows.into_iter().map(row_to_summary).collect())
+ let custom = hyperion_state::web_users::custom_role_assignments(&self.pool)
+ .await
+ .map_err(|e| RpcError::Internal_with(format!("list custom roles: {e}")))?;
+ Ok(rows
+ .into_iter()
+ .map(|u| {
+ let custom_role_id = custom.get(&u.id).copied();
+ hyperion_types::WebUserSummary {
+ custom_role_id,
+ ..row_to_summary(u)
+ }
+ })
+ .collect())
}
pub async fn web_user_get(
@@ -35899,6 +35911,7 @@ fn row_to_summary(u: hyperion_state::web_users::WebUserRow) -> hyperion_types::W
locked_reason: u.locked_reason,
last_login_at: u.last_login_at,
created_at: u.created_at,
+ custom_role_id: None,
}
}
diff --git a/crates/hyperion-state/src/web_users.rs b/crates/hyperion-state/src/web_users.rs
index eb1d151d..4a0299d9 100644
--- a/crates/hyperion-state/src/web_users.rs
+++ b/crates/hyperion-state/src/web_users.rs
@@ -134,6 +134,21 @@ pub async fn list(pool: &SqlitePool) -> Result, StateError> {
Ok(rows)
}
+/// `user_id -> custom_role_id` for every user linked to a custom role that
+/// still exists (a dangling id resolves to the built-in role, same as
+/// `effective_role`).
+pub async fn custom_role_assignments(
+ pool: &SqlitePool,
+) -> Result, StateError> {
+ let rows: Vec<(i64, i64)> = sqlx::query_as(
+ "SELECT u.id, u.custom_role_id FROM web_users u \
+ JOIN custom_roles c ON c.id = u.custom_role_id",
+ )
+ .fetch_all(pool)
+ .await?;
+ Ok(rows.into_iter().collect())
+}
+
pub async fn count(pool: &SqlitePool) -> Result {
let (n,): (i64,) = sqlx::query_as("SELECT COUNT(*) FROM web_users")
.fetch_one(pool)
@@ -962,6 +977,28 @@ mod tests {
.expect("insert")
}
+ #[tokio::test]
+ async fn custom_role_assignments_lists_linked_users_only() {
+ let pool = open_memory().await.expect("open");
+ let plain = fresh_user(&pool, "plain").await;
+ let linked = fresh_user(&pool, "linked").await;
+ let role = crate::custom_roles::create(&pool, "Support desk", 0, false, 10)
+ .await
+ .expect("role");
+ set_custom_role(&pool, linked, role, 11).await.expect("set");
+ let map = custom_role_assignments(&pool).await.expect("list");
+ assert_eq!(map.get(&linked), Some(&role));
+ assert_eq!(map.get(&plain), None);
+ // Back to a built-in role clears the link.
+ set_role(&pool, linked, WebRole::Viewer, 12)
+ .await
+ .expect("reset");
+ assert!(custom_role_assignments(&pool)
+ .await
+ .expect("list")
+ .is_empty());
+ }
+
#[tokio::test]
async fn consume_totp_step_rejects_replay_and_older_steps() {
let pool = open_memory().await.expect("open");
diff --git a/crates/hyperion-types/src/stats.rs b/crates/hyperion-types/src/stats.rs
index 4f3145cf..86df39da 100644
--- a/crates/hyperion-types/src/stats.rs
+++ b/crates/hyperion-types/src/stats.rs
@@ -1027,6 +1027,12 @@ pub struct WebUserSummary {
pub locked_reason: Option,
pub last_login_at: Option,
pub created_at: i64,
+ /// Linked custom role, if any. A custom-role user's `role` column holds
+ /// the `operator` sentinel, so without this the users page showed them as
+ /// Operator and one "save" silently dropped the custom role. Filled by
+ /// `WebUserList` only; `serde(default)` keeps older agents decodable.
+ #[serde(default)]
+ pub custom_role_id: Option,
}
/// Wire shape of one custom role. `capabilities` is a plain bitmask (the