1 files changed, 178 insertions, 0 deletions
diff --git a/comm/mailnews/compose/test/unit/test_smtpPasswordFailure2.js b/comm/mailnews/compose/test/unit/test_smtpPasswordFailure2.js
new file mode 100644
index 0000000000..f394db434d
--- /dev/null
+++ b/comm/mailnews/compose/test/unit/test_smtpPasswordFailure2.js
@@ -0,0 +1,178 @@
+/**
+ * This test checks to see if the pop3 password failure is handled correctly.
+ * The steps are:
+ *   - Have an invalid password in the password database.
+ *   - Re-initiate connection, this time select enter new password, check that
+ *     we get a new password prompt and can enter the password.
+ *
+ * XXX Due to problems with the fakeserver + smtp not using one connection for
+ * multiple sends, the first part of this test is in
+ * test_smtpPasswordFailure2.js.
+ */
+
+var { MailServices } = ChromeUtils.import(
+  "resource:///modules/MailServices.jsm"
+);
+const { PromiseTestUtils } = ChromeUtils.import(
+  "resource://testing-common/mailnews/PromiseTestUtils.jsm"
+);
+
+/* import-globals-from ../../../test/resources/alertTestUtils.js */
+/* import-globals-from ../../../test/resources/passwordStorage.js */
+load("../../../resources/alertTestUtils.js");
+load("../../../resources/passwordStorage.js");
+
+var server;
+var attempt = 0;
+
+var kIdentityMail = "identity@foo.invalid";
+var kSender = "from@foo.invalid";
+var kTo = "to@foo.invalid";
+var kUsername = "testsmtp";
+// Password needs to match the login information stored in the signons json
+// file.
+var kInvalidPassword = "smtptest";
+var kValidPassword = "smtptest1";
+
+function confirmExPS(
+  aDialogTitle,
+  aText,
+  aButtonFlags,
+  aButton0Title,
+  aButton1Title,
+  aButton2Title,
+  aCheckMsg,
+  aCheckState
+) {
+  switch (++attempt) {
+    // First attempt, retry.
+    case 1:
+      dump("\nAttempting Retry\n");
+      return 0;
+    // Second attempt, enter a new password.
+    case 2:
+      dump("\nEnter new password\n");
+      return 2;
+    default:
+      do_throw("unexpected attempt number " + attempt);
+      return 1;
+  }
+}
+
+function promptPasswordPS(
+  aParent,
+  aDialogTitle,
+  aText,
+  aPassword,
+  aCheckMsg,
+  aCheckState
+) {
+  if (attempt == 2) {
+    aPassword.value = kValidPassword;
+    aCheckState.value = true;
+    return true;
+  }
+  return false;
+}
+
+add_task(async function () {
+  function createHandler(d) {
+    var handler = new SMTP_RFC2821_handler(d);
+    // Username needs to match the login information stored in the signons json
+    // file.
+    handler.kUsername = kUsername;
+    handler.kPassword = kValidPassword;
+    handler.kAuthRequired = true;
+    handler.kAuthSchemes = ["PLAIN", "LOGIN"]; // make match expected transaction below
+    return handler;
+  }
+  server = setupServerDaemon(createHandler);
+
+  // Prepare files for passwords (generated by a script in bug 1018624).
+  await setupForPassword("signons-mailnews1.8.json");
+
+  registerAlertTestUtils();
+
+  // Test file
+  var testFile = do_get_file("data/message1.eml");
+
+  // Ensure we have at least one mail account
+  localAccountUtils.loadLocalMailAccount();
+
+  // Handle the server in a try/catch/finally loop so that we always will stop
+  // the server if something fails.
+  try {
+    // Start the fake SMTP server
+    server.start();
+    var smtpServer = getBasicSmtpServer(server.port);
+    var identity = getSmtpIdentity(kIdentityMail, smtpServer);
+
+    // This time with auth
+    test = "Auth sendMailMessage";
+
+    smtpServer.authMethod = Ci.nsMsgAuthMethod.passwordCleartext;
+    smtpServer.socketType = Ci.nsMsgSocketType.plain;
+    smtpServer.username = kUsername;
+
+    dump("Send\n");
+
+    let urlListener = new PromiseTestUtils.PromiseUrlListener();
+    MailServices.smtp.sendMailMessage(
+      testFile,
+      kTo,
+      identity,
+      kSender,
+      null,
+      urlListener,
+      null,
+      null,
+      false,
+      "",
+      {},
+      {}
+    );
+
+    await urlListener.promise;
+
+    dump("End Send\n");
+
+    Assert.equal(attempt, 2);
+
+    var transaction = server.playTransaction();
+    do_check_transaction(transaction, [
+      "EHLO test",
+      // attempt 3 invalid password
+      "AUTH PLAIN " + AuthPLAIN.encodeLine(kUsername, kInvalidPassword),
+      "AUTH LOGIN",
+      // attempt 4 which retries
+      "AUTH PLAIN " + AuthPLAIN.encodeLine(kUsername, kInvalidPassword),
+      "AUTH LOGIN",
+      // then we enter the correct password
+      "AUTH PLAIN " + AuthPLAIN.encodeLine(kUsername, kValidPassword),
+      "MAIL FROM:<" + kSender + "> BODY=8BITMIME SIZE=159",
+      "RCPT TO:<" + kTo + ">",
+      "DATA",
+    ]);
+
+    // Now check the new one has been saved.
+    let logins = Services.logins.findLogins(
+      "smtp://localhost",
+      null,
+      "smtp://localhost"
+    );
+
+    Assert.equal(logins.length, 1);
+    Assert.equal(logins[0].username, kUsername);
+    Assert.equal(logins[0].password, kValidPassword);
+    do_test_finished();
+  } catch (e) {
+    do_throw(e);
+  } finally {
+    server.stop();
+
+    var thread = gThreadManager.currentThread;
+    while (thread.hasPendingEvents()) {
+      thread.processNextEvent(true);
+    }
+  }
+});