Fix unsync bugs when the shell terminates with raised privileges

JLChnToZ · Jan 2, 2019 · c519d79 · c519d79
1 parent f592e37
commit c519d79
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 47 deletions.
diff --git a/lib/terminals/uachost.js b/lib/terminals/uachost.js
diff --git a/lib/terminals/uachost.js.map b/lib/terminals/uachost.js.map
diff --git a/lib/terminals/uacwrapper.js b/lib/terminals/uacwrapper.js
diff --git a/lib/terminals/uacwrapper.js.map b/lib/terminals/uacwrapper.js.map
diff --git a/src/terminals/uachost.ts b/src/terminals/uachost.ts
@@ -26,8 +26,7 @@ export function connectToClient(path: string) {
   let flushRequested = false;
   const client = connectServer(joinPath('\\\\.\\pipe', path));
   client
-  .on('error', handleRemoteClose)
-  .on('close', handleRemoteClose)
+  .on('end', handleRemoteClose)
   .pipe(createDecodeStream())
   .on('data', handleRequest);
   const writer = createEncodeStream();
@@ -55,14 +54,12 @@ export function connectToClient(path: string) {
           break;
         case CMDType.Exit:
           if(!host) throw new Error('Host is not spawned.');
-          host.end();
-          host = undefined;
-          throw new Error('Host closed.');
+          host.destroy();
+          break;
         default: throw new Error('Invalid code');
       }
     } catch {
-      client.end();
-      process.exit();
+      client.destroy();
     }
   }
 
@@ -71,18 +68,16 @@ export function connectToClient(path: string) {
   }
 
   function handleClose(code?: number, signal?: number) {
+    if(host) host = undefined;
     writeAndFlush(CMDType.Exit, code || 0, signal || 0);
-    client.end();
-    process.exit();
   }
 
   function handleError(error: Error) {
     writeAndFlush(CMDType.Error, error.message);
   }
 
   function handleRemoteClose() {
-    if(host) host.end();
-    host = undefined;
+    if(host) host.destroy();
     process.exit();
   }