Author: norman
Date: Tue Jun 29 14:26:12 2010
New Revision: 958988
URL: http://svn.apache.org/viewvc?rev=958988&view=rev
Log:
Complete STARTTLS support, now it works with real mailclients too (IMAP-169)
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java?rev=958988&r1=958987&r2=958988&view=diff
==============================================================================
---
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
(original)
+++
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableText.java
Tue Jun 29 14:26:12 2010
@@ -29,7 +29,7 @@ import org.apache.james.imap.api.ImapCon
public class HumanReadableText {
public static final HumanReadableText STARTTLS = new HumanReadableText(
- "org.apache.james.imap.STARTTLS", "OK Begin TLS negotiation now.");
+ "org.apache.james.imap.STARTTLS", "Begin TLS negotiation now.");
public static final HumanReadableText SELECT = new HumanReadableText(
"org.apache.james.imap.SELECT", "completed.");
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java?rev=958988&r1=958987&r2=958988&view=diff
==============================================================================
---
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java
(original)
+++
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/process/ImapSession.java
Tue Jun 29 14:26:12 2010
@@ -108,7 +108,8 @@ public interface ImapSession {
public void setAttribute(String key, Object value);
/**
- * Start TLS encryption of the session
+ * Start TLS encryption of the session after the next response was
written. So you must make sure
+ * the next response will get send in clear text
*
* @return true if the encryption of the session was successfully
*/
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java?rev=958988&r1=958987&r2=958988&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
Tue Jun 29 14:26:12 2010
@@ -46,8 +46,8 @@ public class StartTLSProcessor extends A
Responder responder, ImapSession session) {
ImapRequest request = (ImapRequest) acceptableMessage;
if (session.supportStartTLS()) {
- responder.respond(factory.taggedOk(request.getTag(),
request.getCommand(), HumanReadableText.STARTTLS));
session.startTLS();
+ responder.respond(factory.taggedOk(request.getTag(),
request.getCommand(), HumanReadableText.STARTTLS));
} else {
responder.respond(factory.taggedBad(request.getTag(),
request.getCommand(), HumanReadableText.INVALID_COMMAND));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
