Bug 1956282, when fathom matches a credit card name, also check if the field matches an address name, r=dimi,credential-management-reviewers

marco-c · marco-c · commit 9f0146eba4dd · 2025-10-08T10:13:00.000Z
Differential Revision: https://phabricator.services.mozilla.com/D267546 UltraBlame original commit: 8fdfac9a2c68e158c5e79a68817cf0392c7ca1e5
diff --git a/browser/extensions/formautofill/test/browser/heuristics/browser_parse_name_fields.js b/browser/extensions/formautofill/test/browser/heuristics/browser_parse_name_fields.js
@@ -1890,6 +1890,197 @@ level2
 }
 ]
 }
+{
+description
+:
+Form
+field
+where
+fathom
+detects
+credit
+card
+name
+fixtureData
+:
+<
+html
+>
+<
+body
+>
+<
+label
+>
+Nom
+<
+input
+/
+>
+<
+/
+label
+>
+<
+label
+>
+Pr
+nom
+<
+input
+/
+>
+<
+/
+label
+>
+<
+label
+>
+Saisir
+une
+adresse
+avec
+un
+num
+ro
+de
+maison
+<
+input
+/
+>
+<
+/
+label
+>
+<
+label
+>
+Ligne
+d
+'
+adresse
+2
+<
+input
+/
+>
+<
+/
+label
+>
+<
+label
+>
+Code
+postal
+<
+input
+/
+>
+<
+/
+label
+>
+<
+/
+body
+>
+<
+/
+html
+>
+expectedResult
+:
+[
+{
+default
+:
+{
+reason
+:
+"
+regex
+-
+heuristic
+"
+}
+fields
+:
+[
+{
+fieldName
+:
+"
+family
+-
+name
+"
+reason
+:
+"
+update
+-
+heuristic
+"
+}
+{
+fieldName
+:
+"
+given
+-
+name
+"
+}
+{
+fieldName
+:
+"
+address
+-
+line1
+"
+reason
+:
+"
+update
+-
+heuristic
+-
+alternate
+"
+}
+{
+fieldName
+:
+"
+address
+-
+line2
+"
+reason
+:
+"
+update
+-
+heuristic
+"
+}
+{
+fieldName
+:
+"
+postal
+-
+code
+"
+}
+]
+}
+]
+}
 ]
 )
 ;
diff --git a/toolkit/components/formautofill/shared/FormAutofillHeuristics.sys.mjs b/toolkit/components/formautofill/shared/FormAutofillHeuristics.sys.mjs
@@ -7002,6 +7002,9 @@ inferredInfo
 ]
 ;
 }
+let
+fathomFoundType
+;
 if
 (
 lazy
@@ -7098,13 +7101,61 @@ if
 matchedFieldName
 )
 {
+/
+/
+If
+the
+name
+was
+matched
+fall
+through
+and
+try
+to
+detect
+if
+the
+/
+/
+field
+also
+matches
+an
+address
+type
+which
+may
+be
+a
+better
+match
+.
+if
+(
+matchedFieldName
+!
+=
+"
+cc
+-
+name
+"
+)
+{
 return
 [
 matchedFieldName
 inferredInfo
 ]
 ;
 }
+fathomFoundType
+=
+=
+CC_TYPE
+;
+}
 /
 /
 Continue
@@ -7506,6 +7557,7 @@ _findMatchedFieldNames
 (
 element
 fields
+fathomFoundType
 )
 ;
 return
@@ -8854,6 +8906,10 @@ _findMatchedFieldNames
 (
 element
 fieldNames
+foundType
+=
+"
+"
 )
 {
 if
@@ -8914,9 +8970,6 @@ ADDR_TYPE
 )
 ;
 let
-foundType
-;
-let
 attribute
 =
 true

Original file line number	Diff line number	Diff line change
`@@ -7002,6 +7002,9 @@ inferredInfo`
`7002`	`7002`	`]`
`7003`	`7003`	`;`
`7004`	`7004`	`}`
	`7005`	`+let`
	`7006`	`+fathomFoundType`
	`7007`	`+;`
`7005`	`7008`	`if`
`7006`	`7009`	`(`
`7007`	`7010`	`lazy`
`@@ -7098,13 +7101,61 @@ if`
`7098`	`7101`	`matchedFieldName`
`7099`	`7102`	`)`
`7100`	`7103`	`{`
	`7104`	`+/`
	`7105`	`+/`
	`7106`	`+If`
	`7107`	`+the`
	`7108`	`+name`
	`7109`	`+was`
	`7110`	`+matched`
	`7111`	`+fall`
	`7112`	`+through`
	`7113`	`+and`
	`7114`	`+try`
	`7115`	`+to`
	`7116`	`+detect`
	`7117`	`+if`
	`7118`	`+the`
	`7119`	`+/`
	`7120`	`+/`
	`7121`	`+field`
	`7122`	`+also`
	`7123`	`+matches`
	`7124`	`+an`
	`7125`	`+address`
	`7126`	`+type`
	`7127`	`+which`
	`7128`	`+may`
	`7129`	`+be`
	`7130`	`+a`
	`7131`	`+better`
	`7132`	`+match`
	`7133`	`+.`
	`7134`	`+if`
	`7135`	`+(`
	`7136`	`+matchedFieldName`
	`7137`	`+!`
	`7138`	`+=`
	`7139`	`+"`
	`7140`	`+cc`
	`7141`	`+-`
	`7142`	`+name`
	`7143`	`+"`
	`7144`	`+)`
	`7145`	`+{`
`7101`	`7146`	`return`
`7102`	`7147`	`[`
`7103`	`7148`	`matchedFieldName`
`7104`	`7149`	`inferredInfo`
`7105`	`7150`	`]`
`7106`	`7151`	`;`
`7107`	`7152`	`}`
	`7153`	`+fathomFoundType`
	`7154`	`+=`
	`7155`	`+=`
	`7156`	`+CC_TYPE`
	`7157`	`+;`
	`7158`	`+}`
`7108`	`7159`	`/`
`7109`	`7160`	`/`
`7110`	`7161`	`Continue`
`@@ -7506,6 +7557,7 @@ _findMatchedFieldNames`
`7506`	`7557`	`(`
`7507`	`7558`	`element`
`7508`	`7559`	`fields`
	`7560`	`+fathomFoundType`
`7509`	`7561`	`)`
`7510`	`7562`	`;`
`7511`	`7563`	`return`
`@@ -8854,6 +8906,10 @@ _findMatchedFieldNames`
`8854`	`8906`	`(`
`8855`	`8907`	`element`
`8856`	`8908`	`fieldNames`
	`8909`	`+foundType`
	`8910`	`+=`
	`8911`	`+"`
	`8912`	`+"`
`8857`	`8913`	`)`
`8858`	`8914`	`{`
`8859`	`8915`	`if`
`@@ -8914,9 +8970,6 @@ ADDR_TYPE`
`8914`	`8970`	`)`
`8915`	`8971`	`;`
`8916`	`8972`	`let`
`8917`		`-foundType`
`8918`		`-;`
`8919`		`-let`
`8920`	`8973`	`attribute`
`8921`	`8974`	`=`
`8922`	`8975`	`true`