Updating of all entries in PasswordManager of the same credentials on password update

chrome/browser/password_manager/password_store_mac.cc

 // Copyright (c) 2012 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/password_manager/password_store_mac.h"
 #include "chrome/browser/password_manager/password_store_mac_internal.h"
 
 #include <CoreServices/CoreServices.h>
 #include <set>
 #include <string>
@@ skipping 460 matching lines @@
                         const PasswordForm& form_b,
                         FormMatchStrictness strictness) {
   // We never merge blacklist entries between our store and the Keychain,
   // and federated logins should not be stored in the Keychain at all.
   if (form_a.blacklisted_by_user || form_b.blacklisted_by_user ||
       !form_a.federation_url.is_empty() || !form_b.federation_url.is_empty()) {
     return false;
   }
   bool equal_realm = form_a.signon_realm == form_b.signon_realm;
   if (strictness == FUZZY_FORM_MATCH) {
-    equal_realm |= (!form_a.original_signon_realm.empty()) &&
-                   form_a.original_signon_realm == form_b.signon_realm;
+    equal_realm |= form_a.IsPublicSuffixMatch() &&
+                   form_a.signon_realm == form_b.signon_realm;

[vabr (Chromium), 2015/09/24 15:17:33]

This duplicates the condition from line 479.
I believe we can just get rid of FUZZY_FORM_MATCH entirely, but we should test
on Mac that this does not end up deleting passwords from keychain.

[dvadym, 2015/09/25 10:19:52]

Done.

   }
   return form_a.scheme == form_b.scheme && equal_realm &&
          form_a.username_value == form_b.username_value;
 }
 
 // Moves entries from |forms| that represent either blacklisted or federated
 // logins into |extracted|. These two types are stored only in the LoginDatabase
 // and do not have corresponding Keychain entries.
 void ExtractNonKeychainForms(ScopedVector<autofill::PasswordForm>* forms,
                              ScopedVector<autofill::PasswordForm>* extracted) {
@@ skipping 683 matching lines @@
   }
 
   // Let's gather all signon realms we want to match with keychain entries.
   std::set<std::string> realm_set;
   realm_set.insert(form.signon_realm);
   for (const autofill::PasswordForm* db_form : database_forms) {
     // TODO(vabr): We should not be getting different schemes here.
     // http://crbug.com/340112
     if (form.scheme != db_form->scheme)
       continue;  // Forms with different schemes never match.
-    const std::string& original_singon_realm(db_form->original_signon_realm);
-    if (!original_singon_realm.empty())
-      realm_set.insert(original_singon_realm);
+    if (db_form->IsPublicSuffixMatch())
+      realm_set.insert(db_form->signon_realm);
   }
   ScopedVector<autofill::PasswordForm> keychain_forms;
   for (std::set<std::string>::const_iterator realm = realm_set.begin();
        realm != realm_set.end(); ++realm) {
     MacKeychainPasswordFormAdapter keychain_adapter(keychain_.get());
     ScopedVector<autofill::PasswordForm> temp_keychain_forms =
         keychain_adapter.PasswordsFillingForm(*realm, form.scheme);
     AppendSecondToFirst(&keychain_forms, &temp_keychain_forms);
   }
 
@@ skipping 71 matching lines @@
 }
 
 bool PasswordStoreMac::DatabaseHasFormMatchingKeychainForm(
     const autofill::PasswordForm& form) {
   DCHECK(login_metadata_db_);
   bool has_match = false;
   ScopedVector<autofill::PasswordForm> database_forms;
   if (!login_metadata_db_->GetLogins(form, &database_forms))
     return false;
   for (const autofill::PasswordForm* db_form : database_forms) {
-    // Below we filter out forms with non-empty original_signon_realm, because
-    // those signal fuzzy matches, and we are only interested in exact ones.
-    if (db_form->original_signon_realm.empty() &&
+    // Below we filter out fuzzy matched forms because we are only interested
+    // in exact ones.
+    if (!db_form->IsPublicSuffixMatch() &&
         internal_keychain_helpers::FormsMatchForMerge(
             form, *db_form, internal_keychain_helpers::STRICT_FORM_MATCH) &&
         db_form->origin == form.origin) {
       has_match = true;
       break;
     }
   }
   return has_match;
 }
 
@@ skipping 32 matching lines @@
   ScopedVector<PasswordForm> forms_with_keychain_entry;
   internal_keychain_helpers::GetPasswordsForForms(*keychain_, &database_forms,
                                                   &forms_with_keychain_entry);
 
   // Clean up any orphaned database entries.
   RemoveDatabaseForms(&database_forms);
 
   // Move the orphaned DB forms to the output parameter.
   AppendSecondToFirst(orphaned_forms, &database_forms);
 }