Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/password_manager/login_database_unittest.cc

Issue 15660018: [autofill] Add support for PSL domain matching for password autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed test expectation to match intention and comment Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/password_manager/login_database.cc ('k') | chrome/browser/password_manager/password_form_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/password_manager/login_database_unittest.cc
diff --git a/chrome/browser/password_manager/login_database_unittest.cc b/chrome/browser/password_manager/login_database_unittest.cc
index 7c1b52dd98b2895c217098ae0215396fc1148fba..6cba4bc2567b3d466fa223a203b46eb941ad84a5 100644
--- a/chrome/browser/password_manager/login_database_unittest.cc
+++ b/chrome/browser/password_manager/login_database_unittest.cc
@@ -36,6 +36,10 @@ class LoginDatabaseTest : public testing::Test {
return db_.DeserializeVector(pickle);
}
+ void SetPublicSuffixMatching(bool enabled) {
+ db_.public_suffix_domain_matching_ = enabled;
+ }
+
LoginDatabase db_;
base::FilePath file_;
base::ScopedTempDir temp_dir_;
@@ -177,6 +181,275 @@ TEST_F(LoginDatabaseTest, Logins) {
EXPECT_EQ(0U, result.size());
}
+TEST_F(LoginDatabaseTest, TestPublicSuffixDomainMatching) {
+ SetPublicSuffixMatching(true);
+ std::vector<PasswordForm*> result;
+
+ // Verify the database is empty.
+ EXPECT_TRUE(db_.GetAutofillableLogins(&result));
+ EXPECT_EQ(0U, result.size());
+
+ // Example password form.
+ PasswordForm form;
+ form.origin = GURL("https://foo.com/");
+ form.action = GURL("https://foo.com/login");
+ form.username_element = ASCIIToUTF16("username");
+ form.username_value = ASCIIToUTF16("test@gmail.com");
+ form.password_element = ASCIIToUTF16("password");
+ form.password_value = ASCIIToUTF16("test");
+ form.submit_element = ASCIIToUTF16("");
+ form.signon_realm = "https://foo.com/";
+ form.ssl_valid = true;
+ form.preferred = false;
+ form.scheme = PasswordForm::SCHEME_HTML;
+
+ // Add it and make sure it is there.
+ EXPECT_TRUE(db_.AddLogin(form));
+ EXPECT_TRUE(db_.GetAutofillableLogins(&result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // Match against an exact copy.
+ EXPECT_TRUE(db_.GetLogins(form, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // We go to the mobile site.
+ PasswordForm form2(form);
+ form2.origin = GURL("https://mobile.foo.com/");
+ form2.action = GURL("https://mobile.foo.com/login");
+ form2.signon_realm = "https://mobile.foo.com/";
+
+ // Match against the mobile site.
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(1U, result.size());
+ EXPECT_EQ("https://mobile.foo.com/", result[0]->signon_realm);
+ EXPECT_EQ("https://foo.com/", result[0]->original_signon_realm);
+ delete result[0];
+ result.clear();
+}
+
+// This test fails if the implementation of GetLogins uses GetCachedStatement
+// instead of GetUniqueStatement, since REGEXP is in use. See
+// http://crbug.com/248608.
+TEST_F(LoginDatabaseTest, TestPublicSuffixDomainMatchingDifferentSites) {
+ SetPublicSuffixMatching(true);
+ std::vector<PasswordForm*> result;
+
+ // Verify the database is empty.
+ EXPECT_TRUE(db_.GetAutofillableLogins(&result));
+ EXPECT_EQ(0U, result.size());
+
+ // Example password form.
+ PasswordForm form;
+ form.origin = GURL("https://foo.com/");
+ form.action = GURL("https://foo.com/login");
+ form.username_element = ASCIIToUTF16("username");
+ form.username_value = ASCIIToUTF16("test@gmail.com");
+ form.password_element = ASCIIToUTF16("password");
+ form.password_value = ASCIIToUTF16("test");
+ form.submit_element = ASCIIToUTF16("");
+ form.signon_realm = "https://foo.com/";
+ form.ssl_valid = true;
+ form.preferred = false;
+ form.scheme = PasswordForm::SCHEME_HTML;
+
+ // Add it and make sure it is there.
+ EXPECT_TRUE(db_.AddLogin(form));
+ EXPECT_TRUE(db_.GetAutofillableLogins(&result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // Match against an exact copy.
+ EXPECT_TRUE(db_.GetLogins(form, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // We go to the mobile site.
+ PasswordForm form2(form);
+ form2.origin = GURL("https://mobile.foo.com/");
+ form2.action = GURL("https://mobile.foo.com/login");
+ form2.signon_realm = "https://mobile.foo.com/";
+
+ // Match against the mobile site.
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(1U, result.size());
+ EXPECT_EQ("https://mobile.foo.com/", result[0]->signon_realm);
+ EXPECT_EQ("https://foo.com/", result[0]->original_signon_realm);
+ delete result[0];
+ result.clear();
+
+ // Add baz.com desktop site.
+ form.origin = GURL("https://baz.com/login/");
+ form.action = GURL("https://baz.com/login/");
+ form.username_element = ASCIIToUTF16("email");
+ form.username_value = ASCIIToUTF16("test@gmail.com");
+ form.password_element = ASCIIToUTF16("password");
+ form.password_value = ASCIIToUTF16("test");
+ form.submit_element = ASCIIToUTF16("");
+ form.signon_realm = "https://baz.com/";
+ form.ssl_valid = true;
+ form.preferred = false;
+ form.scheme = PasswordForm::SCHEME_HTML;
+
+ // Add it and make sure it is there.
+ EXPECT_TRUE(db_.AddLogin(form));
+ EXPECT_TRUE(db_.GetAutofillableLogins(&result));
+ EXPECT_EQ(2U, result.size());
+ delete result[0];
+ delete result[1];
+ result.clear();
+
+ // We go to the mobile site of baz.com.
+ PasswordForm form3(form);
+ form3.origin = GURL("https://m.baz.com/login/");
+ form3.action = GURL("https://m.baz.com/login/");
+ form3.signon_realm = "https://m.baz.com/";
+
+ // Match against the mobile site of baz.com.
+ EXPECT_TRUE(db_.GetLogins(form3, &result));
+ EXPECT_EQ(1U, result.size());
+ EXPECT_EQ("https://m.baz.com/", result[0]->signon_realm);
+ EXPECT_EQ("https://baz.com/", result[0]->original_signon_realm);
+ delete result[0];
+ result.clear();
+}
+
+PasswordForm GetFormWithNewSignonRealm(PasswordForm form,
+ std::string signon_realm) {
+ PasswordForm form2(form);
+ form2.origin = GURL(signon_realm);
+ form2.action = GURL(signon_realm);
+ form2.signon_realm = signon_realm;
+ return form2;
+}
+
+TEST_F(LoginDatabaseTest, TestPublicSuffixDomainMatchingRegexp) {
+ SetPublicSuffixMatching(true);
+ std::vector<PasswordForm*> result;
+
+ // Verify the database is empty.
+ EXPECT_TRUE(db_.GetAutofillableLogins(&result));
+ EXPECT_EQ(0U, result.size());
+
+ // Example password form.
+ PasswordForm form;
+ form.origin = GURL("http://foo.com/");
+ form.action = GURL("http://foo.com/login");
+ form.username_element = ASCIIToUTF16("username");
+ form.username_value = ASCIIToUTF16("test@gmail.com");
+ form.password_element = ASCIIToUTF16("password");
+ form.password_value = ASCIIToUTF16("test");
+ form.submit_element = ASCIIToUTF16("");
+ form.signon_realm = "http://foo.com/";
+ form.ssl_valid = false;
+ form.preferred = false;
+ form.scheme = PasswordForm::SCHEME_HTML;
+
+ // Add it and make sure it is there.
+ EXPECT_TRUE(db_.AddLogin(form));
+ EXPECT_TRUE(db_.GetAutofillableLogins(&result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // Example password form that has - in the domain name.
+ PasswordForm form_dash =
+ GetFormWithNewSignonRealm(form, "http://www.foo-bar.com/");
+
+ // Add it and make sure it is there.
+ EXPECT_TRUE(db_.AddLogin(form_dash));
+ EXPECT_TRUE(db_.GetAutofillableLogins(&result));
+ EXPECT_EQ(2U, result.size());
+ delete result[0];
+ delete result[1];
+ result.clear();
+
+ // Match against an exact copy.
+ EXPECT_TRUE(db_.GetLogins(form, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // www.foo.com should match.
+ PasswordForm form2 = GetFormWithNewSignonRealm(form, "http://www.foo.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // a.b.foo.com should match.
+ form2 = GetFormWithNewSignonRealm(form, "http://a.b.foo.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // a-b.foo.com should match.
+ form2 = GetFormWithNewSignonRealm(form, "http://a-b.foo.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // foo-bar.com should match.
+ form2 = GetFormWithNewSignonRealm(form, "http://foo-bar.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // www.foo-bar.com should match.
+ form2 = GetFormWithNewSignonRealm(form, "http://www.foo-bar.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // a.b.foo-bar.com should match.
+ form2 = GetFormWithNewSignonRealm(form, "http://a.b.foo-bar.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // a-b.foo-bar.com should match.
+ form2 = GetFormWithNewSignonRealm(form, "http://a-b.foo-bar.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(1U, result.size());
+ delete result[0];
+ result.clear();
+
+ // foo.com with port 1337 should not match.
+ form2 = GetFormWithNewSignonRealm(form, "http://foo.com:1337/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(0U, result.size());
+
+ // http://foo.com should not match since the scheme is wrong.
+ form2 = GetFormWithNewSignonRealm(form, "https://foo.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(0U, result.size());
+
+ // notfoo.com should not match.
+ form2 = GetFormWithNewSignonRealm(form, "http://notfoo.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(0U, result.size());
+
+ // baz.com should not match.
+ form2 = GetFormWithNewSignonRealm(form, "http://baz.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(0U, result.size());
+
+ // foo-baz.com should not match.
+ form2 = GetFormWithNewSignonRealm(form, "http://foo-baz.com/");
+ EXPECT_TRUE(db_.GetLogins(form2, &result));
+ EXPECT_EQ(0U, result.size());
+}
+
static bool AddTimestampedLogin(LoginDatabase* db, std::string url,
const std::string& unique_string,
const base::Time& time) {
« no previous file with comments | « chrome/browser/password_manager/login_database.cc ('k') | chrome/browser/password_manager/password_form_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698