From f5bca61609b243f19ea8bf26c6ae1a74048b5bcf Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Tue, 12 May 2009 12:09:18 -0700
Subject: [PATCH] Bug 471906 - Login manager's onblur handler shouldn't do
 anything when the username is blank. r=gavin

---
 .../passwordmgr/src/nsLoginManager.js         | 13 ++++-
 .../test/subtst_privbrowsing_4.html           |  9 ++--
 .../test/test_basic_form_autocomplete.html    | 54 +++++++++++++++++--
 3 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/toolkit/components/passwordmgr/src/nsLoginManager.js b/toolkit/components/passwordmgr/src/nsLoginManager.js
index aadb47c88b13..e2924ffd3c36 100644
--- a/toolkit/components/passwordmgr/src/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/src/nsLoginManager.js
@@ -360,6 +360,13 @@ LoginManager.prototype = {
                 case "blur":
                     var acInputField = event.target;
                     var acForm = acInputField.form;
+
+                    // If the username is blank, bail out now -- we don't want
+                    // fillForm() to try filling in a login without a username
+                    // to filter on (bug 471906).
+                    if (!acInputField.value)
+                        return;
+
                     // Make sure the username field fillForm will use is the
                     // same field as the autocomplete was activated on. If
                     // not, the DOM has been altered and we'll just give up.
@@ -618,9 +625,13 @@ LoginManager.prototype = {
             var logins = this.findLogins({}, origin, actionOrigin, null);
             var matchingLogins = [];
 
+            // Filter out logins that don't match the search prefix. Also
+            // filter logins without a username, since that's confusing to see
+            // in the dropdown and we can't autocomplete them anyway.
             for (i = 0; i < logins.length; i++) {
                 var username = logins[i].username.toLowerCase();
-                if (aSearchString.length <= username.length &&
+                if (username &&
+                    aSearchString.length <= username.length &&
                     aSearchString.toLowerCase() ==
                         username.substr(0, aSearchString.length))
                 {
diff --git a/toolkit/components/passwordmgr/test/subtst_privbrowsing_4.html b/toolkit/components/passwordmgr/test/subtst_privbrowsing_4.html
index 328720ea2bdc..796ac202eb26 100644
--- a/toolkit/components/passwordmgr/test/subtst_privbrowsing_4.html
+++ b/toolkit/components/passwordmgr/test/subtst_privbrowsing_4.html
@@ -16,16 +16,19 @@
 </form>
 
 <script>
-function submitForm() {
+function startAutocomplete() {
   userField.focus();
   doKey("down");
+  setTimeout(submitForm, 100);
+}
+
+function submitForm() {
   doKey("down");
   doKey("return");
-
   setTimeout(function(){ form.submit(); }, 100);
 }
 
-window.onload = submitForm;
+window.onload = startAutocomplete;
 var form      = document.getElementById("form");
 var userField = document.getElementById("user");
 
diff --git a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
index 220c65ae4054..bef3896e0fb8 100644
--- a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
+++ b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html
@@ -60,6 +60,13 @@ Login Manager test: multiple login autocomplete
     <input  type="password"   name="pword">
     <button type="submit">Submit</button>
   </form>
+
+  <!-- test for no autofill after onblur with blank username -->
+  <form id="form8" action="http://autocomplete4" onsubmit="return false;">
+    <input  type="text"       name="uname">
+    <input  type="password"   name="pword">
+    <button type="submit">Submit</button>
+  </form>
 </div>
 
 <pre id="test">
@@ -85,6 +92,11 @@ Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
 ok(nsLoginInfo != null, "nsLoginInfo constructor");
 
 
+// login0 has no username, so should be filtered out from the autocomplete list.
+var login0 = new nsLoginInfo(
+    "http://localhost:8888", "http://autocomplete:8888", null,
+    "", "user0pass", "", "pword");
+
 var login1 = new nsLoginInfo(
     "http://localhost:8888", "http://autocomplete:8888", null,
     "tempuser1", "temppass1", "uname", "pword");
@@ -113,8 +125,12 @@ var login6B = new nsLoginInfo(
     "http://localhost:8888", "http://autocomplete3", null,
     "form7user2", "form7pass2", "uname", "pword");
 
+var login7  = new nsLoginInfo(
+    "http://localhost:8888", "http://autocomplete4", null,
+    "form8user", "form8pass", "uname", "pword");
 // try/catch in case someone runs the tests manually, twice.
 try {
+    pwmgr.addLogin(login0);
     pwmgr.addLogin(login1);
     pwmgr.addLogin(login2);
     pwmgr.addLogin(login3);
@@ -122,6 +138,7 @@ try {
     pwmgr.addLogin(login5);
     pwmgr.addLogin(login6A);
     pwmgr.addLogin(login6B);
+    pwmgr.addLogin(login7);
 } catch (e) {
     ok(false, "addLogin threw: " + e);
 }
@@ -347,7 +364,7 @@ function runTest(testNum) {
         doKey("down");
         var numLogins;
         numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null);
-        is(numLogins, 4, "Correct number of logins before deleting one");
+        is(numLogins, 5, "Correct number of logins before deleting one");
 
         // On OS X, shift-backspace and shift-delete work, just delete does not.
         // On Win/Linux, shift-backspace does not work, delete and shift-delete do.
@@ -355,7 +372,7 @@ function runTest(testNum) {
 
         checkACForm("", "");
         numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null);
-        is(numLogins, 3, "Correct number of logins after deleting one");
+        is(numLogins, 4, "Correct number of logins after deleting one");
         doKey("return");
         checkACForm("testuser2", "testpass2");
 
@@ -382,7 +399,7 @@ function runTest(testNum) {
         doKey("delete", shiftModifier);
         checkACForm("", "");
         numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null);
-        is(numLogins, 2, "Correct number of logins after deleting one");
+        is(numLogins, 3, "Correct number of logins after deleting one");
         doKey("return");
         checkACForm("zzzuser4", "zzzpass4");
 
@@ -409,7 +426,7 @@ function runTest(testNum) {
         doKey("delete", shiftModifier);
         checkACForm("", "");
         numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null);
-        is(numLogins, 1, "Correct number of logins after deleting one");
+        is(numLogins, 2, "Correct number of logins after deleting one");
         doKey("return");
         checkACForm("testuser2", "testpass2");
 
@@ -436,7 +453,8 @@ function runTest(testNum) {
         //doKey("return");
         checkACForm("", "");
         numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null);
-        is(numLogins, 0, "Correct number of logins after deleting one");
+        is(numLogins, 1, "Correct number of logins after deleting one");
+        pwmgr.removeLogin(login0); // remove the login that's not shown in the list.
         testNum = 99;
         break;
 
@@ -460,6 +478,7 @@ function runTest(testNum) {
         checkACForm("", ""); // value shouldn't update
         doKey("return"); // not "enter"!
         checkACForm("singleuser5", "singlepass5");
+        restoreForm(); // clear field, so reloading test doesn't fail
         break;
 
     case 102:
@@ -565,9 +584,34 @@ function runTest(testNum) {
         // the password field should have any values filled in.
         checkACForm("form7user1", "");
         is($_(7, "uname2").value, "", "Verifying empty uname2");;
+        restoreForm(); // clear field, so reloading test doesn't fail
 
         pwmgr.removeLogin(login6A);
+        testNum = 599;
+        break;
 
+    case 600:
+        // Turn our attention to form8
+        uname = $_(8, "uname");
+        pword = $_(8, "pword");
+        checkACForm("form8user", "form8pass");
+        restoreForm();
+        break;
+
+    case 601:
+        checkACForm("", "");
+        // Focus the previous form to trigger a blur.
+        $_(7, "uname").focus();
+        break;
+
+    case 602:
+        checkACForm("", "");
+        restoreForm();
+        break;
+
+    case 603:
+        checkACForm("", "");
+        pwmgr.removeLogin(login7);
 
         SimpleTest.finish();
         return;