[qmf] Mask login information in the SMTP debug logging.

sailfishos · Dec 14, 2014 · 236975e · 236975e
1 parent a51e0f5
commit 236975e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/qmf/src/plugins/messageservices/smtp/smtpclient.cpp b/qmf/src/plugins/messageservices/smtp/smtpclient.cpp
@@ -361,7 +361,7 @@ void SmtpClient::readyRead()
     incomingData();
 }
 
-void SmtpClient::sendCommand(const char *data, int len)
+void SmtpClient::sendCommand(const char *data, int len, bool maskDebug)
 {
     if (len == -1)
         len = ::strlen(data);
@@ -372,17 +372,27 @@ void SmtpClient::sendCommand(const char *data, int len)
 
     ++outstandingResponses;
 
-    qMailLog(SMTP) << "SEND:" << data;
+    if (maskDebug) {
+        qMailLog(SMTP) << "SEND: <login hidden>";
+    } else {
+        QString logCmd = QString::fromLatin1(data);
+        QRegExp loginExp("^AUTH\\s[^\\s]+\\s");
+        if (loginExp.indexIn(data) != -1) {
+            logCmd = logCmd.left(loginExp.matchedLength()) + "<login hidden>";
+        }
+
+        qMailLog(SMTP) << "SEND:" << logCmd;
+    }
 }
 
 void SmtpClient::sendCommand(const QString &cmd)
 {
     sendCommand(cmd.toLatin1());
 }
 
-void SmtpClient::sendCommand(const QByteArray &cmd)
+void SmtpClient::sendCommand(const QByteArray &cmd, bool maskDebug)
 {
-    sendCommand(cmd.data(), cmd.length());
+    sendCommand(cmd.data(), cmd.length(), maskDebug);
 }
 
 void SmtpClient::sendCommands(const QStringList &cmds)
@@ -676,8 +686,8 @@ void SmtpClient::nextAction(const QString &response)
 #endif
 
             if (!response.isEmpty()) {
-                // Send the response as Base64 encoded
-                sendCommand(response.toBase64());
+                // Send the response as Base64 encoded, mask the debug output
+                sendCommand(response.toBase64(), true);
                 bufferedResponse.clear();
                 return;
             } else {

diff --git a/qmf/src/plugins/messageservices/smtp/smtpclient.h b/qmf/src/plugins/messageservices/smtp/smtpclient.h
@@ -113,9 +113,9 @@ private slots:
 #endif
 
 private:
-    void sendCommand(const char *data, int len = -1);
+    void sendCommand(const char *data, int len = -1, bool maskDebug = false);
     void sendCommand(const QString &cmd);
-    void sendCommand(const QByteArray &cmd);
+    void sendCommand(const QByteArray &cmd, bool maskDebug = false);
     void sendCommands(const QStringList &cmds);
     void incomingData();
     void nextAction(const QString &response);