You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/06/28 22:42:30 UTC
svn commit: r958715 - in /james/imap/trunk:
decode/src/main/java/org/apache/james/imap/decode/parser/
processor/src/main/java/org/apache/james/imap/processor/
processor/src/main/java/org/apache/james/imap/processor/main/
Author: norman
Date: Mon Jun 28 20:42:29 2010
New Revision: 958715
URL: http://svn.apache.org/viewvc?rev=958715&view=rev
Log:
Add support for STARTTLS (IMAP-169)
Added:
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
Modified:
james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StartTLSProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
Modified: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java?rev=958715&r1=958714&r2=958715&view=diff
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java (original)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java Mon Jun 28 20:42:29 2010
@@ -121,6 +121,7 @@ public class ImapParserFactory implement
StoreCommandParser.class);
_imapCommands.put(ImapConstants.UID_COMMAND_NAME,
UidCommandParser.class);
+ _imapCommands.put(ImapConstants.STARTTLS, StartTLSCommandParser.class);
}
/**
Added: james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java?rev=958715&view=auto
==============================================================================
--- james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java (added)
+++ james/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/StartTLSCommandParser.java Mon Jun 28 20:42:29 2010
@@ -0,0 +1,44 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.imap.decode.parser;
+
+import org.apache.commons.logging.Log;
+import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
+import org.apache.james.imap.api.ImapMessage;
+import org.apache.james.imap.decode.DecodingException;
+import org.apache.james.imap.decode.ImapRequestLineReader;
+import org.apache.james.imap.decode.base.AbstractImapCommandParser;
+
+/**
+ * Parse STARTTLS commands
+ *
+ */
+public class StartTLSCommandParser extends AbstractImapCommandParser{
+
+ public StartTLSCommandParser() {
+ super(ImapCommand.nonAuthenticatedStateCommand(ImapConstants.STARTTLS));
+ }
+
+ @Override
+ protected ImapMessage decode(ImapCommand command, ImapRequestLineReader request, String tag, Log logger) throws DecodingException {
+ return getMessageFactory().createStartTLSMessage(command, tag);
+ }
+
+}
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java?rev=958715&r1=958714&r2=958715&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CapabilityProcessor.java Mon Jun 28 20:42:29 2010
@@ -19,9 +19,11 @@
package org.apache.james.imap.processor;
+import java.util.ArrayList;
import java.util.List;
import org.apache.james.imap.api.ImapCommand;
+import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.api.message.request.ImapRequest;
import org.apache.james.imap.api.message.response.ImapResponseMessage;
@@ -58,7 +60,11 @@ public class CapabilityProcessor extends
private ImapResponseMessage doProcess(CapabilityRequest request,
ImapSession session, String tag, ImapCommand command) {
- final CapabilityResponse result = new CapabilityResponse(capabilities);
+ List<String> caps = new ArrayList<String>(capabilities);
+ if (session.supportStartTLS()) {
+ caps.add(ImapConstants.STARTTLS);
+ }
+ final CapabilityResponse result = new CapabilityResponse(caps);
return result;
}
}
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java?rev=958715&r1=958714&r2=958715&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java Mon Jun 28 20:42:29 2010
@@ -38,24 +38,15 @@ public class DefaultProcessorChain {
final ImapProcessor chainEndProcessor,
final MailboxManager mailboxManager,
final StatusResponseFactory statusResponseFactory) {
- return createStartTLSSupportingChain(chainEndProcessor, mailboxManager, statusResponseFactory, false);
- }
-
- public static final ImapProcessor createStartTLSSupportingChain(
- final ImapProcessor chainEndProcessor,
- final MailboxManager mailboxManager,
- final StatusResponseFactory statusResponseFactory, final boolean supportStartTLS) {
final SystemMessageProcessor systemProcessor = new SystemMessageProcessor(chainEndProcessor, mailboxManager);
final LogoutProcessor logoutProcessor = new LogoutProcessor(
systemProcessor, mailboxManager, statusResponseFactory);
+
final List<String> capabilities = new ArrayList<String>();
capabilities.add(VERSION);
capabilities.add(SUPPORTS_LITERAL_PLUS);
capabilities.add(SUPPORTS_NAMESPACES);
capabilities.add(SUPPORTS_RFC3348);
- if (supportStartTLS) {
- capabilities.add(STARTTLS);
- }
final CapabilityProcessor capabilityProcessor = new CapabilityProcessor(
logoutProcessor, mailboxManager, statusResponseFactory, capabilities);
final CheckProcessor checkProcessor = new CheckProcessor(
@@ -105,12 +96,9 @@ public class DefaultProcessorChain {
selectProcessor, mailboxManager, statusResponseFactory);
final ImapProcessor fetchProcessor = new FetchProcessor(namespaceProcessor,
mailboxManager, statusResponseFactory);
- if (supportStartTLS) {
- final ImapProcessor startTLSProcessor = new StartTLSProcessor(fetchProcessor, statusResponseFactory);
- return startTLSProcessor;
- } else {
- return fetchProcessor;
- }
+ final ImapProcessor startTLSProcessor = new StartTLSProcessor(fetchProcessor, statusResponseFactory);
+ return startTLSProcessor;
+
+ }
- }
}
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=958715&r1=958714&r2=958715&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 Mon Jun 28 20:42:29 2010
@@ -44,9 +44,13 @@ public class StartTLSProcessor extends A
@Override
protected void doProcess(ImapMessage acceptableMessage,
Responder responder, ImapSession session) {
- ImapRequest request = (ImapRequest) acceptableMessage;
- responder.respond(factory.taggedOk(request.getTag(), request.getCommand(), HumanReadableText.STARTTLS));
- session.startTLS();
+ ImapRequest request = (ImapRequest) acceptableMessage;
+ if (session.supportStartTLS()) {
+ responder.respond(factory.taggedOk(request.getTag(), request.getCommand(), HumanReadableText.STARTTLS));
+ session.startTLS();
+ } else {
+ responder.respond(factory.taggedBad(request.getTag(), request.getCommand(), HumanReadableText.INVALID_COMMAND));
+ }
}
Modified: james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java?rev=958715&r1=958714&r2=958715&view=diff
==============================================================================
--- james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java (original)
+++ james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/main/DefaultImapProcessorFactory.java Mon Jun 28 20:42:29 2010
@@ -38,8 +38,8 @@ public class DefaultImapProcessorFactory
final UnknownRequestProcessor unknownRequestImapProcessor = new UnknownRequestProcessor(
statusResponseFactory);
final ImapProcessor imap4rev1Chain = DefaultProcessorChain
- .createStartTLSSupportingChain(unknownRequestImapProcessor,
- mailboxManager, statusResponseFactory, true);
+ .createDefaultChain(unknownRequestImapProcessor,
+ mailboxManager, statusResponseFactory);
final ImapProcessor result = new ImapResponseMessageProcessor(
imap4rev1Chain);
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org