Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 71 additions & 1 deletion frontend/src-tauri/src/commands/alias.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,17 @@ fn configured_provider(
pub async fn save_alias_config(
provider_id: String,
api_token: String,
description: Option<String>,
state: State<'_, VaultState>,
) -> Result<String, String> {
state.lock(|storage, workspace| {
crate::vault::alias::save_config(workspace, storage, &provider_id, &api_token)
crate::vault::alias::save_config(
workspace,
storage,
&provider_id,
&api_token,
description.as_deref(),
)
})?;

Ok(json!({
Expand All @@ -35,6 +42,52 @@ pub async fn save_alias_config(
.to_string())
}

fn alias_configs_payload(
configs: Vec<crate::vault::alias::AliasProviderInfo>,
default_provider_id: Option<String>,
) -> String {
json!({
"status": "success",
"configs": configs,
"default_provider_id": default_provider_id,
})
.to_string()
}

#[tauri::command]
pub async fn list_alias_configs(state: State<'_, VaultState>) -> Result<String, String> {
let (configs, default_provider_id) = state.lock(|_, workspace| {
let configs = crate::vault::alias::list_configs(workspace)?;
Ok((configs, workspace.default_provider_id.clone()))
})?;

Ok(alias_configs_payload(configs, default_provider_id))
}

#[tauri::command]
pub async fn delete_alias_config(
provider_id: String,
state: State<'_, VaultState>,
) -> Result<String, String> {
state.lock(|storage, workspace| {
crate::vault::alias::delete_config(workspace, storage, &provider_id)
})?;

Ok(json!({ "status": "success" }).to_string())
}

#[tauri::command]
pub async fn set_default_alias_provider(
provider_id: String,
state: State<'_, VaultState>,
) -> Result<String, String> {
state.lock(|storage, workspace| {
crate::vault::alias::set_default_config(workspace, storage, &provider_id)
})?;

Ok(json!({ "status": "success" }).to_string())
}

#[tauri::command]
pub async fn generate_email_mask(
provider_id: String,
Expand Down Expand Up @@ -68,11 +121,28 @@ mod tests {
workspace.alias_configs.push(AliasConfig {
provider_id: "simplelogin".to_string(),
api_token: "sl-token".to_string(),
description: None,
});
workspace.start([3u8; 32]);
workspace
}

#[test]
fn alias_configs_payload_exposes_providers_without_tokens() {
let payload = alias_configs_payload(
vec![crate::vault::alias::AliasProviderInfo {
provider_id: "simplelogin".to_string(),
description: Some("Work".to_string()),
}],
Some("simplelogin".to_string()),
);

assert!(payload.contains("\"provider_id\":\"simplelogin\""));
assert!(payload.contains("\"description\":\"Work\""));
assert!(payload.contains("\"default_provider_id\":\"simplelogin\""));
assert!(!payload.contains("api_token"));
}

#[test]
fn configured_provider_rejects_expired_sessions() {
let mut workspace = unlocked_workspace();
Expand Down
14 changes: 14 additions & 0 deletions frontend/src-tauri/src/commands/credential.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ fn serialize_full_entry(entry: &Entry) -> String {
"url": entry.url,
"icon_url": entry.icon_url,
"has_totp": entry.totp_secret.is_some(),
"alias_provider_id": entry.alias_provider_id,
}
})
.to_string()
Expand Down Expand Up @@ -98,13 +99,15 @@ pub async fn request_secret(
}

#[tauri::command]
#[allow(clippy::too_many_arguments)]
pub async fn add_entry(
title: String,
username: String,
password: String,
url: Option<String>,
icon_url: Option<String>,
totp_secret: Option<String>,
alias_provider_id: Option<String>,
state: State<'_, VaultState>,
) -> Result<String, String> {
validate_entry_fields(&title, &username, &password, url.as_ref())?;
Expand All @@ -118,6 +121,7 @@ pub async fn add_entry(
url,
icon_url,
totp_secret: normalize_totp_secret(totp_secret)?.filter(|secret| !secret.is_empty()),
alias_provider_id,
};

state.lock(|storage, workspace| crate::vault::entries::add(workspace, storage, entry))?;
Expand Down Expand Up @@ -145,6 +149,7 @@ pub async fn update_entry(
url: Option<String>,
icon_url: Option<String>,
totp_secret: Option<String>,
alias_provider_id: Option<String>,
state: State<'_, VaultState>,
) -> Result<String, String> {
validate_entry_fields(&title, &username, &password, url.as_ref())?;
Expand All @@ -157,6 +162,7 @@ pub async fn update_entry(
url,
icon_url,
totp_secret: normalize_totp_secret(totp_secret)?,
alias_provider_id,
};

state.lock(|storage, workspace| crate::vault::entries::update(workspace, storage, entry))?;
Expand Down Expand Up @@ -188,9 +194,17 @@ mod tests {
url: Some("https://example.com".to_string()),
icon_url: None,
totp_secret: Some("GEZDGNBVGY3TQOJQ".to_string()),
alias_provider_id: Some("simplelogin".to_string()),
}
}

#[test]
fn full_entry_payload_includes_alias_provider_id() {
let payload = serialize_full_entry(&entry_with_secret());

assert!(payload.contains("\"alias_provider_id\":\"simplelogin\""));
}

#[test]
fn full_entry_payload_never_exposes_totp_secret() {
let payload = serialize_full_entry(&entry_with_secret());
Expand Down
1 change: 1 addition & 0 deletions frontend/src-tauri/src/commands/health.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ mod tests {
url: None,
icon_url: None,
totp_secret: None,
alias_provider_id: None,
});
workspace.start([5u8; 32]);
workspace.session_start =
Expand Down
1 change: 1 addition & 0 deletions frontend/src-tauri/src/commands/totp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ mod tests {
url: None,
icon_url: None,
totp_secret: Some("GEZDGNBVGY3TQOJQGEZDGNBVGY3TQOJQ".to_string()),
alias_provider_id: None,
});
workspace.start([7; 32]);

Expand Down
3 changes: 3 additions & 0 deletions frontend/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ pub fn run() {
commands::credential::delete_entry,
commands::totp::get_totp_token,
commands::alias::save_alias_config,
commands::alias::list_alias_configs,
commands::alias::delete_alias_config,
commands::alias::set_default_alias_provider,
commands::alias::generate_email_mask,
commands::generator::generate_password,
commands::generator::analyze_password_strength,
Expand Down
Loading