Add handshake mechainism

Author: Neko

build/server/aplvpn/index.js

@@ -38,11 +38,7 @@ function handleAppleVPN(client, handshakeData, options) {
         catch (error) {
             return false;
         }
-        if (addrHelper.isIllegalAddress(handshake.destHost)) {
-            client.dispose();
-            return true;
-        }
-        if (handshake.flags === 0x00) {
+        if (handshake.flags === 0x00 && handshake.destHost === '0.0.0.0' && handshake.destPort === 0) {
             try {
                 yield handleHandshake(client, handshake, options);
             }
@@ -51,6 +47,10 @@ function handleAppleVPN(client, handshakeData, options) {
             }
             return true;
         }
+        if (addrHelper.isIllegalAddress(handshake.destHost)) {
+            client.dispose();
+            return true;
+        }
         switch (handshake.payloadProtocol) {
             case protocols_1.Protocols.TCP:
                 tcp_1.handleTCP(client, handshake, options);
@@ -79,6 +79,6 @@ function handleHandshake(client, handshake, options) {
         let cipher = cryptoEx.createCipher(options.cipherAlgorithm, options.password, handshake.extra).cipher;
         let md5 = crypto.createHash('md5').update(handshake.extra).digest();
         let randomPadding = new Buffer(Number((Math.random() * 128).toFixed()));
-        yield client.writeAsync(Buffer.concat([md5, randomPadding]));
+        yield client.writeAsync(Buffer.concat([cipher.update(md5), cipher.update(randomPadding)]));
     });
 }

server/aplvpn/index.ts

@@ -39,13 +39,13 @@ export async function handleAppleVPN(client: net.Socket, handshakeData: Buffer,
     return false;
   }
 
-  if (addrHelper.isIllegalAddress(handshake.destHost)) {
-    client.dispose();
+  if (handshake.flags === 0x00 && handshake.destHost === '0.0.0.0' && handshake.destPort === 0) {
+    try { await handleHandshake(client, handshake, options); } catch (error) { return false; }
     return true;
   }
 
-  if (handshake.flags === 0x00) {
-    try { await handleHandshake(client, handshake, options); } catch (error) { return false; }
+  if (addrHelper.isIllegalAddress(handshake.destHost)) {
+    client.dispose();
     return true;
   }
 
@@ -79,5 +79,6 @@ async function handleHandshake(client: net.Socket, handshake: VpnHandshake, opti
   let cipher = cryptoEx.createCipher(options.cipherAlgorithm, options.password, handshake.extra).cipher;
   let md5 = crypto.createHash('md5').update(handshake.extra).digest();
   let randomPadding = new Buffer(Number((Math.random() * 128).toFixed()));
-  await client.writeAsync(Buffer.concat([md5, randomPadding]));
+  
+  await client.writeAsync(Buffer.concat([cipher.update(md5), cipher.update(randomPadding)]));
 }