From 260c91078bef3d04b6b5e0de65ad56d58a9ac4bc Mon Sep 17 00:00:00 2001
From: andreapz <mister.tzu@gmail.com>
Date: Thu, 29 Sep 2016 18:37:33 +0200
Subject: Smtp error: 535 5.7.0 on Tiscali smtp server (#1520)

* adding simple password alert message for smtp error: 535 5.7.0 authentication rejected: your password is too simple.

* fixing error simple password
---
 src/core/abstract/MCErrorMessage.cpp   | 1 +
 src/core/abstract/MCMessageConstants.h | 1 +
 src/core/smtp/MCSMTPSession.cpp        | 7 ++++++-
 src/objc/abstract/MCOConstants.h       | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/abstract/MCErrorMessage.cpp b/src/core/abstract/MCErrorMessage.cpp
index d6b11a29..1ed4aa2d 100644
--- a/src/core/abstract/MCErrorMessage.cpp
+++ b/src/core/abstract/MCErrorMessage.cpp
@@ -50,6 +50,7 @@ static const char * localizedDescriptionTable[] = {
     "Cannot send message due to possible spam detected by server",                   /** MCOErrorSendMessageSpamSuspected */
     "User is over the limit for messages allowed to be sent in a single day",        /** MCOErrorSendMessageDailyLimitExceeded */
     "The user needs to log in via the web browser",                                  /** MCOErrorOutlookLoginViaWebBrowser */
+    "Credentials with password too simple",                                          /** MCOErrorTiscaliSimplePassword */
 };
 
 String * mailcore::errorMessageWithErrorCode(ErrorCode errorCode)
diff --git a/src/core/abstract/MCMessageConstants.h b/src/core/abstract/MCMessageConstants.h
index 9cb98b30..58822df9 100644
--- a/src/core/abstract/MCMessageConstants.h
+++ b/src/core/abstract/MCMessageConstants.h
@@ -258,6 +258,7 @@ namespace mailcore {
         ErrorYahooSendMessageSpamSuspected,
         ErrorYahooSendMessageDailyLimitExceeded,
         ErrorOutlookLoginViaWebBrowser,
+        ErrorTiscaliSimplePassword,
     };
     
     enum PartType {
diff --git a/src/core/smtp/MCSMTPSession.cpp b/src/core/smtp/MCSMTPSession.cpp
index 4875d3b4..29df6460 100644
--- a/src/core/smtp/MCSMTPSession.cpp
+++ b/src/core/smtp/MCSMTPSession.cpp
@@ -644,7 +644,12 @@ void SMTPSession::login(ErrorCode * pError)
         return;
     }
     else if (r != MAILSMTP_NO_ERROR) {
-        * pError = ErrorAuthentication;
+        if(mSmtp->response_code == 535
+           && strstr(mSmtp->response_buffer->str, "your password is too simple") != NULL) {
+            * pError = ErrorTiscaliSimplePassword;
+        } else {
+            * pError = ErrorAuthentication;
+        }
         return;
     }
     
diff --git a/src/objc/abstract/MCOConstants.h b/src/objc/abstract/MCOConstants.h
index 9ee71e76..ad3cb6e4 100644
--- a/src/objc/abstract/MCOConstants.h
+++ b/src/objc/abstract/MCOConstants.h
@@ -423,6 +423,8 @@ typedef NS_ENUM(NSInteger, MCOErrorCode) {
     MCOErrorYahooSendMessageDailyLimitExceeded,
     /** You need to login via the web browser first */
     MCOErrorOutlookLoginViaWebBrowser,
+    /** Tiscali Simple Mail Error */
+    MCOErrorTiscaliSimplePassword,
     /** The count of all errors */
     MCOErrorCodeCount,
 };
-- 
cgit v1.2.3