Autofill should filter malformed emails addresses when form is submitted

chrome/browser/autofill/personal_data_manager.cc

 // Copyright (c) 2010 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 "chrome/browser/autofill/personal_data_manager.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/autofill-inl.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebRegularExpression.h"

[Ilya Sherman, 2011/02/03 04:24:20]

nit: 80-col?  I'm not exactly sure what our style guide says for this...

[dhollowa, 2011/02/03 16:23:02]

Nothing to be done.  Can't be split.

+#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 
 namespace {
 
 // The minimum number of fields that must contain user data and have known types
 // before AutoFill will attempt to import the data into a profile or a credit
 // card.
 const int kMinProfileImportSize = 3;
 const int kMinCreditCardImportSize = 2;
 
 template<typename T>
@@ skipping 30 matching lines @@
   const T& operator()(const T_Iterator& iterator) {
     return *iterator;
   }
 };
 
 template<typename T>
 T* address_of(T& v) {
   return &v;
 }
 
+bool IsValidEmail(const string16& value) {
+  // This regex is more permissive than the official rfc2822 spec on the
+  // subject, but it does reject obvious non-email addresses.

[Ilya Sherman, 2011/02/03 04:24:20]

nit: I find raw regexes hard to read; it would be nice to mention in the comment
what this regex is looking for.

[dhollowa, 2011/02/03 16:23:02]

I can't think of a comment that does any better than either saying it's an email
address, or look at the regex.  Leaving as is.

+  const string16 kEmailPattern =
+      ASCIIToUTF16("^[^@]+@.+\\.[a-z]{2,4}$");

[Ilya Sherman, 2011/02/03 04:24:20]

nit: Looks like ".museum" and ".travel" are valid TLDs:
http://en.wikipedia.org/wiki/List_of_Internet_top-level_domains

[dhollowa, 2011/02/03 16:23:02]

Done.

+  WebKit::WebRegularExpression re(WebKit::WebString(kEmailPattern),
+                                  WebKit::WebTextCaseInsensitive);
+  bool match = re.match(
+      WebKit::WebString(StringToLowerASCII(value))) != -1;

[Ilya Sherman, 2011/02/03 04:24:20]

nit: I would skip the local variable and just "return re.match(...", but I don't
feel at all strongly about it.

[dhollowa, 2011/02/03 16:23:02]

Done.

+  return match;
+}
+
 }  // namespace
 
 PersonalDataManager::~PersonalDataManager() {
   CancelPendingQuery(&pending_profiles_query_);
   CancelPendingQuery(&pending_creditcards_query_);
 }
 
 void PersonalDataManager::OnWebDataServiceRequestDone(
     WebDataService::Handle h,
     const WDTypedResult* result) {
@@ skipping 131 matching lines @@
             number_type = AutoFillType(PHONE_FAX_NUMBER);
 
           string16 stored_number = imported_profile_->GetFieldText(number_type);
           if (stored_number.size() ==
                   static_cast<size_t>(PhoneNumber::kPrefixLength) &&
               value.size() == static_cast<size_t>(PhoneNumber::kSuffixLength)) {
             value = stored_number + value;
           }
         }
 
+        if (field_type.field_type() == EMAIL_ADDRESS && !IsValidEmail(value))
+          continue;
+
         imported_profile_->SetInfo(AutoFillType(field_type.field_type()),
                                    value);
         ++importable_fields;
       }
     }
   }
 
   // If the user did not enter enough information on the page then don't bother
   // importing the data.
   if (importable_fields < kMinProfileImportSize)
@@ skipping 559 matching lines @@
     }
 
     creditcards.push_back(**iter);
   }
 
   if (!merged)
     creditcards.push_back(*imported_credit_card_);
 
   SetCreditCards(&creditcards);
 }