v0.8.45

Author: Peter Xie

app/compress.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import * as crypto from 'crypto'
+import * as Crypto from 'crypto'
 import * as Async from 'async'
 import * as Stream from 'stream'
 import * as Net from 'net'
@@ -36,20 +36,20 @@ export interface pairConnect {
 export const encrypt = ( text: Buffer, masterkey: string, CallBack ) => {
 	let salt = null
 	Async.waterfall ([
-		next => crypto.randomBytes ( 64, next ),
+		next => Crypto.randomBytes ( 64, next ),
 		( _salt, next ) => {
 			salt = _salt
-			crypto.pbkdf2 ( masterkey, salt, 2145, 32, 'sha512', next )
+			Crypto.pbkdf2 ( masterkey, salt, 2145, 32, 'sha512', next )
 		}
 	], ( err, derivedKey ) => {
 		if ( err )
 			return CallBack ( err )
 
-		crypto.randomBytes ( 12, ( err1, iv ) => {
+		Crypto.randomBytes ( 12, ( err1, iv ) => {
 			if ( err1 )
 				return CallBack ( err1 )
 
-			const cipher = crypto.createCipheriv ( 'aes-256-gcm', derivedKey, iv );
+			const cipher = Crypto.createCipheriv ( 'aes-256-gcm', derivedKey, iv );
 
 			let _text = Buffer.concat ([ Buffer.alloc ( 4, 0 ) , text ])
 			_text.writeUInt32BE ( text.length, 0 )
@@ -82,13 +82,13 @@ export const decrypt =  ( data: Buffer, masterkey, CallBack ) => {
 		const tag = data.slice ( 76, 92 );
 		const text = data.slice ( 92 );
 		// derive key using; 32 byte key length
-		crypto.pbkdf2 ( masterkey, salt , 2145, 32, 'sha512', ( err, derivedKey ) => {
+		Crypto.pbkdf2 ( masterkey, salt , 2145, 32, 'sha512', ( err, derivedKey ) => {
 
 			if ( err )
 				return CallBack ( err )
 			// AES 256 GCM Mode
 			try {
-				const decipher = crypto.createDecipheriv ( 'aes-256-gcm', derivedKey, iv )
+				const decipher = Crypto.createDecipheriv ( 'aes-256-gcm', derivedKey, iv )
 				decipher.setAuthTag ( tag )
 				const decrypted = Buffer.concat([decipher.update ( text ), decipher.final ( )]) 
 				const leng = decrypted.slice( 4, 4 + decrypted.readUInt32BE(0))
@@ -145,14 +145,14 @@ export class encryptStream extends Stream.Transform {
 	}
 	private init ( callback ) {
 		return Async.waterfall ([
-			next => crypto.randomBytes ( 64, next ),
+			next => Crypto.randomBytes ( 64, next ),
 			( _salt, next ) => {
 				this.salt = _salt
-				crypto.randomBytes ( 12, next )
+				Crypto.randomBytes ( 12, next )
 			},
 			( _iv, next ) => {
 				this.iv = _iv
-				crypto.pbkdf2 ( this.password, this.salt, 2145, 32, 'sha512', next )
+				Crypto.pbkdf2 ( this.password, this.salt, 2145, 32, 'sha512', next )
 			}
 		], ( err, derivedKey ) => {
 
@@ -171,15 +171,16 @@ export class encryptStream extends Stream.Transform {
 				return this._transform ( chunk, encode, cb )
 			})
 		}
-		const cipher = crypto.createCipheriv ( 'aes-256-gcm', this.derivedKey, this.iv )
+		const cipher = Crypto.createCipheriv ( 'aes-256-gcm', this.derivedKey, this.iv )
 
 		let _text = Buffer.concat ([ Buffer.alloc ( 4, 0 ) , chunk ])
 
 		_text.writeUInt32BE ( chunk.length, 0 )
-
+		
 		if ( chunk.length < this.random ) {
-			_text = Buffer.concat ([ _text, Buffer.allocUnsafe ( Math.random() * 1000 )])
+			_text = Buffer.concat ([ _text, Crypto.randomBytes ( Math.round(Math.random() * 5000 ))])
 		}
+
 		const _buf = Buffer.concat ([ cipher.update ( _text ), cipher.final ()])
 		const _buf1 = Buffer.concat ([ cipher.getAuthTag (), _buf ])
 
@@ -213,7 +214,7 @@ export class decryptStream extends Stream.Transform {
 	private derivedKey: Buffer = null
 	private _decrypt ( _text: Buffer ) {
 
-		const decipher = crypto.createDecipheriv ( 'aes-256-gcm', this.derivedKey, this.iv )
+		const decipher = Crypto.createDecipheriv ( 'aes-256-gcm', this.derivedKey, this.iv )
 		decipher.setAuthTag ( _text.slice ( 0, 16 ))
 		try {
 			const _buf = Buffer.concat ([ decipher.update ( _text.slice ( 16 )), decipher.final () ])
@@ -233,7 +234,7 @@ export class decryptStream extends Stream.Transform {
 	public _First (  chunk: Buffer, CallBack: ( err?: Error, text?: Buffer ) => void ) {
 		this.salt = chunk.slice ( 0, 64 );
 		this.iv = chunk.slice ( 64, 76 );
-		return crypto.pbkdf2 ( this.password, this.salt , 2145, 32, 'sha512', ( err, derivedKey ) => {
+		return Crypto.pbkdf2 ( this.password, this.salt , 2145, 32, 'sha512', ( err, derivedKey ) => {
 			if ( err ) {
 				console.log ( `decryptStream crypto.pbkdf2 ERROR: ${ err.message }` )
 				return CallBack ( err )

app/gateway.ts

@@ -20,20 +20,21 @@ import * as Dns from 'dns'
 import * as Net from 'net'
 import * as res from './res'
 import * as Stream from 'stream'
+import * as Crypto from 'crypto'
 
 const Day = 1000 * 60 * 60 * 24
 
 const otherRequestForNet = ( path: string, host: string, port: number, UserAgent: string ) => {
-	if ( path.length < 2048) 
+	if ( path.length < 1024 + Math.round( Math.random () * 4000 )) 
 		return `GET /${ path } HTTP/1.1\r\n` +
-				`Host: ${ host }:${ port }\r\n` +
+				`Host: ${ host }${ port !== 80 ? ':'+ port : '' }\r\n` +
 				`Accept: */*\r\n` +
 				`Accept-Language: en-ca\r\n` +
 				`Connection: keep-alive\r\n` +
 				`Accept-Encoding: gzip, deflate\r\n` +
 				`User-Agent: ${ UserAgent ? UserAgent : 'Mozilla/5.0' }\r\n\r\n`
-	return 	`POST /${ Buffer.allocUnsafe ( 10 + Math.random()).toString('base64') } HTTP/1.1\r\n` +
-			`Host: ${ host }:${ port }\r\n` +
+	return 	`POST /${ Crypto.randomBytes ( 10 + Math.round ( Math.random () * 1500 )).toString ( 'base64')} HTTP/1.1\r\n` +
+			`Host: ${ host }${ port !== 80 ? ':'+ port : '' }\r\n` +
 			`Content-Length: ${ path.length }\r\n\r\n` +
 			path + '\r\n\r\n'
 }
@@ -74,7 +75,7 @@ export default class gateWay {
 
 		const _data = new Buffer ( JSON.stringify ({ hostName: hostName }), 'utf8' )
 
-		const encrypt = new Compress.encryptStream ( this.password, 0, ( str: string ) => {
+		const encrypt = new Compress.encryptStream ( this.password, 3000, ( str: string ) => {
 			return this.request ( str )
 		})
 
@@ -107,7 +108,7 @@ export default class gateWay {
 	public requestGetWay ( id: string, uuuu: VE_IPptpStream, userAgent: string, socket: Net.Socket ) {
 		this.userAgent = userAgent
 		const decrypt = new Compress.decryptStream ( this.password )
-		const encrypt = new Compress.encryptStream ( this.password, 0, ( str: string ) => {
+		const encrypt = new Compress.encryptStream ( this.password, 3000, ( str: string ) => {
 			return this.request ( str )
 		})
 		const httpBlock = new Compress.getDecryptClientStreamFromHttp ()

app/proxyServer.ts

@@ -437,7 +437,7 @@ export class proxyServer {
 				if ( /^GET \/pac/.test ( dataStr )) {
 					const httpHead = new HttpProxyHeader ( data )
 					agent = httpHead.headers['user-agent']
-					const sock5 = /Windows NT|Darwin/i.test ( agent ) && ! /CFNetwork/i.test (agent)
+					const sock5 = /Windows NT|Darwin|Firefox/i.test ( agent ) && ! /CFNetwork/i.test (agent)
 
 					let ret = getPac ( this.localProxyServerIP, this.port, false, sock5 )
 					if ( /pacHttp/.test( dataStr ))

app/server.js

@@ -754,7 +754,6 @@ class localServer {
     disConnectGateway() {
         saveLog('disConnectGateway.');
         this.proxyServer.cancel();
-        this.socketServer.emit('disconnect');
         this.proxyServer = null;
         this.connectCommand = null;
     }

app/server.ts

@@ -815,7 +815,6 @@ export class localServer {
 	public disConnectGateway () {
 		saveLog ( 'disConnectGateway.')
 		this.proxyServer.cancel ()
-		this.socketServer.emit ('disconnect')
 		this.proxyServer = null
 		this.connectCommand = null
 

index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /*!
  * Copyright 2017 QTGate systems Inc. All Rights Reserved.
  *
@@ -16,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+Object.defineProperty(exports, "__esModule", { value: true });
 const DEBUG = false;
 const Fs = require("fs");
 const Os = require("os");

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qtgate",
-  "version": "0.8.40",
+  "version": "0.8.45",
   "license": "MIT",
   "description": "QTGate desktop client",
   "scripts": {