Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Increase default shown autofill suggestions from 3 to 10 (#1633)
Leendert de Borst38f3a1359e1e
diff --git a/core/rust/src/credential_matcher/mod.rs b/core/rust/src/credential_matcher/mod.rsindex 270f70898..606e898b4 100644--- a/core/rust/src/credential_matcher/mod.rs+++ b/core/rust/src/credential_matcher/mod.rs@@ -20,6 +20,11 @@ pub use domain::{extract_domain, extract_domain_with_port, extract_root_domain,use domain::{domains_match, is_app_package_name};use stop_words::STOP_WORDS;+/// Default per-priority cap on returned matches when the caller does not+/// supply `max_results`. Chosen as a balance between dropdown usability+/// (scrollable but not overwhelming) and inline-strip needs.+pub const DEFAULT_MAX_RESULTS: usize = 10;+/// Matching mode for credential filtering.#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]#[serde(rename_all = "snake_case")]@@ -60,12 +65,17 @@ pub struct CredentialMatcherInput {/// All domain matches will be treated equally regardless of port.#[serde(default)]pub ignore_port: bool,+ /// Per-priority cap on returned matches. Defaults to [`DEFAULT_MAX_RESULTS`]+ /// (10) when omitted by the caller.+ #[serde(default)]+ pub max_results: Option<usize>,}/// Output from credential filtering.#[derive(Debug, Clone, Serialize, Deserialize)]pub struct CredentialMatcherOutput {- /// IDs of matched credentials (max 3), in priority order+ /// IDs of matched credentials, in priority order. Capped at+ /// `input.max_results` (defaults to [`DEFAULT_MAX_RESULTS`]).pub matched_ids: Vec<String>,/// Which priority level matched (1-4, or 0 if no match)pub matched_priority: u8,@@ -84,7 +94,8 @@ struct CredentialWithPriority {/// * `input` - CredentialMatcherInput containing credentials and search context////// # Returns-/// CredentialMatcherOutput with filtered credentials (max 3)+/// CredentialMatcherOutput with filtered credentials (capped per+/// `input.max_results`, defaulting to [`DEFAULT_MAX_RESULTS`])pub fn filter_credentials(input: CredentialMatcherInput) -> CredentialMatcherOutput {let CredentialMatcherInput {credentials,@@ -92,7 +103,9 @@ pub fn filter_credentials(input: CredentialMatcherInput) -> CredentialMatcherOutpage_title,matching_mode,ignore_port,+ max_results,} = input;+ let max_results = max_results.unwrap_or(DEFAULT_MAX_RESULTS);// Early return for empty URLif current_url.is_empty() {@@ -116,7 +129,7 @@ pub fn filter_credentials(input: CredentialMatcherInput) -> CredentialMatcherOut.any(|url| !url.is_empty() && url == ¤t_url)}).map(|cred| cred.id.clone())- .take(3)+ .take(max_results).collect();// EARLY RETURN if matches found@@ -229,7 +242,7 @@ pub fn filter_credentials(input: CredentialMatcherInput) -> CredentialMatcherOut.filter(|c| c.priority == best_priority).collect();- // Sort by priority, deduplicate by ID, take first 3+ // Sort by priority, deduplicate by ID, cap at max_resultslet mut sorted = filtered_by_priority;sorted.sort_by_key(|c| c.priority);let mut seen_ids: HashSet<String> = HashSet::new();@@ -237,7 +250,7 @@ pub fn filter_credentials(input: CredentialMatcherInput) -> CredentialMatcherOut.into_iter().filter(|c| seen_ids.insert(c.credential.id.clone())).map(|c| c.credential.id)- .take(3)+ .take(max_results).collect();return CredentialMatcherOutput {@@ -282,7 +295,7 @@ pub fn filter_credentials(input: CredentialMatcherInput) -> CredentialMatcherOut}}).map(|cred| cred.id.clone())- .take(3)+ .take(max_results).collect();if !domain_word_match_ids.is_empty() {@@ -334,7 +347,7 @@ pub fn filter_credentials(input: CredentialMatcherInput) -> CredentialMatcherOut}}).map(|cred| cred.id.clone())- .take(3)+ .take(max_results).collect();// Return matches from Priority 3 if any found@@ -370,7 +383,7 @@ pub fn filter_credentials(input: CredentialMatcherInput) -> CredentialMatcherOut}}).map(|cred| cred.id.clone())- .take(3)+ .take(max_results).collect();if !text_match_ids.is_empty() {diff --git a/core/rust/src/credential_matcher/tests.rs b/core/rust/src/credential_matcher/tests.rsindex 8184ae049..e2cf0ef78 100644--- a/core/rust/src/credential_matcher/tests.rs+++ b/core/rust/src/credential_matcher/tests.rs@@ -69,6 +69,7 @@ fn filter(credentials: Vec<Credential>, current_url: &str, page_title: &str) ->page_title: page_title.to_string(),matching_mode: AutofillMatchingMode::Default,ignore_port: false,+ max_results: None,};let output = filter_credentials(input);@@ -376,6 +377,7 @@ fn test_json_roundtrip() {page_title: String::new(),matching_mode: AutofillMatchingMode::Default,ignore_port: false,+ max_results: None,};let json = serde_json::to_string(&input).unwrap();@@ -397,21 +399,37 @@ fn test_empty_url() {assert_eq!(matches.len(), 0);}-/// Test max 3 results returned+/// Test that the default cap (DEFAULT_MAX_RESULTS = 10) bounds the output.+/// Twelve candidates → exactly 10 returned.#[test]-fn test_max_three_results() {- let credentials = vec![- create_test_credential("Site 1", "example.com", ""),- create_test_credential("Site 2", "sub1.example.com", ""),- create_test_credential("Site 3", "sub2.example.com", ""),- create_test_credential("Site 4", "sub3.example.com", ""),- create_test_credential("Site 5", "sub4.example.com", ""),- ];+fn test_default_max_results_caps_at_ten() {+ let credentials: Vec<Credential> = (1..=12)+ .map(|i| create_test_credential(&format!("Site {i}"), &format!("sub{i}.example.com"), ""))+ .collect();let matches = filter(credentials, "https://example.com", "");- // Should return max 3 results- assert!(matches.len() <= 3);+ assert_eq!(matches.len(), 10, "Default cap should be DEFAULT_MAX_RESULTS (10)");+}++/// Test that an explicit `max_results` override is honoured.+#[test]+fn test_max_results_override() {+ let credentials: Vec<Credential> = (1..=8)+ .map(|i| create_test_credential(&format!("Site {i}"), &format!("sub{i}.example.com"), ""))+ .collect();++ let input = CredentialMatcherInput {+ credentials,+ current_url: "https://example.com".to_string(),+ page_title: String::new(),+ matching_mode: AutofillMatchingMode::Default,+ ignore_port: false,+ max_results: Some(2),+ };+ let output = filter_credentials(input);++ assert_eq!(output.matched_ids.len(), 2, "Explicit max_results=2 should cap output");}/// [#23] - E2E test scenario: credentials with URLs should only match their specific domains@@ -506,6 +524,7 @@ fn test_multi_url_exact_match_priority() {page_title: String::new(),matching_mode: AutofillMatchingMode::Default,ignore_port: false,+ max_results: None,};let output = filter_credentials(input);@@ -771,6 +790,7 @@ fn filter_ignore_port(credentials: Vec<Credential>, current_url: &str, page_titlpage_title: page_title.to_string(),matching_mode: AutofillMatchingMode::Default,ignore_port: true,+ max_results: None,};let output = filter_credentials(input);@@ -862,10 +882,9 @@ fn test_ignore_port_ip_with_multiple_ports_and_no_port() {// Visiting 192.168.1.10 (no port) should match ALL 4 credentials// because we ignore port differences entirelylet android_matches = filter_ignore_port(credentials.clone(), "https://192.168.1.10", "");- assert_eq!(android_matches.len(), 3, "With ignore_port, should match all 4 credentials (max 3 returned)");+ assert_eq!(android_matches.len(), 4, "With ignore_port, should match all 4 credentials");- // Note: max 3 results are returned, but all 4 would match if limit was higher- // Let's verify with a smaller set that all match+ // Sanity-check with a smaller set that all matchlet small_credentials = vec![create_test_credential("Service on 5000", "https://192.168.1.10:5000", "admin@5000"),create_test_credential("Service no port", "https://192.168.1.10", "admin@noport"),@@ -910,9 +929,9 @@ fn test_localhost_matching_with_ports() {assert_eq!(matches_no_port.len(), 1, "Should only return localhost without port match");assert_eq!(matches_no_port[0].item_name.as_deref(), Some("Local No Port"));- // Visiting localhost with a port not in credentials should show domain matches (up to 3)+ // Visiting localhost with a port not in credentials should show all domain matcheslet matches_unknown_port = filter(credentials.clone(), "http://localhost:5000", "");- assert_eq!(matches_unknown_port.len(), 3, "Should return domain matches when no exact port match");+ assert_eq!(matches_unknown_port.len(), 4, "Should return all domain matches when no exact port match");}/// [#42] - Localhost matching - exact URL stored