v0.8.72

Author: Peter Xie

app/proxyServer.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-/// <reference path="../typings/types/v7/index.d.ts" />
 import * as Net from 'net'
 import * as Http from 'http'
 import * as Dns from 'dns'
@@ -77,26 +76,6 @@ export const checkDomainInBlackList = ( BlackLisk: string[], domain: string, Cal
 	})
 }
 
-const otherRespon = ( path: string, host: string, port: number, UserAgent: string ) => {
-	
-	const option = {
-		host: host,
-		port: port,
-		path: '/' + path,
-		method: 'GET',
-		headers: {
-			//'Upgrade-Insecure-Requests': 1,
-			Host: host + ':' + port,
-			'Accept': '*/*',
-			'Accept-Language': 'en-US',
-			'Connection': 'keep-alive',
-			'Accept-Encoding': 'gzip, deflate',
-			'User-Agent': UserAgent || 'Mozilla/5.0',
-		}
-	}
-	return option
-}
-
 const testLogin = ( req: Buffer, loginUserList: string ) => {
 
 	const header = new HttpProxyHeader ( req )
@@ -437,7 +416,7 @@ export class proxyServer {
 				if ( /^GET \/pac/.test ( dataStr )) {
 					const httpHead = new HttpProxyHeader ( data )
 					agent = httpHead.headers['user-agent']
-					const sock5 = /Windows NT|Darwin|Firefox/i.test ( agent ) && ! /CFNetwork|WOW64/i.test ( agent )
+					const sock5 = /Firefox/i.test (agent) || /Windows NT|Darwin|Firefox/i.test ( agent ) && ! /CFNetwork|WOW64/i.test ( agent )
 
 
 					const ret = getPac ( httpHead.host, this.port, /pacHttp/.test( dataStr ), sock5 )
@@ -461,7 +440,7 @@ export class proxyServer {
 					socks = null
 				console.log ( `[${ip}] socket.on error`, err.message )
 			})
-			socket.once ('end', () => {
+			socket.once ( 'end', () => {
 				socks = null
 			})
 		})

app/public/scripts/home.js

@@ -26,6 +26,8 @@ import * as Rfc1928 from './rfc1928'
 import * as res from './res'
 import * as Async from 'async'
 import * as imapClass from './imapClass'
+import * as Socks from './socket5ForiAtOpn'
+import { Socket } from 'net';
 const { remote } = require ( "electron" )
 
 interface dnsAddress {
@@ -34,10 +36,6 @@ interface dnsAddress {
 	expire: Date
 	connect: number[]
 }
-interface domainData {
-	dns: dnsAddress[]
-	expire: number
-}
 
 const whiteIpFile = 'whiteIpList.json'
 const testGatewayDomainName = 'www.google.com'
@@ -67,25 +65,35 @@ const closeClientSocket = ( socket: Net.Socket, status: number, body: string ) =
 	return socket.resume ()
 }
 
-const isAllBlackedByFireWall = ( hostName: string, ip6: boolean, checkAgainTime: number, imapClass: imapClass.imapClientControl, domainListPool: Map < string, domainData >,
+export const isAllBlackedByFireWall = ( hostName: string, ip6: boolean, checkAgainTime: number, imapClass: imapClass.imapClientControl, domainListPool: Map < string, domainData >,
 	CallBack: ( err?: Error, hostIp?: domainData ) => void ) => {
 
 	const hostIp = domainListPool.get ( hostName )
 	const now = new Date ().getTime ()
+
 	if ( ! hostIp || hostIp.expire < now ) {
-		console.log (`imapClass.nslookupRequest [${ hostName }]`)
+		console.log ( `imapClass.nslookupRequest [${ hostName }]`)
 		return imapClass.nslookupRequest ( hostName, ( err, ipadd ) => {
-			if ( err )
+			if ( err ) {
+				CallBack ( err )
 				return console.log ( `imapClass.nslookupRequest callback err `, err )
-			return CallBack ( err, ipadd )
+			}
+				
+			try {
+				const ret = JSON.parse ( ipadd.toString())
+				return CallBack ( null, ret )
+			} catch ( ex ) {
+				return CallBack ( ex )
+			}
+			
 		})
 	}
 
 
 	return CallBack ( null, hostIp )
 }
 
-const checkDomainInBlackList = ( domainBlackList: string[], domain: string, CallBack ) => {
+export const checkDomainInBlackList = ( domainBlackList: string[], domain: string, CallBack ) => {
 
 	if ( Net.isIP ( domain )) {
 		return CallBack ( null, domainBlackList.find ( n => { return n === domain }) ? true : false )
@@ -185,7 +193,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 ) {
@@ -302,7 +310,23 @@ const httpImapProxy = ( imapClass: imapClass.imapClientControl, clientSocket: Ne
 	})
 
 }
-
+const getPac = ( hostIp: string, port: number, http: boolean, sock5: boolean ) => {
+	
+		const FindProxyForURL = `function FindProxyForURL ( url, host )
+		{
+			if ( isInNet ( dnsResolve( host ), "0.0.0.0", "255.0.0.0") ||
+			isInNet( dnsResolve( host ), "172.16.0.0", "255.240.255.0") ||
+			isInNet( dnsResolve( host ), "127.0.0.0", "255.255.255.0") ||
+			isInNet ( dnsResolve( host ), "192.168.0.0", "255.255.0.0" ) ||
+			isInNet ( dnsResolve( host ), "10.0.0.0", "255.0.0.0" )) {
+				return "DIRECT";
+			}
+			return "${ http ? 'PROXY': ( sock5 ? 'SOCKS5' : 'SOCKS' ) } ${ hostIp }:${ port.toString() }";
+		
+		}`
+		//return "${ http ? 'PROXY': ( sock5 ? 'SOCKS5' : 'SOCKS' ) } ${ hostIp }:${ port.toString() }; ";
+		return res.Http_Pac ( FindProxyForURL )
+	}
 export default class imapProxyServer {
 
 	private hostLocalIpv4: { network: string, address: string } []= []
@@ -311,7 +335,7 @@ export default class imapProxyServer {
 	private hostGlobalIpV6: string = null
 	private network = false
 	private getGlobalIpRunning = false
-	private imapClass = new imapClass.imapClientControl ( this.imapData )
+	public imapClass = new imapClass.imapClientControl ( this.imapData )
 
 	private saveWhiteIpList () {
 		if ( this.whiteIpList.length > 0 )
@@ -334,15 +358,29 @@ export default class imapProxyServer {
 		return _HTTP_200 ( FindProxyForURL )
 	}
 	*/
-	constructor ( private whiteIpList: string[], private domainListPool: Map < string, domainData >, 
-		private port: number, private securityPath: string, private checkAgainTimeOut: number, private imapData: IinputData,
-		private connectHostTimeOut: number, useGatWay: boolean, domainBlackList: string[] ) {
+	constructor ( private whiteIpList: string[], public domainListPool: Map < string, domainData >, 
+		private port: number, private securityPath: string, public checkAgainTimeOut: number, private imapData: IinputData,
+		public connectHostTimeOut: number, public useGatWay: boolean, public domainBlackList: string[] ) {
 
 		const server = Net.createServer ( socket => {
 			const ip = socket.remoteAddress
 			const isWhiteIp = this.whiteIpList.find ( n => { return n === ip }) ? true : false
-			
+			let socks = null
+			let agent = null
 			socket.once ( 'data', ( data: Buffer ) => {
+				const dataStr = data.toString()
+				if ( /^GET \/pac/.test ( dataStr )) {
+					const httpHead = new HttpProxyHeader ( data )
+					agent = httpHead.headers['user-agent']
+					const sock5 = /Firefox/i.test (agent) || /Windows NT|Darwin|Firefox/i.test ( agent ) && ! /CFNetwork|WOW64/i.test ( agent )
+					
+					
+					const ret = getPac ( httpHead.host, this.port, /pacHttp/.test( dataStr ), sock5 )
+					console.log ( `/GET \/pac from :[${ socket.remoteAddress }] sock5 [${ sock5 }] agent [${ agent }] httpHead.headers [${ Object.keys(httpHead.headers)}]`)
+					console.log ( dataStr )
+					console.log ( ret )
+					return socket.end ( ret )
+				}
 				/*
 				if ( ! isWhiteIp ) {
 					console.log ('! isWhiteIp', data.toString ('utf8'))
@@ -357,14 +395,21 @@ export default class imapProxyServer {
 				}
 				*/
 				switch ( data.readUInt8 ( 0 )) {
-					case 0x4:
-						return console.log ( 'SOCK4 connect' )
-					case 0x5:
+					case 0x4: {
+						console.log ( 'SOCK4 connect' )
+						return socks = new Socks.sockt4 ( socket, data, agent, this )
+					}
+						
+					case 0x5: {
 						console.log ( 'socks5 connect' )
-						return //new socks5 ( socket )
-					default:
+						return socks = new Socks.socks5 ( socket, agent, this )
+					}
+
+					default: {
 						return httpImapProxy ( this.imapClass, socket, data, useGatWay, this.hostGlobalIpV6 ? true : false,  connectHostTimeOut,
 							domainListPool, checkAgainTimeOut, domainBlackList )
+					}
+						
 				}
 			})
 

app/public/scripts/home.ts

@@ -21,7 +21,6 @@ const Path = require("path");
 const Os = require("os");
 const Http = require("http");
 const Fs = require("fs");
-const url_1 = require("url");
 const Async = require("async");
 const Util = require("util");
 const Https = require("https");
@@ -44,6 +43,7 @@ const ErrorLogFile = Path.join(QTGateFolder, 'systemError.log');
 const feedbackFilePath = Path.join(QTGateFolder, '.feedBack.json');
 const imapDataFileName = Path.join(QTGateFolder, 'imapData.pem');
 const sendMailAttach = Path.join(QTGateFolder, 'sendmail');
+const myIpServerUrl = ['https://ipinfo.io/ip', 'https://icanhazip.com/', 'https://diagnostic.opendns.com/myip', 'http://ipecho.net/plain', 'https://www.trackip.net/ip'];
 const keyServer = 'https://pgp.mit.edu';
 const QTGatePongReplyTime = 1000 * 30;
 let mainWindow = null;
@@ -88,9 +88,10 @@ const findPort = (port, CallBack) => {
 };
 const doUrlWithIp = (url, dns, CallBack) => {
     let ret = '';
-    const option = new url_1.URL(url);
-    option.hostname = null;
-    option.host = dns;
+    const option = {
+        host: dns,
+        path: url,
+    };
     const res = res => {
         res.on('data', (data) => {
             ret += data.toString('utf8');
@@ -102,14 +103,35 @@ const doUrlWithIp = (url, dns, CallBack) => {
     if (/^https/i.test(option.protocol))
         return Https.request(option, res)
             .once('error', CallBack);
-    return Http.get(option, res)
+    return Http.request(option, res)
         .once('error', CallBack);
 };
-const getMyLocalIpAddress = (server, CallBack) => {
-    saveLog(JSON.stringify(server));
+const doUrl = (url, CallBack) => {
+    let ret = '';
+    const res = res => {
+        res.on('data', (data) => {
+            ret += data.toString('utf8');
+        });
+        res.once('end', () => {
+            return CallBack(null, ret);
+        });
+    };
+    if (/^https/.test(url))
+        return Https.get(url, res)
+            .once('error', err => {
+            console.log('on err ', err);
+            return CallBack(err);
+        });
+    return Http.get(url, res)
+        .once('error', err => {
+        console.log('on err ', err);
+        return CallBack(err);
+    });
+};
+const myIpServer = (CallBack) => {
     let ret = false;
-    Async.each(server, (n, next) => {
-        doUrlWithIp(n.url, n.dnsName, (err, data) => {
+    Async.each(myIpServerUrl, (n, next) => {
+        doUrl(n, (err, data) => {
             if (err || !Net.isIPv4(data)) {
                 return next();
             }
@@ -119,8 +141,7 @@ const getMyLocalIpAddress = (server, CallBack) => {
             }
         });
     }, () => {
-        if (!ret)
-            return CallBack(new Error('no IP'));
+        return CallBack(new Error(''));
     });
 };
 const getQTGateSign = (_key) => {
@@ -381,7 +402,6 @@ class localServer {
         this.proxyServerWindow = null;
         this.connectCommand = null;
         this.proxyServer = null;
-        this.myIpServer = null;
         this.ex_app = Express();
         this.ex_app.set('views', Path.join(__dirname, 'views'));
         this.ex_app.set('view engine', 'pug');
@@ -581,6 +601,7 @@ class localServer {
                     return CallBack(10);
                 }
             }
+            CallBack(null);
             return this.doingCheck(id, imapData, socket);
         });
         socket.on('deleteImapAccount', uuid => {
@@ -607,7 +628,6 @@ class localServer {
             return this.QTClass.request(com, (err, res) => {
                 saveLog(JSON.stringify(res.Args));
                 CallBack(res.Args[0]);
-                this.myIpServer = res.myIpServer;
                 saveLog(`getAvaliableRegion ${JSON.stringify(res)} `);
                 //		Have gateway connect!
                 if (res.Args[1]) {
@@ -659,7 +679,7 @@ class localServer {
                         this.config.keypair.publicKey = key;
                         this.config.keypair.verified = getQTGateSign(key);
                         this.saveConfig();
-                        socket.emit('newKeyPairCallBack', this.config.keypair);
+                        socket.emit('KeyPairActiveCallBack', this.config.keypair);
                         this.qtGateConnectEmitData.qtGateConnecting = 2;
                         this.qtGateConnectEmitData.error = -1;
                         return socket.emit('qtGateConnect', this.qtGateConnectEmitData);
@@ -714,7 +734,7 @@ class localServer {
                 });
             };
             if (cmd.connectType === 2) {
-                return getMyLocalIpAddress(this.myIpServer, (err, data) => {
+                return myIpServer((err, data) => {
                     saveLog(`getMyLocalIpAddress callback err [${JSON.stringify(err)}] data [${JSON.stringify(data)}]`);
                     cmd.imapData.clientIpAddress = data;
                     saveLog(JSON.stringify(cmd));
@@ -903,6 +923,7 @@ class localServer {
                 }
                 return this.emitQTGateToClient(socket, null);
             }
+            saveLog('checkPemPassword');
             return Async.waterfall([
                 (next) => {
                     return this.getPbkdf2(password, next);
@@ -1209,12 +1230,12 @@ class localServer {
         if (!imapData.imapCheck || !imapData.smtpCheck || !imapData.imapTestResult)
             return saveLog(` emitQTGateToClient STOP with !imapData.imapCheck || !imapData.smtpCheck || !imapData.imapTestResult`);
         const ret = {
-            qtgateConnectImapAccount: this.config.QTGateConnectImapUuid,
+            qtgateConnectImapAccount: imapData.uuid,
             qtGateConnecting: !imapData.sendToQTGate ? 0 : 1,
             isKeypairQtgateConform: this.config.keypair.verified,
             error: null
         };
-        saveLog(`doConnect!`);
+        saveLog(`doConnect! ret = [${JSON.stringify(ret)}]\n imapData.uuid= [${imapData.uuid}]`);
         const doConnect = () => {
             if (!this.imapDataPool.length)
                 return;
@@ -1253,12 +1274,13 @@ class localServer {
         doConnect();
     }
     doingCheck(id, _imapData, socket) {
-        saveLog(`doingCheck`);
+        saveLog(`doingCheck id = [${id}] UUID [${_imapData.uuid}]`);
         const imapData = this.imapDataPool[this.addInImapData(_imapData)];
         imapData.imapCheck = imapData.smtpCheck = false;
         imapData.imapTestResult = 0;
         this.saveImapData();
         return this.imapTest(imapData, (err, code) => {
+            saveLog(`imapTest finished! [${id}]`);
             socket.emit(id + '-imap', err ? err : null, code);
             imapData.imapTestResult = code;
             imapData.imapCheck = code > 0;
@@ -1269,6 +1291,7 @@ class localServer {
                 socket.emit(id + '-smtp', err1 ? err1 : null);
                 imapData.smtpCheck = !err1;
                 this.saveImapData();
+                saveLog(`smtpVerify finished! [${id}]`);
                 if (err1)
                     return;
                 this.emitQTGateToClient(socket, _imapData.uuid);