v3.3.0

CoNETProject · Feb 13, 2020 · e483b27 · e483b27
1 parent fa765b2
commit e483b27
Show file tree

Hide file tree

Showing 26 changed files with 491 additions and 766 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# CoNET Platform/CoNETプラットフォーム/CoNET平台
+# Kloak Platform/Kloakプラットフォーム/Kloak平台
 
 [![Build Status](https://travis-ci.org/QTGate/QTGate-Desktop-Client.svg?branch=master)](https://travis-ci.org/QTGate/QTGate-Desktop-Client)
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/QTGate/Lobby)

diff --git a/app/localWebServer.js b/app/localWebServer.js
@@ -76,11 +76,6 @@ const imapErrorCallBack = (message) => {
     }
     return -1;
 };
-class apiRequest {
-    constructor(req) {
-        this.req = req;
-    }
-}
 class localServer {
     constructor(cmdResponse, test) {
         this.cmdResponse = cmdResponse;
@@ -98,7 +93,7 @@ class localServer {
         this.sessionHashPool = [];
         this.Pbkdf2Password = null;
         this.nodeList = [{
-                email: '[email protected]',
+                email: '[email protected]',
                 keyID: '',
                 key: ''
             }];
@@ -138,6 +133,11 @@ class localServer {
         });
     }
     catchCmd(mail, uuid) {
+        if (!this.imapConnectData.sendToQTGate) {
+            this.imapConnectData.sendToQTGate = true;
+            Tool.saveEncryptoData(Tool.imapDataFileName1, this.imapConnectData, this.config, this.savedPasswrod, err => {
+            });
+        }
         console.log(`Get response from CoNET uuid [${uuid}] length [${mail.length}]`);
         const socket = this.requestPool.get(uuid);
         if (!socket) {
@@ -157,7 +157,7 @@ class localServer {
             this.CoNETConnectCalss = null;
         };
         const makeConnect = () => {
-            return this.CoNETConnectCalss = new coNETConnect_1.default(this.imapConnectData, this.socketServer, this.openPgpKeyOption, !this.imapConnectData.sendToQTGate, this.keyPair.publicKey, this.nodeList[0].email, (mail, uuid) => {
+            return this.CoNETConnectCalss = new coNETConnect_1.default(this.imapConnectData, this.socketServer, !this.imapConnectData.sendToQTGate, this.nodeList[0].email, this.openPgpKeyOption, this.keyPair.publicKey, (mail, uuid) => {
                 return this.catchCmd(mail, uuid);
             }, _exitFunction);
         };
@@ -203,8 +203,9 @@ class localServer {
             const _callBack = (...data) => {
                 socket.emit(uuid, ...data);
             };
-            saveLog(`socket on tryConnectCoNET!`);
+            console.log(`socket on tryConnectCoNET!\n\n`);
             if (!this.imapConnectData) {
+                console.log(`socket.on ( 'tryConnectCoNET') !this.imapConnectData \n\n `);
                 return _callBack('systemError');
             }
             if (!this.imapConnectData.confirmRisk) {
@@ -235,6 +236,7 @@ class localServer {
                 socket.emit(uuid, ...data);
             };
             const key = Buffer.from(text, 'base64').toString();
+            console.log(`checkActiveEmailSubmit`, key);
             if (key && key.length) {
                 console.log(`active key success! \n[${key}]`);
                 this.keyPair.publicKey = this.config.keypair.publicKey = key;
@@ -260,6 +262,7 @@ class localServer {
                 socket.emit(_uuid, ...data);
             };
             this.requestPool.set(uuid, socket);
+            console.log(`on doingRequest uuid = [${uuid}]\n${request}\n`);
             if (this.CoNETConnectCalss) {
                 saveLog(`doingRequest on ${uuid}`);
                 return this.CoNETConnectCalss.requestCoNET_v1(uuid, request, _callBack);
@@ -377,11 +380,9 @@ class localServer {
             const uuid = Uuid.v4();
             CallBack1(uuid);
             this.sessionHashPool.push(sessionHash = Crypto.randomBytes(10).toString('hex'));
-            const passwordFail = (err) => {
-                if (err) {
-                    return socket.emit(uuid, null, err);
-                }
-                return socket.emit(uuid, null, err, this.Pbkdf2Password, sessionHash);
+            const passwordFail = (imap) => {
+                //onsole.log (`passwordFail this.Pbkdf2Password = [${ this.Pbkdf2Password }]`)
+                return socket.emit(uuid, null, imap, this.Pbkdf2Password, sessionHash);
             };
             if (!this.config.keypair || !this.config.keypair.publicKey) {
                 console.log(`checkPemPassword !this.config.keypair`);
@@ -396,6 +397,7 @@ class localServer {
                     console.log(`savedPasswrod !== password `);
                     return passwordFail(true);
                 }
+                this.listenAfterPassword(socket, sessionHash);
                 return passwordFail(this.imapConnectData);
             }
             return Async.waterfall([
@@ -411,35 +413,36 @@ class localServer {
                         saveLog(`[${clientName}] on checkPemPassword had try password! [${password}]`);
                         return passwordFail(true);
                     }
+                    //console.log (`checkPemPassword this.Pbkdf2Password = [${ this.Pbkdf2Password}]`)
                     this.savedPasswrod = password;
                     this.keyPair = key;
                     clientObj.listenAfterPasswd = clientObj.login = true;
                     this.localConnected.set(clientName, clientObj);
                     return Tool.makeGpgKeyOption(this.config, this.savedPasswrod, next);
                 },
                 (option_KeyOption, next) => {
-                    //console.log (`checkPemPassword Tool.makeGpgKeyOption success!`)
+                    console.log(`checkPemPassword Tool.makeGpgKeyOption success!`);
                     this.openPgpKeyOption = option_KeyOption;
                     return Tool.readEncryptoFile(Tool.imapDataFileName1, password, this.config, next);
                 }
             ], (err, data) => {
-                //console.log (`checkPemPassword Async.waterfall success!`)
+                console.log(`checkPemPassword Async.waterfall success!`);
                 if (err) {
                     if (!(err.message && /no such file/i.test(err.message))) {
-                        passwordFail(null);
+                        passwordFail(err);
                         return saveLog(`Tool.makeGpgKeyOption return err [${err && err.message ? err.message : null}]`);
                     }
                 }
                 // console.log (`this.sessionHashPool.push!\n${ this.sessionHashPool }\n${ this.sessionHashPool.length }`)
                 this.listenAfterPassword(socket, sessionHash);
                 try {
                     this.imapConnectData = JSON.parse(data);
-                    this.localConnected.set(clientName, clientObj);
-                    return passwordFail(this.imapConnectData);
                 }
                 catch (ex) {
-                    return passwordFail(null);
+                    return passwordFail(ex);
                 }
+                this.localConnected.set(clientName, clientObj);
+                return passwordFail(this.imapConnectData);
             });
         });
         socket.on('deleteKeyPairNext', CallBack1 => {

diff --git a/app/localWebServer.ts b/app/localWebServer.ts
@@ -95,11 +95,6 @@ const imapErrorCallBack = ( message: string ) => {
 
 }
 
-class apiRequest {
-	constructor ( private req ) {
-
-	}
-}
 
 export default class localServer {
 	private expressServer = Express()
@@ -116,7 +111,7 @@ export default class localServer {
 	private sessionHashPool = []
 	private Pbkdf2Password = null
 	private nodeList = [{
-		email: '[email protected]',
+		email: '[email protected]',
 		keyID:'',
 		key: ''
 	}]
@@ -125,7 +120,13 @@ export default class localServer {
 
 
 	private catchCmd ( mail: string, uuid: string ) {
-		console.log (`Get response from CoNET uuid [${ uuid }] length [${ mail.length }]`)
+		if ( !this.imapConnectData.sendToQTGate ) {
+			this.imapConnectData.sendToQTGate = true
+			Tool.saveEncryptoData (  Tool.imapDataFileName1, this.imapConnectData, this.config, this.savedPasswrod, err => {
+
+			})
+		}
+		console.log ( `Get response from CoNET uuid [${ uuid }] length [${ mail.length }]`)
 		const socket = this.requestPool.get ( uuid )
 		if ( !socket ) {
 			return console.log (`Get cmd that have no matched socket \n\n`, mail )
@@ -151,8 +152,8 @@ export default class localServer {
 
 		const makeConnect = () => {
 
-			return this.CoNETConnectCalss = new CoNETConnectCalss ( this.imapConnectData, this.socketServer, this.openPgpKeyOption, !this.imapConnectData.sendToQTGate,
-				this.keyPair.publicKey, this.nodeList[0].email, ( mail, uuid ) => {
+			return this.CoNETConnectCalss = new CoNETConnectCalss ( this.imapConnectData, this.socketServer, !this.imapConnectData.sendToQTGate, this.nodeList[0].email,
+				this.openPgpKeyOption, this.keyPair.publicKey, ( mail, uuid ) => {
 				return this.catchCmd ( mail, uuid )
 			}, _exitFunction )
 
@@ -207,9 +208,10 @@ export default class localServer {
 			const _callBack = ( ...data ) => {
 				socket.emit ( uuid, ...data )
 			}
-			saveLog (`socket on tryConnectCoNET!`)
+			console.log (`socket on tryConnectCoNET!\n\n`)
 			if ( !this.imapConnectData ) {
-				return _callBack ('systemError')
+				console.log (`socket.on ( 'tryConnectCoNET') !this.imapConnectData \n\n `)
+				return _callBack ( 'systemError' )
 
 			}
 			if ( !this.imapConnectData.confirmRisk ) {
@@ -243,19 +245,21 @@ export default class localServer {
 		socket.on ( 'checkActiveEmailSubmit', ( text, CallBack1 ) => {
 			const uuid = Uuid.v4()
 			CallBack1( uuid )
-
+			
 			const _callBack = ( ...data ) => {
 				socket.emit ( uuid, ...data )
 			}
+
 			const key = Buffer.from ( text, 'base64' ).toString ()
+			console.log (`checkActiveEmailSubmit`, key )
 			if ( key && key.length ) {
 				console.log ( `active key success! \n[${ key }]`)
 
 				this.keyPair.publicKey = this.config.keypair.publicKey = key
 				this.keyPair.verified = this.config.keypair.verified = true
 				this.imapConnectData.sendToQTGate = true
 				_callBack ()
-				Tool.saveEncryptoData (  Tool.imapDataFileName1, this.imapConnectData, this.config, this.savedPasswrod, err => {
+				Tool.saveEncryptoData ( Tool.imapDataFileName1, this.imapConnectData, this.config, this.savedPasswrod, err => {
 					if ( err ) {
 						saveLog (`Tool.saveConfig return Error: [${ err.message }]`)
 					}
@@ -269,6 +273,7 @@ export default class localServer {
 				})
 
 			}
+
 		})
 
 		socket.on ( 'doingRequest', ( uuid, request, CallBack1 ) => {
@@ -280,6 +285,8 @@ export default class localServer {
 			}
 			this.requestPool.set ( uuid, socket )
 
+			console.log (`on doingRequest uuid = [${ uuid }]\n${ request }\n`)
+
 			if ( this.CoNETConnectCalss ) {
 				saveLog (`doingRequest on ${ uuid }`)
 				return this.CoNETConnectCalss.requestCoNET_v1 ( uuid, request, _callBack )
@@ -419,33 +426,36 @@ export default class localServer {
 		})
 
 		socket.on ( 'checkPemPassword', ( password: string, CallBack1 ) => {
+
 			const uuid = Uuid.v4()
 			CallBack1 ( uuid )
+
 			this.sessionHashPool.push ( sessionHash = Crypto.randomBytes ( 10 ).toString ('hex'))
 
-			const passwordFail = ( err ) => {
-				if ( err ) {
-					return socket.emit ( uuid, null, err )
-				}
-				return socket.emit ( uuid, null, err, this.Pbkdf2Password, sessionHash )
+			const passwordFail = ( imap ) => {
+
+				//onsole.log (`passwordFail this.Pbkdf2Password = [${ this.Pbkdf2Password }]`)
+				return socket.emit ( uuid, null, imap, this.Pbkdf2Password, sessionHash )
 
 			}
 
 			if ( !this.config.keypair || !this.config.keypair.publicKey ) {
 				console.log ( `checkPemPassword !this.config.keypair` )
-
 				return passwordFail ( true )
 			}
+
 			if ( !password || password.length < 5 ) {
 				console.log (`! password `)
 				return passwordFail ( true )
 			}
+
 			if ( this.savedPasswrod && this.savedPasswrod.length ) {
 				if ( this.savedPasswrod !== password ) {
 					console.log ( `savedPasswrod !== password `)
 					return passwordFail ( true )
 				}
 
+				this.listenAfterPassword ( socket, sessionHash )
 				return passwordFail ( this.imapConnectData )
 
 
@@ -455,6 +465,7 @@ export default class localServer {
 				next => Tool.getPbkdf2 ( this.config, password, next ),
 				( Pbkdf2Password: Buffer, next ) => {
 					this.Pbkdf2Password = Pbkdf2Password.toString ( 'hex' )
+
 					Tool.getKeyPairInfo ( this.config.keypair.publicKey, this.config.keypair.privateKey, this.Pbkdf2Password, next )
 				},
 				( key, next ) => {
@@ -464,39 +475,41 @@ export default class localServer {
 						saveLog ( `[${ clientName }] on checkPemPassword had try password! [${ password }]` )
 						return passwordFail ( true )
 					}
+					//console.log (`checkPemPassword this.Pbkdf2Password = [${ this.Pbkdf2Password}]`)
 					this.savedPasswrod = password
 
 					this.keyPair = key
-					clientObj.listenAfterPasswd = clientObj.login= true
+					clientObj.listenAfterPasswd = clientObj.login = true
 					this.localConnected.set ( clientName, clientObj )
 					return Tool.makeGpgKeyOption ( this.config, this.savedPasswrod, next )
 				},
 				( option_KeyOption, next ) => {
-					//console.log (`checkPemPassword Tool.makeGpgKeyOption success!`)
+					console.log (`checkPemPassword Tool.makeGpgKeyOption success!`)
 					this.openPgpKeyOption = option_KeyOption
 
 					return Tool.readEncryptoFile ( Tool.imapDataFileName1, password, this.config, next )
 			}], ( err: Error, data: string ) => {
-				//console.log (`checkPemPassword Async.waterfall success!`)
+				console.log (`checkPemPassword Async.waterfall success!`)
 				if ( err ) {
 					if ( !( err.message && /no such file/i.test( err.message ))) {
-						passwordFail ( null )
+						passwordFail ( err )
 						return saveLog ( `Tool.makeGpgKeyOption return err [${ err && err.message ? err.message : null }]` )
 					}
 				}
 
 
 				// console.log (`this.sessionHashPool.push!\n${ this.sessionHashPool }\n${ this.sessionHashPool.length }`)
 				this.listenAfterPassword ( socket, sessionHash )
+
 				try {
 					this.imapConnectData = JSON.parse ( data )
-					this.localConnected.set ( clientName, clientObj )
 
-					return passwordFail ( this.imapConnectData )
 				} catch ( ex ) {
-					return passwordFail ( null )
+					return passwordFail ( ex )
 				}
-
+				this.localConnected.set ( clientName, clientObj )
+
+				return passwordFail ( this.imapConnectData )
 			})
 
 		})