From 8a980c1c814d48803648de4e07fd87551dedbab1 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 27 Nov 2025 16:54:09 +0800 Subject: [PATCH] add totp extractor directly from uri string in QR code --- apps-baosec/vault2/locales/i18n.json | 14 ++++ apps-baosec/vault2/src/storage.rs | 108 +++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/apps-baosec/vault2/locales/i18n.json b/apps-baosec/vault2/locales/i18n.json index 51a1bbc83..30d4b846d 100644 --- a/apps-baosec/vault2/locales/i18n.json +++ b/apps-baosec/vault2/locales/i18n.json @@ -139,6 +139,20 @@ "ja": "何も選択されていません.", "zh": "未选择任何内容." }, + "vault.error.qr": { + "en": "Error parsing QR code", + "en-tts": "Error parsing QR code", + "fr": "Erreur de code QR", + "ja": "QRコード解析エラー", + "zh": "二维码解析错误" + }, + "vault.error.qr_unrecognized": { + "en": "Unrecognized QR action", + "en-tts": "Unrecognized QR action", + "fr": "Action QR inconnue", + "ja": "未対応のQRアクション", + "zh": "未知的二维码操作" + }, "vault.error.record_error": { "en": "Corrupt database entry.", "en-tts": "Corrupt database entry.", diff --git a/apps-baosec/vault2/src/storage.rs b/apps-baosec/vault2/src/storage.rs index bb4fc2eed..11c9b97ab 100644 --- a/apps-baosec/vault2/src/storage.rs +++ b/apps-baosec/vault2/src/storage.rs @@ -1,5 +1,6 @@ use std::convert::TryFrom; use std::{ + collections::HashMap, io::Read, io::Write, time::{SystemTime, UNIX_EPOCH}, @@ -296,6 +297,113 @@ pub enum TOTPSerializationError { MalformedInput, } +impl TotpRecord { + pub fn from_uri(uri: &str) -> Result { + let mut record = TotpRecord::default(); + + // Split on first '/' to get type and rest + let (otp_type, rest) = uri.split_once('/').ok_or("Invalid format: missing '/'")?; + + // Determine if HOTP or TOTP + record.is_hotp = match otp_type.to_lowercase().as_str() { + "hotp" => true, + "totp" => false, + _ => return Err(format!("Unknown OTP type: {}", otp_type)), + }; + + // Split label and query + let (label, query) = rest.split_once('?').ok_or("Missing query parameters")?; + + // Parse label (may be "issuer:account" or just "account") + let decoded_label = url_decode(label)?; + /* + record.name = if let Some((_, account)) = decoded_label.split_once(':') { + account.to_string() + } else { + decoded_label + }; + */ + // don't parse this field - we want the issuer to be shown. + record.name = decoded_label; + + // Parse query parameters + let params = parse_query(query)?; + + // Extract secret (required) + record.secret = params.get("secret").ok_or("Missing required 'secret' parameter")?.to_string(); + + // Extract optional parameters with defaults + if let Some(algo) = params.get("algorithm") { + record.algorithm = match algo.to_uppercase().as_str() { + "SHA1" => TotpAlgorithm::HmacSha1, + "SHA256" => TotpAlgorithm::HmacSha256, + "SHA512" => TotpAlgorithm::HmacSha512, + _ => return Err(format!("Unknown algorithm: {}", algo)), + }; + } + + if let Some(digits) = params.get("digits") { + record.digits = digits.parse().map_err(|_| format!("Invalid digits value: {}", digits))?; + } else { + record.digits = 6; // Default + } + + if !record.is_hotp { + if let Some(period) = params.get("period") { + record.timestep = period.parse().map_err(|_| format!("Invalid period value: {}", period))?; + } else { + record.timestep = 30; // Default + } + } + + // Extract issuer for notes if present + if let Some(issuer) = params.get("issuer") { + record.notes = issuer.clone(); + } + + Ok(record) + } +} + +fn parse_query(query: &str) -> Result, String> { + let mut params = HashMap::new(); + + for pair in query.split('&') { + if let Some((key, value)) = pair.split_once('=') { + let decoded_value = url_decode(value)?; + params.insert(key.to_string(), decoded_value); + } + } + + Ok(params) +} + +fn url_decode(s: &str) -> Result { + let mut result = String::with_capacity(s.len()); + let mut chars = s.chars().peekable(); + + while let Some(ch) = chars.next() { + match ch { + '%' => { + // Get next two characters as hex + let hex: String = chars.by_ref().take(2).collect(); + if hex.len() != 2 { + return Err("Invalid percent encoding".to_string()); + } + + let byte = u8::from_str_radix(&hex, 16) + .map_err(|_| format!("Invalid hex in percent encoding: {}", hex))?; + + result.push(byte as char); + } + '+' => result.push(' '), + _ => result.push(ch), + } + } + + Ok(result) +} + impl StorageContent for TotpRecord { fn settings(&self) -> ContentPDDBSettings { ContentPDDBSettings { dict: VAULT_TOTP_DICT.to_string(), alloc_hint: Some(VAULT_TOTP_ALLOC_HINT) }