This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit f06bff8514333a9ebe0b6e8f6cd2eca0dcc0e0ec Merge: 8aa408c cbb114f Author: Benoit TELLIER <[email protected]> AuthorDate: Sun Aug 29 14:37:23 2021 +0700 Merge pull request #589 JAMES-1862 Generalize STARTTLS sanitizing fix .../james/mpt/smtp/SmtpStarttlsCommandTest.java | 7 ++ .../smtp/scripts/starttls_session_fixation.test | 26 +++++++ .../protocols/api/CommandDetectionSession.java | 18 ++--- .../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 +- server/protocols/protocols-imap4/pom.xml | 5 ++ .../james/imapserver/netty/NettyImapSession.java | 17 +++++ .../netty/SwitchableLineBasedFrameDecoder.java | 45 +++++++++-- .../SwitchableLineBasedFrameDecoderFactory.java | 2 +- .../james/imapserver/netty/IMAPServerTest.java | 60 +++++++++++++++ .../src/test/resources/imapServerStartTLS.xml | 18 +++++ .../protocols-imap4/src/test/resources/keystore | Bin 0 -> 2245 bytes .../managesieveserver/netty/ManageSieveServer.java | 5 +- server/protocols/protocols-pop3/pom.xml | 5 ++ .../james/pop3server/core/PassCmdHandler.java | 1 + .../apache/james/pop3server/netty/POP3Server.java | 4 +- .../apache/james/pop3server/POP3ServerTest.java | 82 ++++++++++++++++++--- .../protocols-pop3/src/test/resources/keystore | Bin 0 -> 2245 bytes .../src/test/resources/pop3server.xml | 15 ++++ .../apache/james/smtpserver/netty/SMTPServer.java | 4 +- 33 files changed, 348 insertions(+), 81 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
