[Autofill] Autofill fails to fill credit card number when split across fields.

components/autofill/core/browser/credit_card_field.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/credit_card_field.h"
 
 #include <stddef.h>
 
+#include <algorithm>
+
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_regex_constants.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 
+static const size_t kMaxValidCardNumberSize = 19;
+
 // static
 FormField* CreditCardField::Parse(AutofillScanner* scanner) {
   if (scanner->IsEnd())
     return NULL;
 
   scoped_ptr<CreditCardField> credit_card_field(new CreditCardField);
   size_t saved_cursor = scanner->SaveCursor();
 
   // Credit card fields can appear in many different orders.
   // We loop until no more credit card related fields are found, see |break| at
@@ skipping 50 matching lines @@
     // has a plethora of names; we've seen "verification #",
     // "verification number", "card identification number" and others listed
     // in the |pattern| below.
     base::string16 pattern = base::UTF8ToUTF16(autofill::kCardCvcRe);
     if (!credit_card_field->verification_ &&
         ParseField(scanner, pattern, &credit_card_field->verification_)) {
       continue;
     }
 
     pattern = base::UTF8ToUTF16(autofill::kCardNumberRe);
-    if (!credit_card_field->number_ &&
-        ParseField(scanner, pattern, &credit_card_field->number_)) {
+    const AutofillField* cc_number_field;
+    if (ParseField(scanner, pattern, &cc_number_field)) {
+      // Avoid autofilling any credit card number field having very low or high
+      // |start_index| on the HTML form.
+      size_t start_index = 0;
+      if (!credit_card_field->numbers_.empty()) {
+        size_t last_number_field_size =
+            credit_card_field->numbers_.back()
+                ->credit_card_number_start_index() +

[Evan Stade, 2014/08/12 16:05:07]

style-wise, a lot of this seems off to me. Could you run git cl format?

[Pritam Nikam, 2014/08/12 18:39:11]

It's after git cl format only :)

+            credit_card_field->numbers_.back()->max_length;
+        if (!last_number_field_size ||

[Evan Stade, 2014/08/12 16:05:07]

please don't implicitly convert size_t to boolean. Replace this with
last_number_field_size == OU

[Pritam Nikam, 2014/08/12 18:39:11]

Done.

+            last_number_field_size >= kMaxValidCardNumberSize)
+          return NULL;

[Evan Stade, 2014/08/12 16:05:07]

\n

[Pritam Nikam, 2014/08/12 18:39:11]

Done.

+        start_index = last_number_field_size;
+      }
+
+      AutofillField* current_number_field =
+          const_cast<AutofillField*>(cc_number_field);

[Evan Stade, 2014/08/12 16:05:07]

you still have this const_cast... I agree with Ilya that the signature of
ParseField ought to be changed.

[Pritam Nikam, 2014/08/12 18:39:11]

[Same as my previous comments]
I didn't get any alternative approach to fix const_cast<> used here. 

Changing ParseField() signature alone will not help,  have to introduce lots of
signature changes as it's just a wrapper API. And may be doing that will have
ripple effect across [form-field, scanner and cursor modules]. Isn't it an
overkill for this issue.

I'm kind of blocked here, please guide me how can I solve this problem.

[Evan Stade, 2014/08/12 19:19:55]

What is the cursor module?
the code becomes a lot harder to follow if there are a ton of false consts
sprinkled throughout, so no.
Remove all the consts you need to. I think this will only touch FormField and
AutofillScanner.

+      current_number_field->set_credit_card_number_start_index(start_index);
+      credit_card_field->numbers_.push_back(current_number_field);
       continue;
     }
 
     if (LowerCaseEqualsASCII(scanner->Cursor()->form_control_type, "month")) {
       credit_card_field->expiration_date_ = scanner->Cursor();
       scanner->Advance();
     } else {
       // First try to parse split month/year expiration fields.
       scanner->SaveCursor();
       pattern = base::UTF8ToUTF16(autofill::kExpirationMonthRe);
@@ skipping 56 matching lines @@
   if (credit_card_field->cardholder_)
     return credit_card_field.release();
 
   // On some pages, the user selects a card type using radio buttons
   // (e.g. test page Apple Store Billing.html).  We can't handle that yet,
   // so we treat the card type as optional for now.
   // The existence of a number or cvc in combination with expiration date is
   // a strong enough signal that this is a credit card.  It is possible that
   // the number and name were parsed in a separate part of the form.  So if
   // the cvc and date were found independently they are returned.
-  if ((credit_card_field->number_ || credit_card_field->verification_) &&
+  if ((!credit_card_field->numbers_.empty() ||
+       credit_card_field->verification_) &&
       (credit_card_field->expiration_date_ ||
        (credit_card_field->expiration_month_ &&
         credit_card_field->expiration_year_))) {
     return credit_card_field.release();
   }
 
   scanner->RewindTo(saved_cursor);
   return NULL;
 }
 
 CreditCardField::CreditCardField()
     : cardholder_(NULL),
       cardholder_last_(NULL),
       type_(NULL),
-      number_(NULL),
       verification_(NULL),
       expiration_month_(NULL),
       expiration_year_(NULL),
       expiration_date_(NULL),
       is_two_digit_year_(false) {
 }
 
+CreditCardField::~CreditCardField() {
+}
+
 bool CreditCardField::ClassifyField(ServerFieldTypeMap* map) const {
-  bool ok = AddClassification(number_, CREDIT_CARD_NUMBER, map);
+  bool ok = true;
+  for (std::vector<const AutofillField*>::const_iterator it = numbers_.begin();
+       it != numbers_.end();
+       ++it) {
+    ok = ok && AddClassification(*it, CREDIT_CARD_NUMBER, map);
+  }
+
   ok = ok && AddClassification(type_, CREDIT_CARD_TYPE, map);
   ok = ok && AddClassification(verification_, CREDIT_CARD_VERIFICATION_CODE,
                                map);
 
   // If the heuristics detected first and last name in separate fields,
   // then ignore both fields. Putting them into separate fields is probably
   // wrong, because the credit card can also contain a middle name or middle
   // initial.
   if (cardholder_last_ == NULL)
     ok = ok && AddClassification(cardholder_, CREDIT_CARD_NAME, map);
@@ skipping 16 matching lines @@
       ok = ok && AddClassification(expiration_year_,
                                    CREDIT_CARD_EXP_4_DIGIT_YEAR,
                                    map);
     }
   }
 
   return ok;
 }
 
 }  // namespace autofill