NSSDecryptor::ReadAndParseSignons() - improved password form scheme detection,

chrome/utility/importer/firefox_importer_unittest.cc

Index: chrome/utility/importer/firefox_importer_unittest.cc
diff --git a/chrome/utility/importer/firefox_importer_unittest.cc b/chrome/utility/importer/firefox_importer_unittest.cc
index 9a415d678b311d8b8db104186a8fef2c5d7fbc3f..4b7d9406ffc79a8d08a389b5610528caf7a5b18a 100644
--- a/chrome/utility/importer/firefox_importer_unittest.cc
+++ b/chrome/utility/importer/firefox_importer_unittest.cc
@@ -3,11 +3,13 @@
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/utility/importer/firefox_importer_unittest_utils.h"
 #include "chrome/utility/importer/nss_decryptor.h"
+#include "sql/connection.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(jschuh): Disabled on Win64 build. http://crbug.com/179688
@@ -44,3 +46,63 @@ TEST(FirefoxImporterTest, MAYBE_NSS(Firefox3NSS3Decryptor)) {
       decryptor_proxy.Decrypt("MDIEEPgAAAAAAAAAAAAAAAAAAAEwFAYIKoZIhvcNAwcECLW"
                               "qqiccfQHWBAie74hxnULxlw=="));
 }
+
+// The following test verifies proper detection of authentication scheme in
+// firefox's signons db. We insert two entries into moz_logins table, first

[Ilya Sherman, 2014/06/11 00:19:38]

nit: "table, first has" -> "table. The first has the"

[Lukasz Jagielski, 2014/06/11 16:10:16]

Done.

+// has httpRealm column filled with non-empty string, therefore resulting
+// PasswordForm should have SCHEME_BASIC in scheme. Second entry has NULL

[Ilya Sherman, 2014/06/11 00:19:38]

nit: "Second entry" -> "The second entry"

[Lukasz Jagielski, 2014/06/11 16:10:16]

Done.

+// httpRealm, so it should produce a SCHEME_HTML PasswordForm.
+TEST(FirefoxImporterTest, MAYBE_NSS(FirefoxNSSDecryptorDeduceAuthScheme)) {
+  base::ScopedTempDir temp_dir;
+  base::FilePath signons_path = temp_dir.path().AppendASCII("signons.sqlite");
+  sql::Connection db_conn;
+
+  ASSERT_TRUE(db_conn.Open(signons_path));
+
+  ASSERT_TRUE(db_conn.Execute(
+      "CREATE TABLE moz_logins (id INTEGER PRIMARY KEY, hostname TEXT NOT "
+      "NULL, httpRealm TEXT, formSubmitURL TEXT, usernameField TEXT NOT NULL,"
+      "passwordField TEXT NOT NULL, encryptedUsername TEXT NOT NULL,"
+      "encryptedPassword TEXT NOT NULL, guid TEXT, encType INTEGER,"
+      "timeCreated INTEGER, timeLastUsed INTEGER, timePasswordChanged "
+      "INTEGER, timesUsed INTEGER)"));
+
+  ASSERT_TRUE(db_conn.Execute(
+      "CREATE TABLE moz_disabledHosts (id INTEGER PRIMARY KEY, hostname TEXT "
+      "UNIQUE ON CONFLICT REPLACE)"));
+
+  ASSERT_TRUE(db_conn.Execute(
+      "INSERT INTO 'moz_logins' VALUES(1,'http://server.com:1234',"
+      "'http_realm',NULL,'','','','','{bfa37106-a4dc-0a47-abb4-dafd507bf2db}',"
+      "1,1401883410959,1401883410959,1401883410959,1)"));
+
+  ASSERT_TRUE(db_conn.Execute(
+      "INSERT INTO 'moz_logins' VALUES(2,'http://server.com:1234',NULL,"
+      "'http://test2.server.com:1234/action','username','password','','',"
+      "'{71ad64fa-b5d4-cf4d-b390-2e4d56fe2aff}',1,1401883939239,"
+      "1401883939239, 1401883939239,1)"));
+
+  db_conn.Close();
+
+  base::FilePath nss_path;
+  ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &nss_path));
+#if defined(OS_MACOSX)
+  nss_path = nss_path.AppendASCII("firefox3_nss_mac");
+#else
+  nss_path = nss_path.AppendASCII("firefox3_nss");
+#endif  // !OS_MACOSX
+  base::FilePath db_path;
+  ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &db_path));
+  db_path = db_path.AppendASCII("firefox3_profile");
+
+  FFUnitTestDecryptorProxy decryptor_proxy;
+  ASSERT_TRUE(decryptor_proxy.Setup(nss_path));
+
+  ASSERT_TRUE(decryptor_proxy.DecryptorInit(nss_path, db_path));
+  std::vector<autofill::PasswordForm> forms =
+      decryptor_proxy.ParseSignons(signons_path);
+
+  ASSERT_EQ(2u, forms.size());
+  EXPECT_EQ(autofill::PasswordForm::SCHEME_BASIC, forms[0].scheme);
+  EXPECT_EQ(autofill::PasswordForm::SCHEME_HTML, forms[1].scheme);
+}