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 bt...@apache.org on 2017/03/13 11:33:22 UTC
[1/5] james-project git commit: JAMES-1954 Disablecommand injection
detection on DATA
Repository: james-project
Updated Branches:
refs/heads/master 0ecf6d6a0 -> 71f89a8f8
JAMES-1954 Disablecommand injection detection on DATA
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/81fc0061
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/81fc0061
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/81fc0061
Branch: refs/heads/master
Commit: 81fc006154c3bf2a136006a27c5501bc3d153583
Parents: 381f2d7
Author: benwa <bt...@linagora.com>
Authored: Mon Mar 6 16:58:30 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Mon Mar 13 18:32:07 2017 +0700
----------------------------------------------------------------------
.../netty/AbstractChannelPipelineFactory.java | 2 +-
.../protocols/netty/ChannelHandlerFactory.java | 3 ++-
.../LineDelimiterBasedChannelHandlerFactory.java | 3 ++-
.../smtp/AllButStartTlsDelimiterChannelHandler.java | 16 ++++++++++++----
...tStartTlsLineDelimiterChannelHandlerFactory.java | 5 +++--
.../apache/james/protocols/smtp/SMTPSession.java | 6 ++++++
.../james/protocols/smtp/SMTPSessionImpl.java | 16 ++++++++++++++++
.../james/protocols/smtp/core/DataCmdHandler.java | 3 ++-
.../protocols/smtp/utils/BaseFakeSMTPSession.java | 15 +++++++++++++++
.../apache/james/imapserver/netty/IMAPServer.java | 2 +-
...chableLineDelimiterBasedFrameDecoderFactory.java | 3 ++-
.../managesieveserver/netty/ManageSieveServer.java | 2 +-
12 files changed, 63 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
index 04a91ac..a09e665 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/AbstractChannelPipelineFactory.java
@@ -73,7 +73,7 @@ public abstract class AbstractChannelPipelineFactory implements ChannelPipelineF
// Add the text line decoder which limit the max line length, don't strip the delimiter and use CRLF as delimiter
- pipeline.addLast(HandlerConstants.FRAMER, frameHandlerFactory.create());
+ pipeline.addLast(HandlerConstants.FRAMER, frameHandlerFactory.create(pipeline));
// Add the ChunkedWriteHandler to be able to write ChunkInput
pipeline.addLast(HandlerConstants.CHUNK_HANDLER, new ChunkedWriteHandler());
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelHandlerFactory.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelHandlerFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelHandlerFactory.java
index eba8210..771ddb2 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelHandlerFactory.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ChannelHandlerFactory.java
@@ -19,8 +19,9 @@
package org.apache.james.protocols.netty;
import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelPipeline;
public interface ChannelHandlerFactory {
- ChannelHandler create();
+ ChannelHandler create(ChannelPipeline pipeline);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineDelimiterBasedChannelHandlerFactory.java
----------------------------------------------------------------------
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineDelimiterBasedChannelHandlerFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineDelimiterBasedChannelHandlerFactory.java
index dcd9b7c..63e39b5 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineDelimiterBasedChannelHandlerFactory.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/LineDelimiterBasedChannelHandlerFactory.java
@@ -19,6 +19,7 @@
package org.apache.james.protocols.netty;
import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
import org.jboss.netty.handler.codec.frame.Delimiters;
@@ -30,7 +31,7 @@ public class LineDelimiterBasedChannelHandlerFactory implements ChannelHandlerFa
}
@Override
- public ChannelHandler create() {
+ public ChannelHandler create(ChannelPipeline pipeline) {
return new DelimiterBasedFrameDecoder(maxLineLength, false, Delimiters.lineDelimiter());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java
index ad0db9c..9d8998e 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java
@@ -18,9 +18,11 @@
****************************************************************/
package org.apache.james.protocols.smtp;
+import org.apache.james.protocols.netty.HandlerConstants;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
import com.google.common.base.Charsets;
@@ -28,16 +30,22 @@ import com.google.common.base.Charsets;
public class AllButStartTlsDelimiterChannelHandler extends DelimiterBasedFrameDecoder {
private static final String STARTTLS = "starttls";
+ private final ChannelPipeline pipeline;
- public AllButStartTlsDelimiterChannelHandler(int maxFrameLength, boolean stripDelimiter, ChannelBuffer[] delimiters) {
+ public AllButStartTlsDelimiterChannelHandler(ChannelPipeline pipeline, int maxFrameLength, boolean stripDelimiter, ChannelBuffer[] delimiters) {
super(maxFrameLength, stripDelimiter, delimiters);
+ this.pipeline = pipeline;
}
@Override
protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer buffer) throws Exception {
- String trimedLowerCasedInput = readAll(buffer).trim().toLowerCase();
- if (hasCommandInjection(trimedLowerCasedInput)) {
- throw new CommandInjectionDetectedException();
+ SMTPSession session = (SMTPSession) pipeline.getContext(HandlerConstants.CORE_HANDLER).getAttachment();
+
+ if (session.needsCommandInjectionDetection()) {
+ String trimedLowerCasedInput = readAll(buffer).trim().toLowerCase();
+ if (hasCommandInjection(trimedLowerCasedInput)) {
+ throw new CommandInjectionDetectedException();
+ }
}
return super.decode(ctx, channel, buffer);
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsLineDelimiterChannelHandlerFactory.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsLineDelimiterChannelHandlerFactory.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsLineDelimiterChannelHandlerFactory.java
index de33ac6..22939ff 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsLineDelimiterChannelHandlerFactory.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsLineDelimiterChannelHandlerFactory.java
@@ -20,6 +20,7 @@ package org.apache.james.protocols.smtp;
import org.apache.james.protocols.netty.ChannelHandlerFactory;
import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.frame.Delimiters;
public class AllButStartTlsLineDelimiterChannelHandlerFactory implements ChannelHandlerFactory {
@@ -31,7 +32,7 @@ public class AllButStartTlsLineDelimiterChannelHandlerFactory implements Channel
}
@Override
- public ChannelHandler create() {
- return new AllButStartTlsDelimiterChannelHandler(maxFrameLength, false, Delimiters.lineDelimiter());
+ public ChannelHandler create(ChannelPipeline pipeline) {
+ return new AllButStartTlsDelimiterChannelHandler(pipeline, maxFrameLength, false, Delimiters.lineDelimiter());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
index bdc6bd3..71c6714 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
@@ -51,6 +51,12 @@ public interface SMTPSession extends ProtocolSession{
* @return the relaying status
*/
boolean isRelayingAllowed();
+
+ boolean needsCommandInjectionDetection();
+
+ void startDetectingCommadInjection();
+
+ void stopDetectingCommandInjection();
/**
* Set if reallying is allowed
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
index b4662da..124e30f 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
@@ -36,12 +36,28 @@ public class SMTPSessionImpl extends ProtocolSessionImpl implements SMTPSession
private static final Response FATAL_ERROR = new SMTPResponse(SMTPRetCode.LOCAL_ERROR, "Unable to process request").immutable();
private boolean relayingAllowed;
+ private boolean needsCommandInjectionDetection;
public SMTPSessionImpl(Logger logger, ProtocolTransport transport, SMTPConfiguration config) {
super(logger, transport, config);
relayingAllowed = config.isRelayingAllowed(getRemoteAddress().getAddress().getHostAddress());
+ needsCommandInjectionDetection = true;
}
+ @Override
+ public boolean needsCommandInjectionDetection() {
+ return needsCommandInjectionDetection;
+ }
+
+ @Override
+ public void startDetectingCommadInjection() {
+ needsCommandInjectionDetection = true;
+ }
+
+ @Override
+ public void stopDetectingCommandInjection() {
+ needsCommandInjectionDetection = false;
+ }
/**
* @see org.apache.james.protocols.smtp.SMTPSession#isRelayingAllowed()
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
index 0f51c9f..c68be56 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
@@ -138,7 +138,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
*/
public Response onCommand(SMTPSession session, Request request) {
TimeMetric timeMetric = metricFactory.timer("SMTP-" + request.getCommand());
-
+ session.stopDetectingCommandInjection();
try {
String parameters = request.getArgument();
Response response = doDATAFilter(session, parameters);
@@ -150,6 +150,7 @@ public class DataCmdHandler implements CommandHandler<SMTPSession>, ExtensibleHa
}
} finally {
timeMetric.stopAndPublish();
+ session.needsCommandInjectionDetection();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
index 396d63a..5b2e371 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/utils/BaseFakeSMTPSession.java
@@ -39,6 +39,21 @@ public class BaseFakeSMTPSession implements SMTPSession {
private static final Logger log = new MockLogger();
+ @Override
+ public boolean needsCommandInjectionDetection() {
+ throw new UnsupportedOperationException("Unimplemented Stub Method");
+ }
+
+ @Override
+ public void startDetectingCommadInjection() {
+ throw new UnsupportedOperationException("Unimplemented Stub Method");
+ }
+
+ @Override
+ public void stopDetectingCommandInjection() {
+ throw new UnsupportedOperationException("Unimplemented Stub Method");
+ }
+
/**
* @see org.apache.james.protocols.smtp.SMTPSession#getConnectionState()
*/
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
index cc9c300..06488c3 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
@@ -139,7 +139,7 @@ public class IMAPServer extends AbstractConfigurableAsyncServer implements ImapC
// Add the text line decoder which limit the max line length,
// don't strip the delimiter and use CRLF as delimiter
// Use a SwitchableDelimiterBasedFrameDecoder, see JAMES-1436
- pipeline.addLast(FRAMER, getFrameHandlerFactory().create());
+ pipeline.addLast(FRAMER, getFrameHandlerFactory().create(pipeline));
Encryption secure = getEncryption();
if (secure != null && !secure.isStartTLS()) {
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableLineDelimiterBasedFrameDecoderFactory.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableLineDelimiterBasedFrameDecoderFactory.java b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableLineDelimiterBasedFrameDecoderFactory.java
index 1335ae3..0350f09 100644
--- a/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableLineDelimiterBasedFrameDecoderFactory.java
+++ b/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableLineDelimiterBasedFrameDecoderFactory.java
@@ -20,6 +20,7 @@ package org.apache.james.imapserver.netty;
import org.apache.james.protocols.netty.ChannelHandlerFactory;
import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.frame.Delimiters;
public class SwitchableLineDelimiterBasedFrameDecoderFactory implements ChannelHandlerFactory {
@@ -31,7 +32,7 @@ public class SwitchableLineDelimiterBasedFrameDecoderFactory implements ChannelH
}
@Override
- public ChannelHandler create() {
+ public ChannelHandler create(ChannelPipeline pipeline) {
return new SwitchableDelimiterBasedFrameDecoder(maxLineLength, false, Delimiters.lineDelimiter());
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/81fc0061/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
index 827fa40..9ad91c8 100644
--- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
+++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
@@ -114,7 +114,7 @@ public class ManageSieveServer extends AbstractConfigurableAsyncServer implement
// Add the text line decoder which limit the max line length,
// don't strip the delimiter and use CRLF as delimiter
// Use a SwitchableDelimiterBasedFrameDecoder, see JAMES-1436
- pipeline.addLast(FRAMER, getFrameHandlerFactory().create());
+ pipeline.addLast(FRAMER, getFrameHandlerFactory().create(pipeline));
pipeline.addLast(CONNECTION_COUNT_HANDLER, getConnectionCountHandler());
pipeline.addLast(CHUNK_WRITE_HANDLER, new ChunkedWriteHandler());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/5] james-project git commit: JAMES-1954 Solve IntelliJ warning in
CommandDispatcher
Posted by bt...@apache.org.
JAMES-1954 Solve IntelliJ warning in CommandDispatcher
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/381f2d76
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/381f2d76
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/381f2d76
Branch: refs/heads/master
Commit: 381f2d76fc7b6d413cbbd66f2611c2526d34e19a
Parents: 76f0f5b
Author: benwa <bt...@linagora.com>
Authored: Mon Mar 6 14:36:22 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Mon Mar 13 18:32:07 2017 +0700
----------------------------------------------------------------------
.../protocols/api/handler/CommandDispatcher.java | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/381f2d76/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
----------------------------------------------------------------------
diff --git a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
index 2a29dfe..3fd4692 100644
--- a/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
+++ b/protocols/api/src/main/java/org/apache/james/protocols/api/handler/CommandDispatcher.java
@@ -179,17 +179,15 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten
}
List<CommandHandler<Session>> commandHandlers = getCommandHandlers(request.getCommand(), session);
// fetch the command handlers registered to the command
- Iterator<CommandHandler<Session>> handlers = commandHandlers.iterator();
-
- while (handlers.hasNext()) {
+
+ for (CommandHandler<Session> commandHandler : commandHandlers) {
final long start = System.currentTimeMillis();
- CommandHandler<Session> cHandler = handlers.next();
- Response response = cHandler.onCommand(session, request);
+ Response response = commandHandler.onCommand(session, request);
if (response != null) {
long executionTime = System.currentTimeMillis() - start;
// now process the result handlers
- response = executeResultHandlers(session, response, executionTime, cHandler, rHandlers.iterator());
+ response = executeResultHandlers(session, response, executionTime, commandHandler, rHandlers.iterator());
if (response != null) {
return response;
}
@@ -223,7 +221,7 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten
// just return the new FutureResponse which will get notified once its ready
return futureResponse;
} else {
- response = resultHandlers.next().onResponse(session, response, executionTime, (CommandHandler<Session>) cHandler);
+ response = resultHandlers.next().onResponse(session, response, executionTime, cHandler);
// call the next ResultHandler
return executeResultHandlers(session, response, executionTime, cHandler, resultHandlers);
@@ -233,14 +231,11 @@ public class CommandDispatcher<Session extends ProtocolSession> implements Exten
}
/**
* Parse the line into a {@link Request}
- *
- * @param session
- * @param line
- * @return request
+ *
* @throws Exception
*/
protected Request parseRequest(Session session, ByteBuffer buffer) throws Exception {
- String curCommandName = null;
+ String curCommandName;
String curCommandArgument = null;
byte[] line;
if (buffer.hasArray()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/5] james-project git commit: JAMES-1954 Continue improving command
injection detection
Posted by bt...@apache.org.
JAMES-1954 Continue improving command injection detection
- Check we can use startTls as part of other commands
- Add Test for injection done in middle of the command
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ba48fae1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ba48fae1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ba48fae1
Branch: refs/heads/master
Commit: ba48fae165e39a3e7600aaa2cb9a1c8d70f86927
Parents: 81fc006
Author: benwa <bt...@linagora.com>
Authored: Mon Mar 6 17:33:53 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Mon Mar 13 18:32:20 2017 +0700
----------------------------------------------------------------------
.../james/mpt/smtp/SmtpStarttlsCommandTest.java | 8 ++++++
.../james/smtp/scripts/rcpt_with_starttls.test | 18 ++++++++++++
.../AllButStartTlsDelimiterChannelHandler.java | 30 ++++++++++++++++++--
.../smtp/netty/NettyStartTlsSMTPServerTest.java | 14 +++++++++
4 files changed, 68 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba48fae1/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java
index 94141d7..764cdc9 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java
@@ -68,6 +68,14 @@ public class SmtpStarttlsCommandTest extends AbstractSimpleScriptedTestProtocol
scriptTest("data_with_starttls", Locale.US);
}
+
+ @Test
+ public void shouldNotRejectRcptWithStartTls() throws Exception {
+ hostSystem.addUser("starttls@mydomain.tld", PASSWORD);
+
+ scriptTest("rcpt_with_starttls", Locale.US);
+ }
+
@Test
public void shouldNotRejectContentStartsWithStartTls() throws Exception {
scriptTest("data_starts_with_starttls", Locale.US);
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba48fae1/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/rcpt_with_starttls.test
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/rcpt_with_starttls.test b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/rcpt_with_starttls.test
new file mode 100644
index 0000000..efe719b
--- /dev/null
+++ b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/rcpt_with_starttls.test
@@ -0,0 +1,18 @@
+S: 220 mydomain.tld smtp
+C: ehlo yopmail.com
+C: mail from:<ma...@yopmail.com>
+C: rcpt to:<st...@mydomain.tld>
+C: data
+S: 250.*
+S: 250-PIPELINING
+S: 250-ENHANCEDSTATUSCODES
+S: 250-8BITMIME
+S: 250 STARTTLS
+S: 250 2.1.0 Sender <ma...@yopmail.com> OK
+S: 250 2.1.5 Recipient <st...@mydomain.tld> OK
+S: 354 Ok Send data ending with <CRLF>.<CRLF>
+C: subject: test
+C:
+C: content content
+C: .
+S: 250 2.6.0 Message received
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba48fae1/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java
index 9d8998e..cd3ae21 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/AllButStartTlsDelimiterChannelHandler.java
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.james.protocols.smtp;
+import java.util.List;
+
import org.apache.james.protocols.netty.HandlerConstants;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel;
@@ -25,7 +27,11 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import com.google.common.base.CharMatcher;
import com.google.common.base.Charsets;
+import com.google.common.base.Predicate;
+import com.google.common.base.Splitter;
+import com.google.common.collect.FluentIterable;
public class AllButStartTlsDelimiterChannelHandler extends DelimiterBasedFrameDecoder {
@@ -55,7 +61,27 @@ public class AllButStartTlsDelimiterChannelHandler extends DelimiterBasedFrameDe
}
private boolean hasCommandInjection(String trimedLowerCasedInput) {
- return trimedLowerCasedInput.contains(STARTTLS)
- && !trimedLowerCasedInput.endsWith(STARTTLS);
+ List<String> parts = Splitter.on(CharMatcher.anyOf("\r\n")).omitEmptyStrings()
+ .splitToList(trimedLowerCasedInput);
+
+ return hasInvalidStartTlsPart(parts) || multiPartsAndOneStartTls(parts);
+ }
+
+ private boolean multiPartsAndOneStartTls(List<String> parts) {
+ return FluentIterable.from(parts).anyMatch(new Predicate<String>() {
+ @Override
+ public boolean apply(String line) {
+ return line.startsWith(STARTTLS);
+ }
+ }) && parts.size() > 1;
+ }
+
+ private boolean hasInvalidStartTlsPart(List<String> parts) {
+ return FluentIterable.from(parts).anyMatch(new Predicate<String>() {
+ @Override
+ public boolean apply(String line) {
+ return line.startsWith(STARTTLS) && !line.endsWith(STARTTLS);
+ }
+ });
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba48fae1/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
index 66d3f81..7fed268 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
@@ -193,6 +193,20 @@ public class NettyStartTlsSMTPServerTest {
}
@Test
+ public void startTlsShouldFailWhenFollowedByInjectedCommandAndNotAtBeginningOfLine() throws Exception {
+ ProtocolServer server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
+ server.bind();
+
+ SMTPSClient client = createClient();
+ InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress();
+ client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
+ client.sendCommand("EHLO localhost");
+
+ client.sendCommand("RSET\r\nSTARTTLS\r\nRSET\r\n");
+ assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isFalse();
+ }
+
+ @Test
public void startTlsShouldWorkWhenUsingJavamail() throws Exception {
TestMessageHook hook = new TestMessageHook();
ProtocolServer server = createServer(createProtocol(Optional.<ProtocolHandler> of(hook)) , Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[5/5] james-project git commit: JAMES-1954 Ensure we close resources
when tests ends in NettyStartTlsSMTPServer
Posted by bt...@apache.org.
JAMES-1954 Ensure we close resources when tests ends in NettyStartTlsSMTPServer
server field was never used
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/71f89a8f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/71f89a8f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/71f89a8f
Branch: refs/heads/master
Commit: 71f89a8f8475741b2e31262da8f95f164f970b95
Parents: ba48fae
Author: benwa <bt...@linagora.com>
Authored: Tue Mar 7 15:57:52 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Mon Mar 13 18:32:25 2017 +0700
----------------------------------------------------------------------
.../smtp/netty/NettyStartTlsSMTPServerTest.java | 142 +++++++++----------
1 file changed, 71 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/71f89a8f/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
----------------------------------------------------------------------
diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
index 7fed268..7f0ba3f 100644
--- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
+++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/netty/NettyStartTlsSMTPServerTest.java
@@ -62,15 +62,20 @@ public class NettyStartTlsSMTPServerTest {
private static final String LOCALHOST_IP = "127.0.0.1";
private static final int RANDOM_PORT = 0;
- private ProtocolServer server;
+ private SMTPSClient smtpsClient = null;
+ private ProtocolServer server = null;
@After
- public void tearDown() {
+ public void tearDown() throws Exception {
+ if (smtpsClient != null) {
+ smtpsClient.disconnect();
+ }
if (server != null) {
server.unbind();
}
}
+
private ProtocolServer createServer(Protocol protocol, Encryption enc) {
NettyServer server = NettyServer.builder()
.protocol(protocol)
@@ -98,48 +103,39 @@ public class NettyStartTlsSMTPServerTest {
@Test
public void connectShouldReturnTrueWhenConnecting() throws Exception {
- ProtocolServer server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
- server.bind();
+ server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
+ smtpsClient = createClient();
- SMTPSClient client = createClient();
+ server.bind();
InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress();
- client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
- assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isTrue();
-
- client.quit();
- client.disconnect();
+ smtpsClient.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
+ assertThat(SMTPReply.isPositiveCompletion(smtpsClient.getReplyCode())).isTrue();
}
@Test
public void ehloShouldReturnTrueWhenSendingTheCommand() throws Exception {
- ProtocolServer server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
- server.bind();
+ server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
+ smtpsClient = createClient();
- SMTPSClient client = createClient();
+ server.bind();
InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress();
- client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
+ smtpsClient.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
- client.sendCommand("EHLO localhost");
- assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isTrue();
-
- client.quit();
- client.disconnect();
+ smtpsClient.sendCommand("EHLO localhost");
+ assertThat(SMTPReply.isPositiveCompletion(smtpsClient.getReplyCode())).isTrue();
}
@Test
public void startTlsShouldBeAnnouncedWhenServerSupportsIt() throws Exception {
- ProtocolServer server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
- server.bind();
+ server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
+ smtpsClient = createClient();
- SMTPSClient client = createClient();
+ server.bind();
InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress();
- client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
- client.sendCommand("EHLO localhost");
-
- assertThat(new StartTLSAssert(client)).isStartTLSAnnounced();
+ smtpsClient.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
+ smtpsClient.sendCommand("EHLO localhost");
- client.quit();
- client.disconnect();
+ assertThat(new StartTLSAssert(smtpsClient)).isStartTLSAnnounced();
}
private static class StartTLSAssert implements AssertDelegateTarget {
@@ -163,79 +159,83 @@ public class NettyStartTlsSMTPServerTest {
@Test
public void startTlsShouldReturnTrueWhenServerSupportsIt() throws Exception {
- ProtocolServer server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
- server.bind();
+ server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
+ smtpsClient = createClient();
- SMTPSClient client = createClient();
+ server.bind();
InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress();
- client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
- client.sendCommand("EHLO localhost");
+ smtpsClient.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
+ smtpsClient.sendCommand("EHLO localhost");
- boolean execTLS = client.execTLS();
+ boolean execTLS = smtpsClient.execTLS();
assertThat(execTLS).isTrue();
-
- client.quit();
- client.disconnect();
}
@Test
public void startTlsShouldFailWhenFollowedByInjectedCommand() throws Exception {
- ProtocolServer server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
- server.bind();
+ server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
+ smtpsClient = createClient();
- SMTPSClient client = createClient();
+ server.bind();
InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress();
- client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
- client.sendCommand("EHLO localhost");
+ smtpsClient.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
+ smtpsClient.sendCommand("EHLO localhost");
- client.sendCommand("STARTTLS\r\nRSET\r\n");
- assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isFalse();
+ smtpsClient.sendCommand("STARTTLS\r\nRSET\r\n");
+ assertThat(SMTPReply.isPositiveCompletion(smtpsClient.getReplyCode())).isFalse();
}
@Test
public void startTlsShouldFailWhenFollowedByInjectedCommandAndNotAtBeginningOfLine() throws Exception {
- ProtocolServer server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
- server.bind();
+ server = createServer(createProtocol(Optional.<ProtocolHandler> absent()), Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
+ smtpsClient = createClient();
- SMTPSClient client = createClient();
+ server.bind();
InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress();
- client.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
- client.sendCommand("EHLO localhost");
+ smtpsClient.connect(bindedAddress.getAddress().getHostAddress(), bindedAddress.getPort());
+ smtpsClient.sendCommand("EHLO localhost");
- client.sendCommand("RSET\r\nSTARTTLS\r\nRSET\r\n");
- assertThat(SMTPReply.isPositiveCompletion(client.getReplyCode())).isFalse();
+ smtpsClient.sendCommand("RSET\r\nSTARTTLS\r\nRSET\r\n");
+ assertThat(SMTPReply.isPositiveCompletion(smtpsClient.getReplyCode())).isFalse();
}
@Test
public void startTlsShouldWorkWhenUsingJavamail() throws Exception {
TestMessageHook hook = new TestMessageHook();
- ProtocolServer server = createServer(createProtocol(Optional.<ProtocolHandler> of(hook)) , Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
+ server = createServer(createProtocol(Optional.<ProtocolHandler> of(hook)) , Encryption.createStartTls(BogusSslContextFactory.getServerContext()));
server.bind();
+ SMTPTransport transport = null;
- InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress();
+ try {
+ InetSocketAddress bindedAddress = new ProtocolServerUtils(server).retrieveBindedAddress();
- Properties mailProps = new Properties();
- mailProps.put("mail.smtp.from", "test@localhost");
- mailProps.put("mail.smtp.host", bindedAddress.getHostName());
- mailProps.put("mail.smtp.port", bindedAddress.getPort());
- mailProps.put("mail.smtp.socketFactory.class", BogusSSLSocketFactory.class.getName());
- mailProps.put("mail.smtp.socketFactory.fallback", "false");
- mailProps.put("mail.smtp.starttls.enable", "true");
+ Properties mailProps = new Properties();
+ mailProps.put("mail.smtp.from", "test@localhost");
+ mailProps.put("mail.smtp.host", bindedAddress.getHostName());
+ mailProps.put("mail.smtp.port", bindedAddress.getPort());
+ mailProps.put("mail.smtp.socketFactory.class", BogusSSLSocketFactory.class.getName());
+ mailProps.put("mail.smtp.socketFactory.fallback", "false");
+ mailProps.put("mail.smtp.starttls.enable", "true");
- Session mailSession = Session.getDefaultInstance(mailProps);
+ Session mailSession = Session.getDefaultInstance(mailProps);
- InternetAddress[] rcpts = new InternetAddress[] { new InternetAddress("valid@localhost") };
- MimeMessage message = new MimeMessage(mailSession);
- message.setFrom(new InternetAddress("test@localhost"));
- message.setRecipients(Message.RecipientType.TO, rcpts);
- message.setSubject("Testmail", "UTF-8");
- message.setText("Test.....");
+ InternetAddress[] rcpts = new InternetAddress[]{new InternetAddress("valid@localhost")};
+ MimeMessage message = new MimeMessage(mailSession);
+ message.setFrom(new InternetAddress("test@localhost"));
+ message.setRecipients(Message.RecipientType.TO, rcpts);
+ message.setSubject("Testmail", "UTF-8");
+ message.setText("Test.....");
- SMTPTransport transport = (SMTPTransport) mailSession.getTransport("smtps");
+ transport = (SMTPTransport) mailSession.getTransport("smtps");
- transport.connect(new Socket(bindedAddress.getHostName(), bindedAddress.getPort()));
- transport.sendMessage(message, rcpts);
+ transport.connect(new Socket(bindedAddress.getHostName(), bindedAddress.getPort()));
+ transport.sendMessage(message, rcpts);
- assertThat(hook.getQueued()).hasSize(1);
+ assertThat(hook.getQueued()).hasSize(1);
+ } finally {
+ if (transport != null) {
+ transport.close();
+ }
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/5] james-project git commit: JAMES-1954 Show that I can send any
mail containing starttls in their content
Posted by bt...@apache.org.
JAMES-1954 Show that I can send any mail containing starttls in their content
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/76f0f5b8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/76f0f5b8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/76f0f5b8
Branch: refs/heads/master
Commit: 76f0f5b86ebe9c7eb5281e87cf9d30788278581d
Parents: 0ecf6d6
Author: benwa <bt...@linagora.com>
Authored: Mon Mar 6 10:54:49 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Mon Mar 13 18:32:07 2017 +0700
----------------------------------------------------------------------
.../james/mpt/smtp/SmtpStarttlsCommandTest.java | 10 ++++++++++
.../smtp/scripts/data_starts_with_starttls.test | 18 ++++++++++++++++++
.../james/smtp/scripts/data_with_starttls.test | 18 ++++++++++++++++++
3 files changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/76f0f5b8/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java
index 2dd7246..94141d7 100644
--- a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java
+++ b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpStarttlsCommandTest.java
@@ -62,4 +62,14 @@ public class SmtpStarttlsCommandTest extends AbstractSimpleScriptedTestProtocol
public void starttlsShouldBeRejectedWhenFollowedByCommand() throws Exception {
scriptTest("starttls_with_injection", Locale.US);
}
+
+ @Test
+ public void shouldNotRejectContentWithStartTls() throws Exception {
+ scriptTest("data_with_starttls", Locale.US);
+ }
+
+ @Test
+ public void shouldNotRejectContentStartsWithStartTls() throws Exception {
+ scriptTest("data_starts_with_starttls", Locale.US);
+ }
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/76f0f5b8/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_starts_with_starttls.test
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_starts_with_starttls.test b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_starts_with_starttls.test
new file mode 100644
index 0000000..22b1fff
--- /dev/null
+++ b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_starts_with_starttls.test
@@ -0,0 +1,18 @@
+S: 220 mydomain.tld smtp
+C: ehlo yopmail.com
+C: mail from:<ma...@yopmail.com>
+C: rcpt to:<bo...@mydomain.tld>
+C: data
+S: 250.*
+S: 250-PIPELINING
+S: 250-ENHANCEDSTATUSCODES
+S: 250-8BITMIME
+S: 250 STARTTLS
+S: 250 2.1.0 Sender <ma...@yopmail.com> OK
+S: 250 2.1.5 Recipient <bo...@mydomain.tld> OK
+S: 354 Ok Send data ending with <CRLF>.<CRLF>
+C: subject: test
+C:
+C: starttls content
+C: .
+S: 250 2.6.0 Message received
http://git-wip-us.apache.org/repos/asf/james-project/blob/76f0f5b8/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_with_starttls.test
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_with_starttls.test b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_with_starttls.test
new file mode 100644
index 0000000..edd3a40
--- /dev/null
+++ b/mpt/impl/smtp/core/src/main/resources/org/apache/james/smtp/scripts/data_with_starttls.test
@@ -0,0 +1,18 @@
+S: 220 mydomain.tld smtp
+C: ehlo yopmail.com
+C: mail from:<ma...@yopmail.com>
+C: rcpt to:<bo...@mydomain.tld>
+C: data
+S: 250.*
+S: 250-PIPELINING
+S: 250-ENHANCEDSTATUSCODES
+S: 250-8BITMIME
+S: 250 STARTTLS
+S: 250 2.1.0 Sender <ma...@yopmail.com> OK
+S: 250 2.1.5 Recipient <bo...@mydomain.tld> OK
+S: 354 Ok Send data ending with <CRLF>.<CRLF>
+C: subject: test
+C:
+C: content starttls content
+C: .
+S: 250 2.6.0 Message received
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org