moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-31 07:10:14 -05:00
Code Issues Releases Wiki Activity

Fixes Issue 1252

Browse Source 
Handle CAPABILITY response in following cases:
1) When sent as part of the banner, no longer sends explicit
CAPABILITY command

2) When sent as an UNTAGGED response to LOGIN, updates stored
   capabilities.

3) When sent as part of the TAGGED response to LOGIN, updates stored
   capabilities.

Due to odd implementation of the CRAM-MD5 authentication, the
capability updates will not happen as part of the CRAM-MD5
authentication.
This commit is contained in:
Daniel Applebaum 2010-02-27 17:34:38 +00:00
parent 8eb8e392ca
commit f6e7d5d4c0
1 changed files with 68 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/com/fsck/k9/mail/store/ImapStore.java
View File

@ -63,6 +63,9 @@ public class ImapStore extends Store
private static final String CAPABILITY_NAMESPACE = "NAMESPACE"; private static final String CAPABILITY_NAMESPACE = "NAMESPACE";
private static final String COMMAND_NAMESPACE = "NAMESPACE"; private static final String COMMAND_NAMESPACE = "NAMESPACE";
private static final String CAPABILITY_CAPABILITY = "CAPABILITY";
private static final String COMMAND_CAPABILITY = "CAPABILITY";
private String mHost; private String mHost;
private int mPort; private int mPort;
private String mUsername; private String mUsername;
@ -1789,6 +1792,58 @@ public class ImapStore extends Store
return "conn" + hashCode(); return "conn" + hashCode();
} }
private List<ImapResponse> receiveCapabilities(List<ImapResponse> responses)
{
for (ImapResponse response : responses)
{
ImapList capabilityList = null;
if (response.size() > 0 && response.get(0).equals("OK"))
{
for (Object thisPart : response)
{
if (thisPart instanceof ImapList)
{
ImapList thisList = (ImapList)thisPart;
if (thisList.get(0).equals(CAPABILITY_CAPABILITY))
{
capabilityList = thisList;
break;
}
}
}
}
else if (response.mTag == null)
{
capabilityList = response;
}
if (capabilityList != null)
{
if (capabilityList.size() > 0 && capabilityList.get(0).equals(CAPABILITY_CAPABILITY))
{
if (K9.DEBUG)
{
Log.d(K9.LOG_TAG, "Saving " + capabilityList.size() + " capabilities for " + getLogId());
}
for (Object capability : capabilityList)
{
if (capability instanceof String)
{
// if (K9.DEBUG)
// {
// Log.v(K9.LOG_TAG, "Saving capability '" + capability + "' for " + getLogId());
// }
capabilities.add((String)capability);
}
}
}
}
}
return responses;
}
public void open() throws IOException, MessagingException public void open() throws IOException, MessagingException
{ {
if (isOpen()) if (isOpen())
@ -1841,43 +1896,30 @@ public class ImapStore extends Store
mParser = new ImapResponseParser(mIn); mParser = new ImapResponseParser(mIn);
mOut = mSocket.getOutputStream(); mOut = mSocket.getOutputStream();
capabilities.clear();
ImapResponse nullResponse = mParser.readResponse(); ImapResponse nullResponse = mParser.readResponse();
if (K9.DEBUG) if (K9.DEBUG)
Log.v(K9.LOG_TAG, getLogId() + "<<<" + nullResponse); Log.v(K9.LOG_TAG, getLogId() + "<<<" + nullResponse);
List<ImapResponse> responses = executeSimpleCommand("CAPABILITY"); List<ImapResponse> nullResponses = new LinkedList<ImapResponse>();
nullResponses.add(nullResponse);
receiveCapabilities(nullResponses);
if (hasCapability(CAPABILITY_CAPABILITY) == false)
{
Log.i(K9.LOG_TAG, "Did not get capabilities in banner, requesting CAPABILITY for " + getLogId());
List<ImapResponse> responses = receiveCapabilities(executeSimpleCommand(COMMAND_CAPABILITY));
if (responses.size() != 2) if (responses.size() != 2)
{ {
throw new MessagingException("Invalid CAPABILITY response received"); throw new MessagingException("Invalid CAPABILITY response received");
} }
capabilities.clear();
for (ImapResponse response : responses)
{
if (response.mTag == null)
{
if (response.size() > 0)
{
for (Object capability : response)
{
if (capability instanceof String)
{
// if (K9.DEBUG)
// {
// Log.v(K9.LOG_TAG, "Saving capability '" + capability + "' for " + getLogId());
// }
capabilities.add((String)capability);
}
}
}
}
} }
if (mConnectionSecurity == CONNECTION_SECURITY_TLS_OPTIONAL if (mConnectionSecurity == CONNECTION_SECURITY_TLS_OPTIONAL
|| mConnectionSecurity == CONNECTION_SECURITY_TLS_REQUIRED) || mConnectionSecurity == CONNECTION_SECURITY_TLS_REQUIRED)
{ {
if (responses.get(0).contains("STARTTLS")) if (hasCapability("STARTTLS"))
{ {
// STARTTLS // STARTTLS
executeSimpleCommand("STARTTLS"); executeSimpleCommand("STARTTLS");
@ -1912,7 +1954,7 @@ public class ImapStore extends Store
} }
else if (mAuthType == AuthType.PLAIN) else if (mAuthType == AuthType.PLAIN)
{ {
executeSimpleCommand("LOGIN \"" + escapeString(mUsername) + "\" \"" + escapeString(mPassword) + "\"", true); receiveCapabilities(executeSimpleCommand("LOGIN \"" + escapeString(mUsername) + "\" \"" + escapeString(mPassword) + "\"", true));
} }
authSuccess = true; authSuccess = true;
} }