v0.8.30

Author: Peter Xie

app/gateway.ts

@@ -85,12 +85,12 @@ export default class gateWay {
 
 		const _socket = Net.createConnection ({ port: this.serverPort, host: this.serverIp }, () => {
 			encrypt.write ( _data )
-			console.log (`send data to remote!`)
-			console.log(`*************\n${_data.toString ()}\n*********`)
+			console.log ( `send data to remote!` )
+			console.log ( `*************\n${_data.toString ()}\n*********`)
 		})
 
 		_socket.once ( 'end', () => {
-			console.log (`_socket.once end!`)
+			console.log ( `_socket.once end!` )
 		})
 
 		httpBlock.once ( 'error', err => {
@@ -103,8 +103,7 @@ export default class gateWay {
 
 		} )
 		encrypt.pipe ( _socket ).pipe ( httpBlock ).pipe ( decrypt ).pipe ( finish )
-		
-		
+
 	}
 
 	public requestGetWay ( id: string, uuuu: VE_IPptpStream, userAgent: string, socket: Net.Socket ) {

app/proxyServer.ts

@@ -29,7 +29,7 @@ import * as res from './res'
 import * as Stream from 'stream'
 import * as Fs from 'fs'
 import * as Path from 'path'
-import socket5 from './socket5'
+import * as Socks from './socket5ForiOpn'
 import gateWay from './gateway'
 import * as Os from 'os'
 const { remote } = require ( "electron" )
@@ -54,7 +54,7 @@ const IsSslConnect = ( buffer: Buffer ) => {
 	return /^1603(01|02|03|00)|^80..0103|^(14|15|17)03(00|01)/.test (kk)
 }
 
-const checkDomainInBlackList = ( BlackLisk: string[], domain: string, CallBack ) => {
+export const checkDomainInBlackList = ( BlackLisk: string[], domain: string, CallBack ) => {
 
 	if ( Net.isIP ( domain )) {
 		return CallBack ( null, BlackLisk.find ( n => { return n === domain }) ? true : false )
@@ -140,7 +140,7 @@ const closeClientSocket = ( socket: Net.Socket, status: number, body: string ) =
 const _connect = ( hostname: string, hostIp: string, port: number, clientSocket: Net.Socket, data: Buffer, connectHostTimeOut: number,  CallBack ) => {
 	console.log (`direct _connect!`)
 	const socket = new Net.Socket()
-	const ip = clientSocket.remoteAddress.split (':')[3]
+	const ip = clientSocket.remoteAddress.split (':')[3]|| clientSocket.remoteAddress
 	let err = null
 	const id = `[${ ip }] => [${ hostname }:${ port }] `
 	const hostInfo = `{${ hostIp }:${ port }}`
@@ -160,7 +160,7 @@ const _connect = ( hostname: string, hostIp: string, port: number, clientSocket:
 	}
 
 	socket.on ( 'connect', () => {
-		console.log (`${ id } socket.on connect!`)
+		console.log ( `${ id } socket.on connect!`)
 
 		clearTimeout ( timeout )
 
@@ -208,7 +208,7 @@ const _connect = ( hostname: string, hostIp: string, port: number, clientSocket:
 	return socket.connect ( port, hostIp )
 }
 
-const tryConnectHost = ( hostname: string, hostIp: domainData, port: number, data: Buffer, clientSocket: Net.Socket, isSSLConnect: boolean, 
+export const tryConnectHost = ( hostname: string, hostIp: domainData, port: number, data: Buffer, clientSocket: Net.Socket, isSSLConnect: boolean, 
 	checkAgainTimeOut: number, connectTimeOut: number, gateway: boolean, CallBack ) => {
 
 	if ( isSSLConnect ) {
@@ -264,7 +264,7 @@ const tryConnectHost = ( hostname: string, hostIp: domainData, port: number, dat
 
 }
 
-const isAllBlackedByFireWall = ( hostName: string, ip6: boolean, checkAgainTime: number, gatway: gateWay, userAgent: string, domainListPool: Map < string, domainData >,
+export const isAllBlackedByFireWall = ( hostName: string, ip6: boolean, gatway: gateWay, userAgent: string, domainListPool: Map < string, domainData >,
 	CallBack: ( err?: Error, hostIp?: domainData ) => void ) => {
 
 	const hostIp = domainListPool.get ( hostName )
@@ -276,7 +276,13 @@ const isAllBlackedByFireWall = ( hostName: string, ip6: boolean, checkAgainTime:
 	return CallBack ( null, hostIp )
 }
 
-
+const isSslFromBuffer = ( buffer ) => {
+	console.log ( buffer.toString ('hex'))
+	const ret = /^\x16[\x2c-\xff]\x01\x00[\x00-\x05].[\x00-\x09][\x00-\x1f]|^\x80[\x0f-\xff]\x01[\x00-\x09][\x00-\x1f][\x00-\x05].\x00.\x00./.test ( buffer )
+	
+	console.log ( `ret [${ ret }]`)
+	return ret
+}
 const httpProxy = ( clientSocket: Net.Socket, buffer: Buffer, useGatWay: boolean, ip6: boolean, connectTimeOut: number,  
 	domainListPool: Map < string, domainData >, gatway: gateWay, checkAgainTime: number, blackDomainList: string[] ) => {
 
@@ -285,7 +291,7 @@ const httpProxy = ( clientSocket: Net.Socket, buffer: Buffer, useGatWay: boolean
 	const userAgent = httpHead.headers [ 'user-agent' ]
 
 	const CallBack = ( err?: Error, _data?: Buffer ) => {
-
+		console.log ( `tryConnectHost callback err [${ err }], _data[${ _data }]`)
 		if ( err ) {
 
 			if ( useGatWay && _data && _data.length && clientSocket.writable ) {
@@ -296,7 +302,7 @@ const httpProxy = ( clientSocket: Net.Socket, buffer: Buffer, useGatWay: boolean
 					cmd: Rfc1928.CMD.CONNECT,
 					ATYP: Rfc1928.ATYP.IP_V4,
 					port: parseInt ( httpHead.Url.port || httpHead.isHttps ? '443' : '80' ),
-					ssl: httpHead.isHttps
+					ssl: isSslFromBuffer ( _data )
 				}
 
 				const id = `[${ clientSocket.remoteAddress.split(':')[3] }:${ clientSocket.remotePort }][${ uuuu.uuid }] `
@@ -322,7 +328,7 @@ const httpProxy = ( clientSocket: Net.Socket, buffer: Buffer, useGatWay: boolean
 
         if ( ! hostIp ) {
 			console.log ( `domain connect to [${ hostName }]`)
-			return isAllBlackedByFireWall ( hostName,  ip6, checkAgainTime, gatway, userAgent, domainListPool, ( err, _hostIp ) => {
+			return isAllBlackedByFireWall ( hostName,  ip6, gatway, userAgent, domainListPool, ( err, _hostIp ) => {
 				if ( err ) {
 					console.log ( `[${ hostName }] Blocked!`)
 					return closeClientSocket ( clientSocket, 504, null )
@@ -344,68 +350,16 @@ const httpProxy = ( clientSocket: Net.Socket, buffer: Buffer, useGatWay: boolean
 	})
 
 }
-/*
-const httpProxyTest = ( socket: Net.Socket, data: Buffer,  gateway: gateWay ) => {
-	const httpHead = new HttpProxyHeader ( data )
-	const port = parseInt ( httpHead.Url.port ||  httpHead.isHttps ? '443' : '80' )
-	const hostName = httpHead.Url.hostname
-	const userAgent = httpHead.headers [ 'user-agent' ]
-	let first = true
-
-	const localrequest = ( buf: Buffer ) => {
-		if ( httpHead.isHttps && first ) {
-			first = false
-			console.log ('https connect!')
-			socket.once ( 'data', _data => {
-				return localrequest ( _data )
-			})
-
-			return closeClientSocket ( socket, -200, '' )
-		}
-		const net = Net.createConnection ( port, hostName, () => {
-			const ls = new Compress.printStream ('>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-			const ls1 = new Compress.printStream ('<<<<<<<<<<<<<<<<<<<<<<<<<<<<')
-			net.pipe ( socket ).pipe( ls ).pipe ( net )
-			net.write ( buf )
-		})
 
-	}
-
-	const connectTestPort = ( buf: Buffer ) => {
-		if ( httpHead.isHttps && first ) {
-			first = false
-			console.log ('https connect!')
-			socket.once ( 'data', _data => {
-				return connectTestPort ( _data )
-			})
-
-			return closeClientSocket ( socket, -200, '' )
-		}
-		const uuuu : VE_IPptpStream = {
-			uuid: Crypto.randomBytes (10).toString ('hex'),
-			host: hostName,
-			buffer: buf.toString ( 'base64' ),
-			cmd: Rfc1928.CMD.CONNECT,
-			ATYP: Rfc1928.ATYP.IP_V4,
-			port: port
-		}
-		const id = `[${ socket.remoteAddress.split(':')[3] }:${ socket.remotePort }][${ uuuu.uuid }]`
-		console.log ( uuuu.buffer )
-		return gateway.requestGetWayTest ( id, uuuu, userAgent, socket )
-	}
-
-	return connectTestPort ( data )
-}
-*/
-export default class proxyServer {
+export class proxyServer {
 
 	private hostLocalIpv4: { network: string, address: string } []= []
 	private hostLocalIpv6: string = null
 	private hostGlobalIpV4: string = null
 	private hostGlobalIpV6: string = null
 	private network = false
 	private getGlobalIpRunning = false
-
+	public gateway = new gateWay ( this.serverIp, this.serverPort, this.password )
 	private saveWhiteIpList () {
 		if ( this.whiteIpList.length > 0 )
 			Fs.writeFile ( Path.join( __dirname, whiteIpFile ), JSON.stringify( this.whiteIpList ), { encoding: 'utf8' }, err => {
@@ -456,13 +410,11 @@ export default class proxyServer {
 		return _HTTP_200 ( FindProxyForURL )
 	}
     */
-	constructor ( private whiteIpList: string[], private domainListPool: Map < string, domainData >, 
-		private port: number, private securityPath: string, private serverIp: string, private serverPort: number, private password: string, private checkAgainTimeOut: number, 
-		private connectHostTimeOut: number, useGatWay: boolean, domainBlackList: string[] ) {
-
-		const gateway = new gateWay ( serverIp, serverPort, password )
-
-		this.getGlobalIp ( gateway )
+	constructor ( public whiteIpList: string[], public domainListPool: Map < string, domainData >, 
+		private port: number, private securityPath: string, private serverIp: string, private serverPort: number, private password: string, public checkAgainTimeOut: number, 
+		public connectHostTimeOut: number, public useGatWay: boolean, public domainBlackList: string[] ) {
+		this.getGlobalIp ( this.gateway )
+		let socks = null
 		const server = Net.createServer ( socket => {
 			const ip = socket.remoteAddress
 			const isWhiteIp = this.whiteIpList.find ( n => { return n === ip }) ? true : false
@@ -483,18 +435,23 @@ export default class proxyServer {
                 */
 				switch ( data.readUInt8 ( 0 )) {
 					case 0x4:
+					socks = new Socks.sockt4 ( socket, data, this )
 						return console.log ( 'SOCK4 connect' )
 					case 0x5:
 						console.log ( 'socks5 connect' )
-						return new socket5 ( socket )
+						return socks = new Socks.socks5 ( socket, this )
 					default:
-						return httpProxy ( socket, data, useGatWay, this.hostGlobalIpV6 ? true : false, connectHostTimeOut, domainListPool, gateway, checkAgainTimeOut, domainBlackList )
+						return httpProxy ( socket, data, useGatWay, this.hostGlobalIpV6 ? true : false, connectHostTimeOut, domainListPool, this.gateway, checkAgainTimeOut, domainBlackList )
 				}
 			})
 
 			socket.on ( 'error', err => {
+					socks = null
 				console.log ( `[${ip}] socket.on error`, err.message )
 			})
+			socket.once ('end', () => {
+				socks = null
+			})
 		})
 
 		server.on ( 'error', err => {

app/public/scripts/home.js

@@ -604,7 +604,7 @@ const infoDefine = [
             GlobalIp: '本机互联网IP地址:',
             QTGateRegionERROR: ['发送连接请求Email到QTGate系统发生送信错误， 请检查您的IMAP账号的设定。',
                 ''],
-            GlobalIpInfo: '注意：当您按下【QTGate连结】时您会把您的本机互联网IP提供给QTGate系统，如果您不愿意，请选择【@QTGate】技术来使用QTGate服务！没有【@QTGate】选项是因为@QTGate只能对应的iCloud邮箱。',
+            GlobalIpInfo: '注意：当您按下【QTGate连结】时您会把您的本机互联网IP提供给QTGate系统，如果您不愿意，请选择【@QTGate】技术来使用QTGate服务！没有【@QTGate】选项是因为@QTGate技术只能对应iCloud邮箱。',
             sendConnectRequestMail: ['您的QTGate客户端没有和QTgate系统联机，客户端已向QTgate系统重新发出联机请求Email。和QTgate系统联机需要额外的时间，请耐心等待。',
                 '当免费用户连续24小时内没有使用客户端，您的连接会被中断。付费用户情况下QTgate系统可保持持续联机一个月。'],
             cacheDatePlaceDate: [{ name: '1小时', id: 1 }, { name: '12小时', id: 12 }, { name: '1日', id: 24 }, { name: '15日', id: 360 }, { name: '1月', id: 720 }, { name: '6月', id: 4320 }, { name: '永远', id: -1 }],

app/public/scripts/home.ts

@@ -662,7 +662,7 @@ const infoDefine = [
             GlobalIp: '本机互联网IP地址:',
             QTGateRegionERROR:['发送连接请求Email到QTGate系统发生送信错误， 请检查您的IMAP账号的设定。',
                                 ''],
-            GlobalIpInfo: '注意：当您按下【QTGate连结】时您会把您的本机互联网IP提供给QTGate系统，如果您不愿意，请选择【@QTGate】技术来使用QTGate服务！没有【@QTGate】选项是因为@QTGate只能对应的iCloud邮箱。',
+            GlobalIpInfo: '注意：当您按下【QTGate连结】时您会把您的本机互联网IP提供给QTGate系统，如果您不愿意，请选择【@QTGate】技术来使用QTGate服务！没有【@QTGate】选项是因为@QTGate技术只能对应iCloud邮箱。',
             sendConnectRequestMail: ['您的QTGate客户端没有和QTgate系统联机，客户端已向QTgate系统重新发出联机请求Email。和QTgate系统联机需要额外的时间，请耐心等待。',
                                      '当免费用户连续24小时内没有使用客户端，您的连接会被中断。付费用户情况下QTgate系统可保持持续联机一个月。'],
             cacheDatePlaceDate: [{ name:'1小时', id: 1 }, { name:'12小时', id: 12 },{ name:'1日', id: 24 }, { name:'15日', id: 360 }, { name:'1月', id: 720 }, { name:'6月', id: 4320 }, { name:'永远', id: -1 }],

app/qtGate_emailClient.ts

@@ -19,7 +19,7 @@ import * as Fs from 'fs'
 import * as Path from 'path'
 import * as Dns from 'dns'
 import * as Net from 'net'
-import socks5 from './socket5'
+//import socks5 from './socket5'
 import * as Crypto from 'crypto'
 import HttpProxyHeader from './httpProxy'
 import * as Rfc1928 from './rfc1928'
@@ -361,7 +361,7 @@ export default class imapProxyServer {
 						return console.log ( 'SOCK4 connect' )
 					case 0x5:
 						console.log ( 'socks5 connect' )
-						return new socks5 ( socket )
+						return //new socks5 ( socket )
 					default:
 						return httpImapProxy ( this.imapClass, socket, data, useGatWay, this.hostGlobalIpV6 ? true : false,  connectHostTimeOut,
 							domainListPool, checkAgainTimeOut, domainBlackList )

app/rfc1928.ts

@@ -151,7 +151,7 @@
               if ( this.ATYP !== ATYP.IP_V4 )
                   return
               const y = n.split ('.')
-              const ret = new Buffer ('00000000','hex')
+              const ret = new Buffer ( '00000000','hex' )
               for ( let i = 0; i < 4; i ++ ) {
                   const k = parseInt (y[i])
                   if ( !k || k < 0 || k > 255 )
@@ -171,4 +171,49 @@
 
 
       }
+
+      export class socket4Requests {
+        constructor ( public buffer: Buffer ) {}
+        public get socketVersion () {
+            return this.buffer.readUInt8 ( 0 )
+        }
+        public get IsSocket4 () {
+            return this.buffer.readUInt8 ( 0 ) === 0x04
+        }
+        public get cmd () {
+            return this.buffer.readUInt8 ( 1 )
+        }
+        public get port () {
+            return this.buffer.readUInt16BE ( 2 )
+        }
+        public get targetIp () {
+            const uu = `${ this.buffer.readUInt8 (4).toString() }.${ this.buffer.readUInt8 (5).toString() }.${ this.buffer.readUInt8 (6).toString() }.${ this.buffer.readUInt8 (7).toString() }`
+            if ( /^0.0.0/.test (uu))
+                return null
+            return uu
+        }
+        public get domainName () {
+            if ( ! this.targetIp ) {
+                return this.buffer.slice (9).toString ()
+            }
+            return null
+        }
+
+        public request_granted ( targetIp: string, targetPort: number) {
+            if ( !targetIp )
+                return Buffer.from ('005a0000000000','hex')
+            const ret = Buffer.from ('005a000000000000','hex')
+            ret.writeUInt16BE ( targetPort, 2 )
+            const u = targetIp.split ('.')
+            for ( let i = 4, l = 0; i < 8; i ++, l ++ ) {
+
+                ret.writeUInt8 ( parseInt (u[l]), i )
+            }
+            return ret
+        }
+        public get request_failed () {
+            return Buffer.from ('005b000000','hex')
+        }
+
+      }
 

app/server.js

@@ -34,7 +34,7 @@ const Express = require('express');
 const cookieParser = require('cookie-parser');
 const Uuid = require('node-uuid');
 const { remote } = require('electron');
-const DEBUG = false;
+const DEBUG = true;
 const QTGateFolder = Path.join(Os.homedir(), '.QTGate');
 const QTGateSignKeyID = /3acbe3cbd3c1caa9/i;
 const configPath = Path.join(QTGateFolder, 'config.json');
@@ -48,30 +48,6 @@ const QTGatePongReplyTime = 1000 * 30;
 let mainWindow = null;
 const createWindow = () => {
     remote.getCurrentWindow().createWindow();
-    /*
-    mainWindow = new remote.BrowserWindow ({
-        width: 850,
-        height: 480,
-        minWidth: 850,
-        minHeight: 480,
-        show: false,
-        backgroundColor: '#ffffff',
-        icon: process.platform === 'linux' ? Path.join ( __dirname, 'app/public/assets/images/512x512.png' ) : Path.join ( __dirname, 'app/qtgate.icns' )
-    })
-    
-    mainWindow.loadURL ( `http://127.0.0.1:${ port }/` )
-    if ( debug ) {
-        mainWindow.webContents.openDevTools()
-        mainWindow.maximize()
-    }
-    
-    mainWindow.once ( 'closed', () => {
-        mainWindow = null
-    })
-    mainWindow.once ('ready-to-show', () => {
-        mainWindow.show()
-    })
-    */
 };
 const _doUpdate = (tag) => {
     saveLog(`_doUpdate tag = [${tag}]`);