[Payments] Add validation for unsupported credit card types in editor.

components/autofill/core/browser/validation.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/validation.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/state_names.h"
 #include "components/autofill/core/common/autofill_clock.h"
 #include "components/autofill/core/common/autofill_regexes.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
 
 bool IsValidCreditCardExpirationDate(int year,
@@ skipping 66 matching lines @@
   return (sum % 10) == 0;
 }
 
 bool IsValidCreditCardSecurityCode(const base::string16& code,
                                    const base::StringPiece card_type) {
   size_t required_length = card_type == kAmericanExpressCard ? 4 : 3;
   return code.length() == required_length &&
          base::ContainsOnlyChars(code, base::ASCIIToUTF16("0123456789"));
 }
 
+bool IsValidCreditCardNumberForBasicCardNetworks(
+    const base::string16& text,
+    const std::set<std::string>& supported_basic_card_networks,
+    base::string16* error_message) {
+  // The type check is cheaper than the credit card number check.
+  const std::string basic_card_payment_type =
+      autofill::data_util::GetPaymentRequestData(
+          CreditCard::GetCreditCardType(text))
+          .basic_card_payment_type;
+  if (!supported_basic_card_networks.count(basic_card_payment_type)) {
+    if (error_message) {

[anthonyvd, 2017/02/23 16:42:27]

I would prefer just commenting in the .h that error_message can't be null and
DCHECK(error_message) at the beginning of this function.

[Mathieu, 2017/02/23 16:48:31]

Good idea!

+      *error_message = l10n_util::GetStringUTF16(
+          IDS_PAYMENTS_VALIDATION_UNSUPPORTED_CREDIT_CARD_TYPE);
+    }
+    return false;
+  }
+
+  if (IsValidCreditCardNumber(text))
+    return true;
+
+  if (error_message) {
+    *error_message = l10n_util::GetStringUTF16(
+        IDS_PAYMENTS_CARD_NUMBER_INVALID_VALIDATION_MESSAGE);
+  }
+  return false;
+}
+
 bool IsValidEmailAddress(const base::string16& text) {
   // E-Mail pattern as defined by the WhatWG. (4.10.7.1.5 E-Mail state)
   const base::string16 kEmailPattern = base::ASCIIToUTF16(
       "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@"
       "[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$");
   return MatchesPattern(text, kEmailPattern);
 }
 
 bool IsValidState(const base::string16& text) {
   return !state_names::GetAbbreviationForName(text).empty() ||
@@ skipping 151 matching lines @@
       }
 
       if (error_message) {
         *error_message = l10n_util::GetStringUTF16(
             IDS_PAYMENTS_VALIDATION_INVALID_CREDIT_CARD_EXPIRED);
       }
       break;
     }
 
     case CREDIT_CARD_NUMBER:
-      if (IsValidCreditCardNumber(value))
-        return true;
-
-      if (error_message) {
-        *error_message = l10n_util::GetStringUTF16(
-            IDS_PAYMENTS_CARD_NUMBER_INVALID_VALIDATION_MESSAGE);
-      }
+      NOTREACHED() << "IsValidCreditCardNumberForBasicCardNetworks should be "

[anthonyvd, 2017/02/23 16:42:28]

Are you sure this wasn't already used with CREDIT_CARD_NUMBER in any other code
that you'd now be breaking? I'd be surprised if this code was dead previously.

[Mathieu, 2017/02/23 16:48:31]

Yes this function is new for PaymentRequest (I wrote it)

[anthonyvd, 2017/02/23 17:00:18]

Oh haha, my bad!

+                   << "used to validate credit card numbers";
       break;
 
     default:
       // Other types such as CREDIT_CARD_TYPE and CREDIT_CARD_VERIFICATION_CODE
       // are not validated for now.
       NOTREACHED() << "Attempting to validate unsupported type " << type;
       break;
   }
   return false;
 }
 
 }  // namespace autofill