This is an automated email from the ASF dual-hosted git repository.
johnnyv pushed a change to branch 2.2.X
in repository https://gitbox.apache.org/repos/asf/mina.git.
from 3726e4a Fix DIRMINA-1035
add 498588d formatted mina.filter.ssl
add e60463a adds IoSession#isServer()
add f75a710 Adds unique identifier to toString() result
add d9b3528 Adds initial ssl2
add 95e59dd Fixes possible incorrect assertion of handshaking during write
add b817f02 Fixes bug in TailFilter which triggers the connect future on
created instead of opened.
add 81272b9 Fix for ssl2 request backlog
add d64c8c7 Adds SSL2 flow control
add f711c2a Adds support for IoEvent.SECURED and IoSession#isSecured()
add 2bd87b6 Improves loop encode/decode functions
add 040b77c certs cleanup
add 89dc050 simplifies #isSecured() checking; adds null checks
add 94a43f8 Adds hard ceiling for the number of queued cleartext messages
in SSL2Handler
add 2f59eed Adds filter extend handler for engine creation allowing users
to implement components like DIRMINA-1122 by themselves without having to patch
the project. Simply override onEngineCreated()
add 4aa4729 Adds missing null check for enabled ciphersuites/protocols
add d53d1f8 ensures that receive() is not executed in recursion in order
to prevent corruption of the decode buffer. qreceive() may be executed in
recursion because it does not modify the decode buffer.
add 5fe18b2 ensures that qreceive() loops when possible
add 8d076dc Fixes Issue with SSLEngine emit FINISHED twice in conjunction
with needing to loop the receive buffer to consume more data. Prevents
accidently freeing of the ZERO buffer. Enables receive() recursion from within
a receive -> write -> finish -> receive loop.
add 86119e3 improves engine customization
add 4c11155 SSL improvements
new 6564261 Merge branch 'bugfix/DIRMINA1132' into 2.2.X
new 93a1428 Corrects HTTP decode for pipeline requests
new 8b61c5b Updates SSL & unit tests for the main SSL package changes
new a7ceb08 Fix size == 0 check; removes unused tests
new 6675179 applies null check
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/mina/core/buffer/AbstractIoBuffer.java | 2 +
.../core/filterchain/DefaultIoFilterChain.java | 34 +-
.../mina/core/session/AbstractIoSession.java | 8 +-
.../org/apache/mina/core/session/IoSession.java | 5 +
.../mina/core/write/WriteRejectedException.java | 44 +
.../mina/filter/codec/textline/LineDelimiter.java | 2 +-
.../mina/filter/ssl/BogusTrustManagerFactory.java | 113 +--
...e-info.java => DisableEncryptWriteRequest.java} | 11 +-
.../{SslEvent.java => EncryptedWriteRequest.java} | 30 +-
.../apache/mina/filter/ssl/KeyStoreFactory.java | 292 +++----
.../apache/mina/filter/ssl/SSLContextFactory.java | 443 ++++++++++
.../filter/ssl/{SslEvent.java => SSLEvent.java} | 8 +-
.../java/org/apache/mina/filter/ssl/SSLFilter.java | 320 ++++++++
.../org/apache/mina/filter/ssl/SSLHandler.java | 284 +++++++
.../org/apache/mina/filter/ssl/SSLHandlerG0.java | 606 ++++++++++++++
.../apache/mina/filter/ssl/SslContextFactory.java | 437 ----------
.../java/org/apache/mina/filter/ssl/SslFilter.java | 909 ---------------------
.../org/apache/mina/filter/ssl/SslHandler.java | 871 --------------------
.../org/apache/mina/filter/ssl/package-info.java | 3 +-
.../proxy/handlers/socks/Socks4LogicHandler.java | 5 +-
.../transport/socket/nio/NioSocketSession.java | 614 +++++++-------
...dentityHashSet.java => BasicThreadFactory.java} | 68 +-
.../java/org/apache/mina/util/StackInspector.java | 78 ++
.../SslTestHandshakeExceptionDIRMINA1077Test.java | 35 +-
.../org/apache/mina/filter/ssl/SSLFilterMain.java | 126 +++
.../apache/mina/filter/ssl/SslDIRMINA937Test.java | 168 ----
.../org/apache/mina/filter/ssl/SslEngineTest.java | 486 -----------
.../org/apache/mina/filter/ssl/SslFilterTest.java | 142 ----
.../java/org/apache/mina/filter/ssl/SslTest.java | 266 ------
.../apache/mina/filter/ssl/emptykeystore.sslTest | Bin 32 -> 0 bytes
.../filter/ssl/{keystore.sslTest => keystore.jks} | Bin
.../ssl/{truststore.sslTest => truststore.jks} | Bin
.../java/org/apache/mina/example/chat/Main.java | 4 +-
.../example/chat/client/ChatClientSupport.java | 5 +-
.../org/apache/mina/example/echoserver/Main.java | 4 +-
.../apache/mina/example/tcp/perf/TcpSslClient.java | 5 +-
.../apache/mina/example/tcp/perf/TcpSslServer.java | 4 +-
.../mina/example/echoserver/AbstractTest.java | 9 +-
.../mina/example/echoserver/ConnectorTest.java | 13 +-
.../mina/example/echoserver/ssl/SslFilterTest.java | 6 +-
.../org/apache/mina/http/HttpServerDecoder.java | 2 +-
41 files changed, 2546 insertions(+), 3916 deletions(-)
create mode 100644
mina-core/src/main/java/org/apache/mina/core/write/WriteRejectedException.java
copy mina-core/src/main/java/org/apache/mina/filter/ssl/{package-info.java =>
DisableEncryptWriteRequest.java} (81%)
copy mina-core/src/main/java/org/apache/mina/filter/ssl/{SslEvent.java =>
EncryptedWriteRequest.java} (51%)
create mode 100644
mina-core/src/main/java/org/apache/mina/filter/ssl/SSLContextFactory.java
rename mina-core/src/main/java/org/apache/mina/filter/ssl/{SslEvent.java =>
SSLEvent.java} (91%)
create mode 100644
mina-core/src/main/java/org/apache/mina/filter/ssl/SSLFilter.java
create mode 100644
mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandler.java
create mode 100644
mina-core/src/main/java/org/apache/mina/filter/ssl/SSLHandlerG0.java
delete mode 100644
mina-core/src/main/java/org/apache/mina/filter/ssl/SslContextFactory.java
delete mode 100644
mina-core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
delete mode 100644
mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
copy mina-core/src/main/java/org/apache/mina/util/{IdentityHashSet.java =>
BasicThreadFactory.java} (50%)
create mode 100644
mina-core/src/main/java/org/apache/mina/util/StackInspector.java
create mode 100644
mina-core/src/test/java/org/apache/mina/filter/ssl/SSLFilterMain.java
delete mode 100644
mina-core/src/test/java/org/apache/mina/filter/ssl/SslDIRMINA937Test.java
delete mode 100644
mina-core/src/test/java/org/apache/mina/filter/ssl/SslEngineTest.java
delete mode 100644
mina-core/src/test/java/org/apache/mina/filter/ssl/SslFilterTest.java
delete mode 100644
mina-core/src/test/java/org/apache/mina/filter/ssl/SslTest.java
delete mode 100644
mina-core/src/test/resources/org/apache/mina/filter/ssl/emptykeystore.sslTest
rename
mina-core/src/test/resources/org/apache/mina/filter/ssl/{keystore.sslTest =>
keystore.jks} (100%)
rename
mina-core/src/test/resources/org/apache/mina/filter/ssl/{truststore.sslTest =>
truststore.jks} (100%)
