moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-08-13 17:03:48 -04:00
Code Issues Releases Wiki Activity

Don't log POP3 passwords by default.

Browse Source
This commit is contained in:
cketti 2010-07-30 00:53:46 +00:00
parent d8a757faaf
commit 91e55f6fa1
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/fsck/k9/mail/store/Pop3Store.java
View File

@ -1,7 +1,6 @@
package com.fsck.k9.mail.store; package com.fsck.k9.mail.store;
import android.util.Config;
import android.util.Log; import android.util.Log;
import com.fsck.k9.Account; import com.fsck.k9.Account;
@ -291,7 +290,7 @@ public class Pop3Store extends Store
try try
{ {
executeSimpleCommand("USER " + mUsername); executeSimpleCommand("USER " + mUsername);
executeSimpleCommand("PASS " + mPassword); executeSimpleCommand("PASS " + mPassword, true);
} }
catch (MessagingException me) catch (MessagingException me)
{ {
@ -560,7 +559,7 @@ public class Pop3Store extends Store
{ {
if (mUidToMsgMap.get(uid) == null) if (mUidToMsgMap.get(uid) == null)
{ {
if (Config.LOGD) if (K9.DEBUG && K9.DEBUG_PROTOCOL_POP3)
{ {
Log.d(K9.LOG_TAG, "Need to index UID " + uid); Log.d(K9.LOG_TAG, "Need to index UID " + uid);
} }
@ -588,7 +587,7 @@ public class Pop3Store extends Store
String msgUid = uidParts[1]; String msgUid = uidParts[1];
if (unindexedUids.contains(msgUid)) if (unindexedUids.contains(msgUid))
{ {
if (Config.LOGD) if (K9.DEBUG && K9.DEBUG_PROTOCOL_POP3)
{ {
Log.d(K9.LOG_TAG, "Got msgNum " + msgNum + " for UID " + msgUid); Log.d(K9.LOG_TAG, "Got msgNum " + msgNum + " for UID " + msgUid);
} }
@ -605,7 +604,7 @@ public class Pop3Store extends Store
private void indexMessage(int msgNum, Pop3Message message) private void indexMessage(int msgNum, Pop3Message message)
{ {
if (Config.LOGD) if (K9.DEBUG && K9.DEBUG_PROTOCOL_POP3)
{ {
Log.d(K9.LOG_TAG, "Adding index for UID " + message.getUid() + " to msgNum " + msgNum); Log.d(K9.LOG_TAG, "Adding index for UID " + message.getUid() + " to msgNum " + msgNum);
} }
@ -958,25 +957,15 @@ public class Pop3Store extends Store
} }
while ((d = mIn.read()) != -1); while ((d = mIn.read()) != -1);
String ret = sb.toString(); String ret = sb.toString();
if (Config.LOGD)
{
if (K9.DEBUG && K9.DEBUG_PROTOCOL_POP3) if (K9.DEBUG && K9.DEBUG_PROTOCOL_POP3)
{ {
Log.d(K9.LOG_TAG, "<<< " + ret); Log.d(K9.LOG_TAG, "<<< " + ret);
} }
}
return ret; return ret;
} }
private void writeLine(String s) throws IOException private void writeLine(String s) throws IOException
{ {
if (Config.LOGD)
{
if (K9.DEBUG && K9.DEBUG_PROTOCOL_POP3)
{
Log.d(K9.LOG_TAG, ">>> " + s);
}
}
mOut.write(s.getBytes()); mOut.write(s.getBytes());
mOut.write('\r'); mOut.write('\r');
mOut.write('\n'); mOut.write('\n');
@ -1028,25 +1017,35 @@ public class Pop3Store extends Store
} }
private String executeSimpleCommand(String command) throws MessagingException private String executeSimpleCommand(String command) throws MessagingException
{
return executeSimpleCommand(command, false);
}
private String executeSimpleCommand(String command, boolean sensitive) throws MessagingException
{ {
try try
{ {
open(OpenMode.READ_WRITE); open(OpenMode.READ_WRITE);
if (Config.LOGV)
{
Log.v(K9.LOG_TAG, "POP3: command '" + command + "'");
}
if (command != null) if (command != null)
{ {
if (K9.DEBUG && K9.DEBUG_PROTOCOL_POP3)
{
if (sensitive && !K9.DEBUG_SENSITIVE)
{
Log.d(K9.LOG_TAG, ">>> "
+ "[Command Hidden, Enable Sensitive Debug Logging To Show]");
}
else
{
Log.d(K9.LOG_TAG, ">>> " + command);
}
}
writeLine(command); writeLine(command);
} }
String response = readLine(); String response = readLine();
if (Config.LOGV)
{
Log.v(K9.LOG_TAG, "POP3: response '" + command + "'");
}
if (response.length() > 1 && response.charAt(0) == '-') if (response.length() > 1 && response.charAt(0) == '-')
{ {
throw new MessagingException(response); throw new MessagingException(response);