This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch 3.6.x in repository https://gitbox.apache.org/repos/asf/james-project.git
commit fad40c4eb9cbc16f4879928485f3817548987b76 Merge: 90ec73f 82f3c18 Author: Tellier Benoit <[email protected]> AuthorDate: Fri Aug 27 08:55:05 2021 +0700 Merge pull request #596 JAMES-1862 Generalize STARTTLS sanitizing fix [BACKPORT] .../james/mpt/smtp/SmtpStarttlsCommandTest.java | 7 ++++ .../smtp/scripts/starttls_session_fixation.test | 26 +++++++++++++ .../protocols/api/CommandDetectionSession.java} | 10 ++++- .../james/protocols/api/ProtocolSession.java | 3 +- .../james/protocols/api/ProtocolSessionImpl.java | 17 ++++++++ .../apache/james/imap/api/process/ImapSession.java | 3 +- .../apache/james/imap/encode/FakeImapSession.java | 15 ++++++++ .../imap/processor/AbstractAuthProcessor.java | 1 + .../james/imap/processor/AppendProcessor.java | 2 + .../imap/processor/AuthenticateProcessor.java | 1 + .../AllButStartTlsLineBasedChannelHandler.java | 25 ++++++------ .../AllButStartTlsLineChannelHandlerFactory.java | 10 ++--- .../netty}/CommandInjectionDetectedException.java | 2 +- .../apache/james/protocols/smtp/SMTPSession.java | 6 --- .../james/protocols/smtp/SMTPSessionImpl.java | 14 ------- .../smtp/core/esmtp/StartTlsCmdHandler.java | 6 +++ .../smtp/netty/NettyStartTlsSMTPServerTest.java | 8 ++-- .../protocols/smtp/utils/BaseFakeSMTPSession.java | 2 +- .../james/imapserver/netty/NettyImapSession.java | 17 ++++++++ .../netty/SwitchableLineBasedFrameDecoder.java | 45 +++++++++++++++++++--- .../SwitchableLineBasedFrameDecoderFactory.java | 2 +- .../managesieveserver/netty/ManageSieveServer.java | 5 ++- .../james/pop3server/core/PassCmdHandler.java | 1 + .../apache/james/pop3server/netty/POP3Server.java | 4 +- .../apache/james/smtpserver/netty/SMTPServer.java | 4 +- 25 files changed, 176 insertions(+), 60 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
