Fix IE password import

chrome/browser/password_manager/password_store_win.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_win.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "components/webdata/encryptor/ie7_password.h"
+#include "components/webdata/encryptor/ie7_password_win.h"
 
 using autofill::PasswordForm;
 using content::BrowserThread;
 
 // Handles requests to WebDataService.
 class PasswordStoreWin::DBHandler : public WebDataServiceConsumer {
  public:
   DBHandler(WebDataService* web_data_service,
             PasswordStoreWin* password_store)
       : web_data_service_(web_data_service),
@@ skipping 19 matching lines @@
 
     PasswordForm* form;
     PasswordStoreWin::ConsumerCallbackRunner callback_runner;
   };
 
   // Holds info associated with in-flight GetIE7Login requests.
   typedef std::map<WebDataService::Handle, RequestInfo> PendingRequestMap;
 
   // Gets logins from IE7 if no others are found. Also copies them into
   // Chrome's WebDatabase so we don't need to look next time.
-  PasswordForm* GetIE7Result(const WDTypedResult* result,
-                             const PasswordForm& form);
+  std::vector<autofill::PasswordForm*> GetIE7Results(
+      const WDTypedResult* result,
+      const PasswordForm& form);
 
   // WebDataServiceConsumer implementation.
   virtual void OnWebDataServiceRequestDone(
       WebDataService::Handle handle,
       const WDTypedResult* result) OVERRIDE;
 
   scoped_refptr<WebDataService> web_data_service_;
 
   // This creates a cycle between us and PasswordStore. The cycle is broken
   // from PasswordStoreWin::Shutdown, which deletes us.
@@ skipping 18 matching lines @@
     const PasswordForm& form,
     const PasswordStoreWin::ConsumerCallbackRunner& callback_runner) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   IE7PasswordInfo info;
   info.url_hash = ie7_password::GetUrlHash(UTF8ToWide(form.origin.spec()));
   WebDataService::Handle handle = web_data_service_->GetIE7Login(info, this);
   pending_requests_[handle] =
       RequestInfo(new PasswordForm(form), callback_runner);
 }
 
-PasswordForm* PasswordStoreWin::DBHandler::GetIE7Result(
+std::vector<PasswordForm*> PasswordStoreWin::DBHandler::GetIE7Results(
     const WDTypedResult *result,
     const PasswordForm& form) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  std::vector<PasswordForm*> matching_forms;
 
   const WDResult<IE7PasswordInfo>* r =
       static_cast<const WDResult<IE7PasswordInfo>*>(result);
   IE7PasswordInfo info = r->GetValue();
 
   if (!info.encrypted_data.empty()) {
     // We got a result.
     // Delete the entry. If it's good we will add it to the real saved password
     // table.
     web_data_service_->RemoveIE7Login(info);
-    std::wstring username;
-    std::wstring password;
+    std::vector<ie7_password::DecryptedCredentials> credentials;
     std::wstring url = ASCIIToWide(form.origin.spec());
-    if (!ie7_password::DecryptPassword(url, info.encrypted_data,
-                                       &username, &password)) {
-      return NULL;
+    if (ie7_password::DecryptPasswords(url,
+                                       info.encrypted_data,
+                                       &credentials)) {
+      for (size_t i = 0; i < credentials.size(); ++i) {
+        PasswordForm* autofill = new PasswordForm(form);
+        autofill->username_value = credentials[i].username;
+        autofill->password_value = credentials[i].password;
+        autofill->preferred = true;
+        autofill->ssl_valid = form.origin.SchemeIsSecure();
+        autofill->date_created = info.date_created;
+        matching_forms.push_back(autofill);
+        // Add this PasswordForm to the saved password table. We're on the DB
+        // thread already, so we use AddLoginImpl.
+        password_store_->AddLoginImpl(*autofill);
+      }
     }
-
-    PasswordForm* autofill = new PasswordForm(form);
-    autofill->username_value = username;
-    autofill->password_value = password;
-    autofill->preferred = true;
-    autofill->ssl_valid = form.origin.SchemeIsSecure();
-    autofill->date_created = info.date_created;
-    // Add this PasswordForm to the saved password table. We're on the DB thread
-    // already, so we use AddLoginImpl.
-    password_store_->AddLoginImpl(*autofill);
-    return autofill;
   }
-  return NULL;
+  return matching_forms;
 }
 
 void PasswordStoreWin::DBHandler::OnWebDataServiceRequestDone(
     WebDataService::Handle handle,
     const WDTypedResult* result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   PendingRequestMap::iterator i = pending_requests_.find(handle);
   DCHECK(i != pending_requests_.end());
 
   scoped_ptr<PasswordForm> form(i->second.form);
   PasswordStoreWin::ConsumerCallbackRunner callback_runner(
       i->second.callback_runner);
   pending_requests_.erase(i);
 
-  std::vector<autofill::PasswordForm*> matched_forms;
-
   if (!result) {
     // The WDS returns NULL if it is shutting down. Run callback with empty
     // result.
-    callback_runner.Run(matched_forms);
+    callback_runner.Run(std::vector<autofill::PasswordForm*>());
     return;
   }
 
   DCHECK_EQ(PASSWORD_IE7_RESULT, result->GetType());
-  PasswordForm* ie7_form = GetIE7Result(result, *form);
-
-  if (ie7_form)
-    matched_forms.push_back(ie7_form);
+  std::vector<autofill::PasswordForm*> matched_forms =
+      GetIE7Results(result, *form);
 
   callback_runner.Run(matched_forms);
 }
 
 PasswordStoreWin::PasswordStoreWin(LoginDatabase* login_database,
                                    Profile* profile,
                                    WebDataService* web_data_service)
     : PasswordStoreDefault(login_database, profile) {
   db_handler_.reset(new DBHandler(web_data_service, this));
 }
@@ skipping 27 matching lines @@
 }
 
 void PasswordStoreWin::GetLoginsImpl(
     const PasswordForm& form,
     const ConsumerCallbackRunner& callback_runner) {
   ConsumerCallbackRunner get_ie7_login =
       base::Bind(&PasswordStoreWin::GetIE7LoginIfNecessary,
                  this, form, callback_runner);
   PasswordStoreDefault::GetLoginsImpl(form, get_ie7_login);
 }