add test for socks4

Author: TheEvilRoot

run_tests.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
 
-./test_proxy.sh &
-./test_proxy.sh username password &
+./test_proxy.sh 5 &
+./test_proxy.sh 5 username password &
+./test_proxy.sh 4 &
 
 ./gradlew test --info

src/main/kotlin/com/theevilroot/asyncsocket/Socks4CoroutineSocket.kt

@@ -10,7 +10,7 @@ import java.nio.channels.AsynchronousSocketChannel
 class Socks4CoroutineSocket(
     val socksIsa: InetSocketAddress,
     channel: AsynchronousSocketChannel,
-    userId: String
+    val userId: String
 ) : CoroutineSocket(channel) {
 
     lateinit var remoteIsa: InetSocketAddress
@@ -19,7 +19,9 @@ class Socks4CoroutineSocket(
         val message = byteArrayOf(0x04, 0x01,
             (isa.port shr 8).toByte(),
             (isa.port and 0xff).toByte(),
-            *isa.address.address)
+            *isa.address.address,
+            *userId.toByteArray(),
+            0x00.toByte())
         ByteBuffer.wrap(message).let {
             val count = super.write(it)
             if (count < message.size)
@@ -38,7 +40,7 @@ class Socks4CoroutineSocket(
         val bPort = ByteArray(2)
         response.position(2)
         response.get(bPort, 0, 2)
-        response.get(bPort, 0, 4)
+        response.get(addr, 0, 4)
         val port = (bPort[0].toUByte().toInt() shl 8) + bPort[1].toUByte().toInt()
         return InetSocketAddress(InetAddress.getByAddress(addr), port)
     }

src/test/kotlin/com/theevilroot/asyncsocket/Socks4Test.kt

@@ -0,0 +1,40 @@
+package com.theevilroot.asyncsocket
+
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import java.net.InetSocketAddress
+import java.nio.ByteBuffer
+import java.nio.channels.AsynchronousSocketChannel
+
+class Socks4Test {
+
+    lateinit var channel: AsynchronousSocketChannel
+
+    @Before
+    fun initChannel() {
+        channel = AsynchronousSocketChannel.open()
+    }
+
+    @Test
+    fun testSocks4Connect(): Unit = runBlocking {
+        val socket = Socks4CoroutineSocket(InetSocketAddress("127.0.0.1", 1082), channel, "user")
+        socket.init()
+        socket.connect(InetSocketAddress("52.48.142.75", 80))
+
+        Assert.assertTrue(socket.isOpened)
+        Assert.assertTrue(socket.isConnected)
+
+        val request = "GET /?format=json HTTP/1.1\r\nConnection: close\r\nHost: api.ipify.org\r\nAccept: */*\r\nUser-Agent: curl/1.1.1\r\n\r\n"
+        Assert.assertEquals(request.length, socket.write(ByteBuffer.wrap(request.toByteArray())))
+
+
+        // read some data, we don't need much
+        val response = ByteBuffer.allocate(32)
+        Assert.assertTrue(socket.read(response) > 0)
+
+        socket.close()
+    }
+
+}

src/test/kotlin/com/theevilroot/asyncsocket/SocksTest.kt

@@ -50,7 +50,7 @@ class SocksTest {
     fun testUserPassAuthIncorrect(): Unit = runBlocking {
         val credentials = "username" to "blah"
         val socket = SocksCoroutineSocket(InetSocketAddress("localhost", 1080), channel, credentials)
-        Assert.assertThrows(SocksCoroutineSocket.SocksException::class.java) {
+        Assert.assertThrows(SocksException::class.java) {
             runBlocking { socket.init() }
         }
     }

test_proxy.sh

@@ -1,18 +1,38 @@
 #!/usr/bin/env sh
 
 if [ $# -eq 0 ]
+  then
+    echo "usage: test_proxy [username password]"
+    exit 1
+fi
+
+if [ $1 = "4" ]
+  then
+    protocol=socks4
+    port=1082
+  elif [ $1 = "5" ]
+   then
+     protocol=socks5
+     port=1081
+  else
+    echo "protocol $1 is invalid. use 5 or 4 instead"
+    exit 1
+fi
+      
+
+if [ $# -eq 1 ]
   then
     echo ':: using no auth. port: 1081'
-    pproxy -l socks5://0.0.0.0:1081
+    pproxy -l "$protocol://0.0.0.0:$port"
     exit 0
 fi
 
-if [ $# -eq 2 ]
+if [ $# -eq 3 ]
   then
      echo ':: using user/pass auth. port: 1080'
-     pproxy -l "socks5://0.0.0.0:1080#$1:$2"
+     port=1080
+     pproxy -l "$protocol://0.0.0.0:$port#$1:$2"
      exit 0
-  else
-    echo "usage: test_proxy [username password]"
-    exit 1
 fi
+
+