Super small fix (#412)

* Fix for cc expiry date Signed-off-by: Emanuele Feliziani <[email protected]> * Log tweaks Signed-off-by: Emanuele Feliziani <[email protected]> * Add tests and compiled files Signed-off-by: Emanuele Feliziani <[email protected]> --------- Signed-off-by: Emanuele Feliziani <[email protected]>
duckduckgo · Nov 9, 2023 · 8ae227f · 8ae227f
1 parent 611e149
commit 8ae227f
Show file tree

Hide file tree

Showing 10 changed files with 345 additions and 28 deletions.
diff --git a/dist/autofill-debug.js b/dist/autofill-debug.js
diff --git a/dist/autofill.js b/dist/autofill.js
diff --git a/src/Form/Form.js b/src/Form/Form.js
@@ -382,7 +382,7 @@ class Form {
                 foundInputs.forEach(input => this.addInput(input))
             } else {
                 // This is rather extreme, but better safe than sorry
-                this.device.scanner.stopScanner('The form has too many inputs, bailing.')
+                this.device.scanner.stopScanner(`The form has too many inputs (${foundInputs.length}), bailing.`)
                 return
             }
         }
@@ -449,7 +449,7 @@ class Form {
 
         // If the form has too many inputs, destroy everything to avoid performance issues
         if (this.inputs.all.size > MAX_INPUTS_PER_FORM) {
-            this.device.scanner.stopScanner('The form has too many inputs, destroying.')
+            this.device.scanner.stopScanner('The form has too many inputs, bailing.')
             return this
         }
 

diff --git a/src/Form/matching-config/__generated__/compiled-matching-config.js b/src/Form/matching-config/__generated__/compiled-matching-config.js
diff --git a/src/Form/matching-config/selectors-css.js b/src/Form/matching-config/selectors-css.js
@@ -105,7 +105,7 @@ const username = [
 
 const password = [
     `input[type=password]:not([autocomplete*=cc]):not([autocomplete=one-time-code]):not([name*=answer i]):not([name*=mfa i]):not([name*=tin i]):not([name*=card i]):not([name*=cvv i])`,
-    // DDG's CloudSave feature https://emanuele.duckduckgo.com/settings
+    // DDG's CloudSave feature https://duckduckgo.com/settings
     'input.js-cloudsave-phrase'
 ]
 
@@ -154,7 +154,8 @@ const expirationMonth = `
 [id*=expiration i][id*=month i],
 [name*=cc-exp-month i],
 [name*="card_exp-month" i],
-[name*=cc_exp_month i]`
+[name*=cc_exp_month i],
+[id*=cc-month i]`
 
 const expirationYear = `
 [autocomplete="cc-exp-year" i],
@@ -167,7 +168,8 @@ const expirationYear = `
 [id*=expiration i][id*=year i],
 [name*="cc-exp-year" i],
 [name*="card_exp-year" i],
-[name*=cc_exp_year i]`
+[name*=cc_exp_year i],
+[id*=cc-year i]`
 
 const expiration = `
 [autocomplete="cc-exp" i],

diff --git a/src/Form/test-cases/index.json b/src/Form/test-cases/index.json
@@ -504,5 +504,6 @@
   { "html": "metalarchives_login.html" },
   { "html": "accor_hotel-booking.html" },
   { "html": "pcsretirementcom_login.html", "expectedSubmitFalsePositives": 3 },
+  { "html": "lakeshorelearning_checkout.html" },
   { "html": "flytap_login.html" }
 ]