refactoring

Author: JavaSaBr

rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketReader.java

@@ -112,8 +112,6 @@ protected int doHandshake(@NotNull ByteBuffer receivedBuffer, int receivedBytes)
                         }
 
                         sslEngine.closeOutbound();
-                        // After closeOutbound the engine will be set to WRAP state,
-                        // in order to try to send a close message to the client.
                         handshakeStatus = sslEngine.getHandshakeStatus();
                         break;
 
@@ -129,7 +127,6 @@ protected int doHandshake(@NotNull ByteBuffer receivedBuffer, int receivedBytes)
                     } catch (SSLException sslException) {
                         LOGGER.error("A problem was encountered while processing the data that caused the " +
                             "SSLEngine to abort. Will try to properly close connection...");
-                        LOGGER.error(sslException);
                         sslEngine.closeOutbound();
                         handshakeStatus = sslEngine.getHandshakeStatus();
                         break;
@@ -139,7 +136,7 @@ protected int doHandshake(@NotNull ByteBuffer receivedBuffer, int receivedBytes)
                         case OK:
                             break;
                         case BUFFER_OVERFLOW:
-                            throw new IllegalStateException("Unexpected state");
+                            throw new IllegalStateException("Unexpected ssl engine result");
                         case BUFFER_UNDERFLOW:
                             LOGGER.debug("Increase ssl network buffer");
                             increaseNetworkBuffer();
@@ -194,6 +191,7 @@ protected int decryptAndRead(@NotNull ByteBuffer receivedBuffer) {
 
         SSLEngineResult result;
         try {
+            LOGGER.debug(receivedBuffer, buf -> "Try to decrypt data:\n" + hexDump(buf));
             result = sslEngine.unwrap(receivedBuffer, sslDataBuffer.clear());
         } catch (SSLException e) {
             if (e.getCause() instanceof BadPaddingException) {

rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketWriter.java

@@ -80,7 +80,7 @@ public AbstractSSLPacketWriter(
                     increaseNetworkBuffer();
                     break;
                 case BUFFER_OVERFLOW:
-                    throw new IllegalStateException("Unexpected state");
+                    throw new IllegalStateException("Unexpected ssl engine result");
                 case OK:
                     return sslNetworkBuffer.flip();
                 case CLOSED:
@@ -149,14 +149,10 @@ public AbstractSSLPacketWriter(
                             sslNetworkBuffer = NetworkUtils.enlargePacketBuffer(bufferAllocator, sslEngine);
                             break;
                         case BUFFER_UNDERFLOW:
-                            throw new SSLException(
-                                "Buffer underflow occured after a wrap. I don't think we should ever get here."
-                            );
+                            throw new IllegalStateException("Unexpected ssl engine result");
                         case CLOSED:
                             try {
                                 return EMPTY_BUFFER;
-                                // At this point the handshake status will probably be NEED_UNWRAP so we make sure that peerNetData is clear to read.
-                                //peerNetData.clear();
                             } catch (Exception e) {
                                 LOGGER.error("Failed to send server's CLOSE message due to socket channel's failure.");
                                 handshakeStatus = sslEngine.getHandshakeStatus();
@@ -169,6 +165,7 @@ public AbstractSSLPacketWriter(
                 case NEED_TASK:
                     Runnable task;
                     while ((task = sslEngine.getDelegatedTask()) != null) {
+                        LOGGER.debug(task, t -> "Execute SSL Engine's task: " + t.getClass());
                         task.run();
                     }
                     handshakeStatus = sslEngine.getHandshakeStatus();