diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index 573cb130ff..230c8a88ef 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -8117,7 +8117,7 @@ still gets the row: only picking it sends anything. One-time and verification co OTP, 2FA, MFA, CVV and CVC values, "card ending" digits, passphrases, recovery or seed phrases (twelve words in a row on the BIP39 English list in `src/search/bip39Words.js`, also with commas, numbered or after "my seed -is", so a long question or request still goes to Ask GEV; twelve with three +is", so a long question or request still goes to Ask GEV; twelve with four words for places or things on a map, such as "park", "beach" or "airport", are a list of places), "my secret is …", an email spelled out ("john at example dot com", "punto com", or letter by letter), a door, diff --git a/src/search/placeSuggestions.js b/src/search/placeSuggestions.js index e3f3e1c938..dbea0c7dec 100644 --- a/src/search/placeSuggestions.js +++ b/src/search/placeSuggestions.js @@ -21,14 +21,16 @@ export const minPlaceChars = (text) => (isCjk(text) ? 2 : 3); */ const MAP_WORDS = new Set( ( - 'airport bar beach bike boat bridge bus cafe car castle city coast coffee ' + - 'country desert east elevator ferry fire flight forest garden harbor ' + - 'hospital hotel house island lake market moon mountain museum north ' + - 'ocean office park planet pizza rain river road rocket satellite school ' + - 'sea ship shop snow south space station storm street sun ' + - 'swim taxi tower town traffic train truck tunnel valley village ' + - 'weather west wind world zoo canyon church stadium bank restaurant ' + - 'map area today tomorrow near' + 'airport alley arena bar beach bike boat border bridge bus cabin camp ' + + 'canal canyon capital car castle cave city cliff clinic coast coffee ' + + 'country cruise dentist desert dune east elevator farm field fire ' + + 'flight forest gallery garage garden gym harbor hill hospital hotel ' + + 'island jungle kitchen lake library market meadow moon mountain museum ' + + 'nation north ocean office opera palace park pizza planet police pond ' + + 'pool rail rain ranch region ridge river road rocket route school sea ' + + 'ship shop ski snow soccer south space square stadium street subway sun ' + + 'swamp taxi tennis tornado tower town traffic train truck tunnel valley ' + + 'van vessel village volcano wagon weather west wine zoo' ).split(' '), ); @@ -194,7 +196,9 @@ function privacyReason(text) { // groups with "::", or five colons or more (a time has two). if ( line.split(' ').some((token) => { - const bare = token.replace(/^[[(]+|[\]),.;]+$/g, '').replace(/%\w+$/, ''); + const bare = token + .replace(/^[[(]+|(?<=[^\]),.;])[\]),.;]+$/g, '') + .replace(/%\w+$/, ''); const colons = (bare.match(/:/g) || []).length; return ( /^[0-9a-f:.]+$/i.test(bare) && @@ -211,23 +215,23 @@ function privacyReason(text) { // Written with commas, numbered ("1. abandon 2. ability") or after a few // words ("my seed is …"): twelve of the list's words in a row. The list // has many words for places and things on a map, and a phrase is drawn at - // random from all of it: twelve with three of those ("coffee, bar, - // hotel, museum, park …") is a list of places. - let run = 0; - let mapWords = 0; + // random from all of it: twelve with four of those ("coffee, bar, hotel, + // museum, park …") are a list of places, which a phrase is about once in + // three hundred. + const recent = []; for (const token of line.toLowerCase().split(/[\s,;]+/)) { const word = token .replace(/^\d+[.)]?/, '') .replace(/(?<=[a-z])[^a-z]+$/, ''); if (!word && token) continue; if (!isBip39Word(word)) { - run = 0; - mapWords = 0; + recent.length = 0; continue; } - run += 1; - if (MAP_WORDS.has(word)) mapWords += 1; - if (run >= 12 && mapWords < 3) return 'other'; + recent.push(MAP_WORDS.has(word)); + if (recent.length > 12) recent.shift(); + if (recent.length === 12 && recent.filter(Boolean).length < 4) + return 'other'; } // Coordinates and grid references are a spot, not a number to keep: only // text the place search itself reads as coordinates, as typed ("١٢٣٤, @@ -385,7 +389,7 @@ function privacyReason(text) { function bearerToken(line) { if (/\bauthori[sz]ation\s*:\s*bearer\b\s*\S/i.test(line)) return true; for (const match of line.matchAll(/\bbearer\b(\s*[:=#]?\s*)(\S+)/gi)) { - const value = match[2].replace(/[,.;:!?)]+$/, ''); + const value = match[2].replace(/(?<=[^,.;:!?)])[,.;:!?)]+$/, ''); // Only a word after a space may be a name: "Bearer: island" is a token. if (/^\s+$/.test(match[1]) && PLACE_WORDS.test(value)) continue; return true; @@ -410,7 +414,7 @@ function codeAfterLabel(line) { // After a label in lower case, any value is a code ("verification code // Abc"); after one written as a name, only a value that is not one. const coded = - /\b((?:otp|2fa|mfa|cvv|cvc|(?:verification|one-time|security|auth|login) code)(?:\s+is)?)\s+([a-z0-9][a-z0-9-]{2,63})(?:(?:\s*[,;]\s*|\s+)(?:thanks|thank you|thx|ty|cheers|please|pls|ok|now)(?:\s+(?:a lot|so much|very much|again))?)?[\s.!?]*$/i.exec( + /\b((?:otp|2fa|mfa|cvv|cvc|(?:verification|one-time|security|auth|login) code)(?:\s+is)?)\s+([a-z0-9][a-z0-9-]{2,63})(?:(?:\s*[,;]\s*|\s+-+\s+|\s+)(?:thanks|thank you|thx|ty|cheers|please|pls|ok|now)(?:\s+(?:a lot|so much|very much|again))?)?[\s.!?]*$/i.exec( line, ); if (coded) { @@ -437,7 +441,7 @@ function codeAfterLabel(line) { } // A value in mixed case that is no name ("PIN aBcD", "gate code aBcD"). const mixed = - /\b(?:pin|(?:door|access|gate|alarm|entry) code)(?:\s+is)?\s+([a-z0-9-]{4,64})(?:(?:\s*[,;]\s*|\s+)(?:thanks|thank you|thx|ty|cheers|please|pls|ok|now)(?:\s+(?:a lot|so much|very much|again))?)?[\s.!?]*$/i.exec( + /\b(?:pin|(?:door|access|gate|alarm|entry) code)(?:\s+is)?\s+([a-z0-9-]{4,64})(?:(?:\s*[,;]\s*|\s+-+\s+|\s+)(?:thanks|thank you|thx|ty|cheers|please|pls|ok|now)(?:\s+(?:a lot|so much|very much|again))?)?[\s.!?]*$/i.exec( line, ); if ( @@ -448,7 +452,7 @@ function codeAfterLabel(line) { ) return true; const match = - /\b((?:pin|cvv|cvc|otp|2fa|mfa|(?:door|access|gate|alarm|entry|security|verification|one-time|auth|login) code)(?:\s+is)?)\s+([a-z0-9][a-z0-9-]{3,63})(?:(?:\s*[,;]\s*|\s+)(?:thanks|thank you|thx|ty|cheers|please|pls|ok|now)(?:\s+(?:a lot|so much|very much|again))?)?[\s.!?]*$/i.exec( + /\b((?:pin|cvv|cvc|otp|2fa|mfa|(?:door|access|gate|alarm|entry|security|verification|one-time|auth|login) code)(?:\s+is)?)\s+([a-z0-9][a-z0-9-]{3,63})(?:(?:\s*[,;]\s*|\s+-+\s+|\s+)(?:thanks|thank you|thx|ty|cheers|please|pls|ok|now)(?:\s+(?:a lot|so much|very much|again))?)?[\s.!?]*$/i.exec( line, ); if (!match) return false; diff --git a/src/search/placeSuggestions.test.mjs b/src/search/placeSuggestions.test.mjs index b6f17b0bd6..e05b6fa3e6 100644 --- a/src/search/placeSuggestions.test.mjs +++ b/src/search/placeSuggestions.test.mjs @@ -470,6 +470,8 @@ test('spelled-out emails, addresses, phrases, codes and short phone numbers stay 'otp ABCDEF thanks!!', 'verification code ABCDEF thanks a lot', 'otp ABCDEF cheers', + 'otp ab12cd - thanks', + 'gate code aBcD - thanks', 'abandon ability able about above absent absorb abstract absurd abuse access accident.', 'abandon, ability, able, about, above, absent, absorb, abstract, absurd, abuse, access, accident', '1. abandon 2. ability 3. able 4. about 5. above 6. absent 7. absorb 8. abstract 9. absurd 10. abuse 11. access 12. accident', @@ -543,6 +545,7 @@ test('places that only looked private are looked up', () => { 'coffee, bar, hotel, museum, park, beach, hospital, school, market, bridge, tower, airport', '1. beach 2. park 3. museum 4. zoo 5. bridge 6. tower 7. market 8. castle 9. island 10. lake 11. river 12. canyon', 'show only bus, train, car, truck, ship, boat traffic over city bridge today', + 'museum, gallery, library, palace, square, alley, canal, garden, hill, cave, farm, field', // Questions for the assistant, however many short words they have. 'can you tell where the most flights are going over texas today', 'are there any storms near florida right now that might cause delays', @@ -650,6 +653,8 @@ test('a long line is read quickly', () => { ...['a-', 'a.', '1-', 'a ', '//[a:'].map((unit) => unit.repeat(10000)), `otp a${'-'.repeat(20000)}!x`, `gate code a${'-'.repeat(20000)}!x`, + `${','.repeat(20000)}!x`, + `bearer x${','.repeat(20000)}z`, ]) { const started = performance.now(); mayBePrivate(line);