add tests

Author: lecousin

src/main/java/net/lecousin/framework/network/ssl/SSLLayer.java

@@ -249,10 +249,6 @@ private void checkHandshakeTasks(SSLEngine engine) {
 		private void needTask() {
 			@SuppressWarnings("unchecked")
 			List<Task<Void,NoException>> tasks = (List<Task<Void,NoException>>)conn.getAttribute(HANDSHAKE_TASKS_ATTRIBUTE);
-			if (tasks == null || tasks.isEmpty()) {
-				followup(conn, timeout);
-				return;
-			}
 			MutableBoolean firstTask = new MutableBoolean(true);
 			Runnable taskDone = () -> {
 				synchronized (firstTask) {
@@ -265,15 +261,8 @@ private void needTask() {
 					return null;
 				}).start();
 			};
-			for (Iterator<Task<Void,NoException>> it = tasks.iterator(); it.hasNext(); ) {
-				Task<Void,NoException> t = it.next();
-				if (t.getOutput().isDone()) {
-					it.remove();
-					followup(conn, timeout);
-					return;
-				}
-				t.getOutput().onDone(taskDone);
-			}
+			for (Iterator<Task<Void,NoException>> it = tasks.iterator(); it.hasNext(); )
+				it.next().getOutput().onDone(taskDone);
 		}
 
 		private void needWrap() {
@@ -334,14 +323,7 @@ private boolean needUnwrap(SSLEngine engine, ByteBuffer inputBuffer, Object inpu
 						return true;
 					}
 					if (SSLEngineResult.Status.BUFFER_OVERFLOW.equals(result.getStatus())) {
-						if (logger.debug())
-							logger.debug(
-								"Cannot unwrap because buffer is too small, enlarge it");
-						ByteBuffer b = ByteBuffer.wrap(bufferCache.get(dst.capacity() << 1, true));
-						dst.flip();
-						b.put(dst);
-						bufferCache.free(dst);
-						dst = b;
+						dst = enlargeBuffer(dst);
 						continue;
 					}
 					if (logger.debug())
@@ -450,13 +432,7 @@ private void dataReceived(TCPConnection conn, SSLEngine engine, ByteBuffer input
 				return;
 			}
 			if (SSLEngineResult.Status.BUFFER_OVERFLOW.equals(result.getStatus())) {
-				if (logger.debug())
-					logger.debug("Output buffer too small to decrypt data, try again with larger one");
-				ByteBuffer b = ByteBuffer.wrap(bufferCache.get(dst.capacity() << 1, true));
-				dst.flip();
-				b.put(dst);
-				bufferCache.free(dst);
-				dst = b;
+				dst = enlargeBuffer(dst);
 				continue;
 			}
 			// data ready
@@ -480,6 +456,14 @@ private void compactInputBuffer(ByteBuffer inputBuffer, int packetSize, TCPConne
 		inputBuffer.compact();
 	}
 
+	private ByteBuffer enlargeBuffer(ByteBuffer buf) {
+		ByteBuffer b = ByteBuffer.wrap(bufferCache.get(buf.capacity() << 1, true));
+		buf.flip();
+		b.put(buf);
+		bufferCache.free(buf);
+		return b;
+	}
+	
 	/** Encrypt the given data. */
 	@SuppressWarnings("squid:S1319") // return LinkedList instead of List
 	public LinkedList<ByteBuffer> encryptDataToSend(TCPConnection conn, List<ByteBuffer> data) throws SSLException {
@@ -512,11 +496,7 @@ public LinkedList<ByteBuffer> encryptDataToSend(TCPConnection conn, List<ByteBuf
 						continue;
 					}
 					packetSize <<= 1;
-					ByteBuffer b = ByteBuffer.wrap(bufferCache.get(dst.capacity() << 1, true));
-					dst.flip();
-					b.put(dst);
-					bufferCache.free(dst);
-					dst = b;
+					dst = enlargeBuffer(dst);
 					continue;
 				}
 				if (!toEncrypt.hasRemaining()) {

src/test/java/net/lecousin/framework/network/tests/tcp/TestSSLClient.java

@@ -1,18 +1,21 @@
 package net.lecousin.framework.network.tests.tcp;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 
 import javax.net.ssl.SSLException;
 
+import net.lecousin.framework.concurrent.async.Async;
 import net.lecousin.framework.network.client.SSLClient;
 import net.lecousin.framework.network.client.TCPClient;
 import net.lecousin.framework.network.server.TCPServer;
 import net.lecousin.framework.network.server.protocol.SSLServerProtocol;
 import net.lecousin.framework.network.test.AbstractNetworkTest;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TestSSLClient extends AbstractNetworkTest {
@@ -84,4 +87,22 @@ public void testConnectWithHostname() throws Exception {
 		}
 	}
 
+	@Test
+	public void testTunnelConnected() throws Exception {
+		try (TCPServer server = new TCPServer()) {
+			server.setProtocol(new SSLServerProtocol(sslTest, new WelcomeProtocol()));
+			SocketAddress serverAddress = server.bind(new InetSocketAddress("localhost", 0), 0).blockResult(0);
+		
+			try (SSLClient client = new SSLClient(sslTest)) {
+				TCPClient tunnel = new TCPClient();
+				tunnel.connect(serverAddress, 0).blockThrow(0);
+				Async<IOException> connection = new Async<>();
+				client.tunnelConnected(tunnel, connection, 10000);
+				connection.blockThrow(0);
+				client.send(ByteBuffer.wrap(new byte[] { 'B', 'y', 'e', '\n' }), 5000);
+				Assert.assertArrayEquals(new byte[] { 'W', 'e', 'l', 'c', 'o', 'm', 'e', '\n', 'B', 'y', 'e' }, client.getReceiver().readBytes(11, 5000).blockResult(0));
+			}
+		}
+	}
+	
 }

src/test/java/net/lecousin/framework/network/tests/tcp/TestTCPWelcomeProtocol.java

@@ -15,6 +15,7 @@
 import net.lecousin.framework.concurrent.async.Async;
 import net.lecousin.framework.concurrent.async.AsyncSupplier;
 import net.lecousin.framework.concurrent.async.IAsync;
+import net.lecousin.framework.concurrent.util.AsyncConsumer;
 import net.lecousin.framework.concurrent.util.PartialAsyncConsumer;
 import net.lecousin.framework.io.buffering.ByteArrayIO;
 import net.lecousin.framework.io.util.DataUtil;
@@ -304,6 +305,17 @@ public void testClientReceiverWithConsumer() throws Exception {
 		}
 	}
 
+	@Test
+	public void testClientAsConsumer() throws Exception {
+		try (TCPClient client = connectClient()) {
+			AsyncConsumer<ByteBuffer, IOException> consumer = client.asConsumer(3, 5000);
+			consumer.consume(ByteBuffer.wrap(new byte[] { 'B', 'y', 'e', '\n' }));
+			consumer.end().blockThrow(0);
+			consumer.error(new IOException("test"));
+			Assert.assertArrayEquals(new byte[] { 'W', 'e', 'l', 'c', 'o', 'm', 'e', '\n', 'B', 'y', 'e' }, client.getReceiver().readBytes(11, 5000).blockResult(0));
+		}
+	}
+	
 	@Test
 	public void testFloodMe() throws Exception {
 		Assert.assertEquals(0, server.getConnectedClients().size());