From fc43efb7f68a7c3513ed6961f8103ce0b20b62e5 Mon Sep 17 00:00:00 2001 From: bunnie Date: Wed, 12 Nov 2025 17:46:21 +0800 Subject: [PATCH] layer in password browsing --- apps-baosec/vault2/locales/i18n.json | 16 ++- apps-baosec/vault2/src/actions.rs | 5 +- apps-baosec/vault2/src/main.rs | 30 ++++++ apps-baosec/vault2/src/submenu.rs | 21 ++-- apps-baosec/vault2/src/ux.rs | 151 ++++++++++++++++++++++++++- 5 files changed, 207 insertions(+), 16 deletions(-) diff --git a/apps-baosec/vault2/locales/i18n.json b/apps-baosec/vault2/locales/i18n.json index 16b2a587f..51a1bbc83 100644 --- a/apps-baosec/vault2/locales/i18n.json +++ b/apps-baosec/vault2/locales/i18n.json @@ -300,6 +300,13 @@ "ja": "管理基盤", "zh": "管理基础" }, + "vault.menu_pw_mode": { + "en": "Password mode", + "en-tts": "Password mode", + "fr": "Mode mot de passe", + "ja": "パスワードモード", + "zh": "密码模式" + }, "vault.menu_readout_mode": { "en": "Enable host readout", "en-tts": "Enable host readout", @@ -314,6 +321,13 @@ "ja": "左手用 UI を設定する", "zh": "设置左手用户界面" }, + "vault.menu_totp_mode": { + "en": "TOTP mode", + "en-tts": "TOTP mode", + "fr": "Mode TOTP", + "ja": "TOTPモード", + "zh": "TOTP模式" + }, "vault.menu_unlock_basis": { "en": "Unlock secret Basis", "en-tts": "Unlock secret basis", @@ -622,4 +636,4 @@ "ja": "はい", "zh": "确定" } -} +} \ No newline at end of file diff --git a/apps-baosec/vault2/src/actions.rs b/apps-baosec/vault2/src/actions.rs index ffc870ff2..f66803044 100644 --- a/apps-baosec/vault2/src/actions.rs +++ b/apps-baosec/vault2/src/actions.rs @@ -16,7 +16,6 @@ use locales::t; use num_traits::*; use passwords::PasswordGenerator; use pddb::BasisRetentionPolicy; -use persistent_store::store::OPENSK2_DICT; use ux_api::widgets::TextEntryPayload; use vault2::env::xous::U2F_APP_DICT; use vault2::{ @@ -1476,8 +1475,8 @@ pub(crate) fn heap_usage() -> usize { fn make_pw_name(description: &str, username: &str, dest: &mut String) { dest.clear(); dest.push_str(description); - dest.push_str("/"); - dest.push_str(username); + // dest.push_str("/"); + // dest.push_str(username); } fn make_u2f_item_from_record(guid: &str, ai: AppInfo) -> ListItem { diff --git a/apps-baosec/vault2/src/main.rs b/apps-baosec/vault2/src/main.rs index cff474175..5aa6c00ca 100644 --- a/apps-baosec/vault2/src/main.rs +++ b/apps-baosec/vault2/src/main.rs @@ -135,6 +135,8 @@ pub(crate) enum VaultOp { MenuAutotypeRate, MenuLeftyMode, MenuDone, + MenuTotpMode, + MenuPwMode, } #[derive(Copy, Clone, PartialEq, Eq, Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] @@ -311,6 +313,34 @@ fn main() -> ! { allow_totp_rendering.store(true, Ordering::SeqCst); vault_ui.redraw(); } + Some(VaultOp::MenuTotpMode) => { + *mode.lock().unwrap() = VaultMode::Totp; + // reload DB on mode switch + xous::send_message( + actions_conn, + xous::Message::new_blocking_scalar(ActionOp::ReloadDb.to_usize().unwrap(), 0, 0, 0, 0), + ) + .ok(); + vault_ui.refresh_totp(); + allow_totp_rendering.store(true, Ordering::SeqCst); + xous::send_message( + pump_conn, + xous::Message::new_scalar(PumpOp::Pump.to_usize().unwrap(), 0, 0, 0, 0), + ) + .expect("couldn't start the pumper"); + vault_ui.redraw(); + } + Some(VaultOp::MenuPwMode) => { + *mode.lock().unwrap() = VaultMode::Password; + allow_totp_rendering.store(false, Ordering::SeqCst); + // reload DB on mode switch + xous::send_message( + actions_conn, + xous::Message::new_blocking_scalar(ActionOp::ReloadDb.to_usize().unwrap(), 0, 0, 0, 0), + ) + .ok(); + vault_ui.redraw(); + } Some(VaultOp::KeyPress) => xous::msg_scalar_unpack!(msg, k1, _k2, _k3, _k4, { let k = char::from_u32(k1 as u32).unwrap_or('\u{0000}'); log::info!("key {}", k); diff --git a/apps-baosec/vault2/src/submenu.rs b/apps-baosec/vault2/src/submenu.rs index e38b47ee4..0db4ece67 100644 --- a/apps-baosec/vault2/src/submenu.rs +++ b/apps-baosec/vault2/src/submenu.rs @@ -9,6 +9,20 @@ use crate::VaultOp; pub fn create_submenu(vault_conn: xous::CID, actions_conn: xous::CID, menu_mgr: xous::SID) -> MenuMatic { let mut menu_items = Vec::::new(); + menu_items.push(MenuItem { + name: String::from(t!("vault.menu_totp_mode", locales::LANG)), + action_conn: Some(vault_conn), + action_opcode: VaultOp::MenuTotpMode.to_u32().unwrap(), + action_payload: MenuPayload::Scalar([0, 0, 0, 0]), + close_on_select: true, + }); + menu_items.push(MenuItem { + name: String::from(t!("vault.menu_pw_mode", locales::LANG)), + action_conn: Some(vault_conn), + action_opcode: VaultOp::MenuPwMode.to_u32().unwrap(), + action_payload: MenuPayload::Scalar([0, 0, 0, 0]), + close_on_select: true, + }); menu_items.push(MenuItem { name: String::from(t!("vault.menu_edit", locales::LANG)), action_conn: Some(vault_conn), @@ -38,13 +52,6 @@ pub fn create_submenu(vault_conn: xous::CID, actions_conn: xous::CID, menu_mgr: action_payload: MenuPayload::Scalar([0, 0, 0, 0]), close_on_select: true, }); - menu_items.push(MenuItem { - name: String::from(t!("vault.menu_readout_mode", locales::LANG)), - action_conn: Some(vault_conn), - action_opcode: VaultOp::MenuReadoutMode.to_u32().unwrap(), - action_payload: MenuPayload::Scalar([0, 0, 0, 0]), - close_on_select: true, - }); menu_items.push(MenuItem { name: String::from(t!("prefs.autotype_rate", locales::LANG)), action_conn: Some(vault_conn), diff --git a/apps-baosec/vault2/src/ux.rs b/apps-baosec/vault2/src/ux.rs index d290d8b4c..38a3518d5 100644 --- a/apps-baosec/vault2/src/ux.rs +++ b/apps-baosec/vault2/src/ux.rs @@ -9,6 +9,7 @@ use ux_api::service::gfx::Gfx; use ux_api::widgets::ScrollableList; use xous::CID; +use crate::storage::{ContentKind, Manager}; use crate::*; pub const DEFAULT_FONT: GlyphStyle = GlyphStyle::Bold; @@ -82,6 +83,8 @@ pub struct VaultUi { pddb: RefCell, item_height: isize, + style: GlyphStyle, + storage_manager: Manager, } impl VaultUi { @@ -112,6 +115,8 @@ impl VaultUi { last_epoch: crate::totp::get_current_unix_time().expect("couldn't get current time") / 30, pddb: RefCell::new(pddb), item_height: height / glyph_height, + style, + storage_manager: Manager::new(xns), } } @@ -194,10 +199,10 @@ impl VaultUi { self.totp_list.style(style); let glyph_height = self.gfx.glyph_height_hint(style).unwrap(); self.item_height = glyph_height as isize + 2; // +2 because of the border width - self.item_lists - .lock() - .unwrap() - .set_items_per_screen(self.gfx.screen_size().unwrap().y / self.item_height); + self.item_lists.lock().unwrap().set_items_per_screen( + (self.gfx.screen_size().unwrap().y - 2 * self.item_height) / self.item_height, + ); + self.style = style; } /// Clear the entire screen. @@ -304,7 +309,143 @@ impl VaultUi { - Pressing on circle middle button just does autotype */ - todo!() + let screensize = self.gfx.screen_size().unwrap(); + // handle empty database case + if self.item_lists.lock().unwrap().filter_len(VaultMode::Password) == 0 { + log::debug!("no items"); + let mut box_text = TextView::new( + Gid::dummy(), + TextBounds::CenteredBot(Rectangle::new( + Point::new(0, screensize.y / 2), + Point::new(screensize.x, screensize.y / 2 + self.item_height), + )), + ); + box_text.draw_border = false; + box_text.clear_area = true; + box_text.style = self.style; + write!(box_text, "{}", t!("vault.no_items", locales::LANG)).ok(); + self.gfx.draw_textview(&mut box_text).expect("couldn't post empty notification"); + self.gfx.flush().ok(); + return; + } + let mut insert_at = 0; + if let Some(entry) = self.item_lists.lock().unwrap().selected_entry(VaultMode::Password) { + log::debug!("rendering entry {:?}", entry); + // draw more data about the selected item + let guid = entry.key_guid.as_str(); + let pw: storage::PasswordRecord = + match self.storage_manager.get_record(&ContentKind::Password, guid) { + Ok(record) => record, + Err(error) => { + log::error!("internal error rendering password"); + self.gfx.flush().ok(); + return; + } + }; + let mut box_text = TextView::new( + Gid::dummy(), + TextBounds::CenteredBot(Rectangle::new( + Point::new(0, insert_at), + Point::new(screensize.x, insert_at + self.item_height), + )), + ); + insert_at += self.item_height; + box_text.draw_border = false; + box_text.clear_area = false; + box_text.ellipsis = true; + box_text.style = self.style; + box_text.invert = true; + // line 1 + write!(box_text, "{}", &pw.description).ok(); + self.gfx.draw_textview(&mut box_text).unwrap(); + // line 2 + box_text.bounds_hint = TextBounds::CenteredBot(Rectangle::new( + Point::new(0, insert_at), + Point::new(screensize.x, insert_at + self.item_height), + )); + insert_at += self.item_height; + box_text.clear_str(); + write!(box_text, "{}", &pw.username).ok(); + self.gfx.draw_textview(&mut box_text).ok(); + // draw a rectangle around the top area + self.gfx + .draw_rectangle(Rectangle::new_coords_with_style( + 0, + 0, + screensize.x, + self.item_height * 2, + DrawStyle { + fill_color: None, + stroke_color: Some(PixelColor::Light), + stroke_width: 2, + }, + )) + .ok(); + } else { + // draw a rectangle around the top area + self.gfx + .draw_rectangle(Rectangle::new_coords_with_style( + 0, + 0, + screensize.x, + self.item_height * 2, + DrawStyle { + fill_color: Some(PixelColor::Dark), + stroke_color: Some(PixelColor::Light), + stroke_width: 2, + }, + )) + .ok(); + log::error!("Couldn't retrieve password info to render top area"); + insert_at = self.item_height * 2; + }; + // ---- draw list body area ---- + let selected = self.item_lists.lock().unwrap().selected_index(VaultMode::Password); + let mut guarded_list = self.item_lists.lock().unwrap(); + let current_page = guarded_list.selected_page(VaultMode::Password); + log::debug!("current_page len {}", current_page.len()); + for (index, item) in current_page.iter_mut().enumerate() { + if insert_at - 1 > screensize.y - self.item_height { + // -1 because of the overlapping border + break; + } + log::debug!("drawing {}", item.name()); + let mut box_text = TextView::new( + Gid::dummy(), + TextBounds::BoundingBox(Rectangle::new( + Point::new(0, insert_at), + Point::new(screensize.x, insert_at + self.item_height), + )), + ); + box_text.draw_border = false; + box_text.rounded_border = None; + box_text.clear_area = false; + box_text.style = self.style; + box_text.ellipsis = true; + if index == selected { + box_text.invert = false; + } else { + box_text.invert = true; + } + write!(box_text, "{}", item.name()).ok(); + // do a dry run to get the final bounding box + box_text.set_dry_run(true); + self.gfx.draw_textview(&mut box_text).expect("couldn't post list item"); + if index == selected { + let mut r = box_text.bounds_computed.unwrap(); + r.style = DrawStyle { + fill_color: Some(PixelColor::Light), + stroke_color: None, + stroke_width: 0, + }; + self.gfx.draw_rectangle(r).ok(); + } + // now draw for reals + box_text.set_dry_run(false); + self.gfx.draw_textview(&mut box_text).expect("couldn't post list item"); + + insert_at += self.item_height; + } } } self.gfx.flush().ok();