Merge pull request #16 from sinamics/dev

merge dev branch
sinamics · Jul 26, 2022 · c608f29 · c608f29
2 parents a25a314 + 0566137
commit c608f29
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/backend/src/resolvers/VpnResolver.ts b/backend/src/resolvers/VpnResolver.ts
@@ -33,7 +33,7 @@ export class VpnResolver {
   @Query(() => ZerotierNetworkResponse)
   async zerotierNetworks(): Promise<any> {
     try {
-      const listnetworks = await childProcessCmd({ cmd: 'sudo zerotier-cli -j listnetworks' });
+      const listnetworks = await childProcessCmd({ cmd: 'sudo zerotier-cli -j listnetworks', sensitiv: true });
       const networks = JSON.parse(listnetworks.toString('utf8'));
 
       // const peers = await childProcessCmd({ cmd: 'sudo zerotier-cli -j peers' });

diff --git a/backend/src/utils/childProcessCmd.ts b/backend/src/utils/childProcessCmd.ts
@@ -24,11 +24,23 @@ export const childProcessCmd = ({ cmd, args = [], sensitiv = false, options }: C
     // spawn commands
     const child = spawn(cmd, args, { cwd: path.join(process.cwd(), '..'), shell: true, ...options });
     child.stdout.on('data', async (data: any) => {
-      ServerLog.info({ message: data.toString(), data: `(command: ${cmd} ${args})`, path: __filename });
+      if (sensitiv) {
+        // log activity
+        ServerLog.info({ message: data.toString(), data: `Sensitiv information, logging skipped!`, path: __filename });
+      } else {
+        // log activity
+        ServerLog.info({ message: data.toString(), data: `(command: ${cmd} ${args})`, path: __filename });
+      }
       resolve(data);
     });
     child.stderr.on('data', async (error: any) => {
-      ServerLog.error({ message: error.toString(), data: `(command: ${cmd} ${args})`, path: __filename });
+      if (sensitiv) {
+        // log activity
+        ServerLog.error({ message: error.toString(), data: `Sensitiv information, logging skipped!`, path: __filename });
+      } else {
+        // log activity
+        ServerLog.error({ message: error.toString(), data: `(command: ${cmd} ${args})`, path: __filename });
+      }
       reject(error);
     });
     child.on('close', async () => {
@@ -63,7 +75,13 @@ export const childProcessCmdCallback = (
     });
   } else {
     child.stderr.on('data', async (error) => {
-      ServerLog.error({ message: error.toString(), data: cmd, path: __filename });
+      if (sensitiv) {
+        // log activity
+        ServerLog.error({ message: error.toString(), data: `Sensitiv information, logging skipped!`, path: __filename });
+      } else {
+        // log activity
+        ServerLog.error({ message: error.toString(), data: `(command: ${cmd} ${args})`, path: __filename });
+      }
       typeof callback === 'function' && callback({ response: null, error });
     });
     child.on('close', async (code: any) => {

diff --git a/frontend/src/pages/vpn/containers/zerotier.footer.tsx b/frontend/src/pages/vpn/containers/zerotier.footer.tsx
@@ -9,7 +9,7 @@ const ZerotierFooter = () => {
       <Button
         onClick={() =>
           kernelCommand({
-            variables: { cmd: 'sudo zerotier-cli info', path: '/' }
+            variables: { cmd: 'sudo zerotier-cli info', path: '/', sensitiv: true }
           })
         }
       >
@@ -18,7 +18,7 @@ const ZerotierFooter = () => {
       <Button
         onClick={() =>
           kernelCommand({
-            variables: { cmd: 'sudo zerotier-cli info -j', path: '/' }
+            variables: { cmd: 'sudo zerotier-cli info -j', path: '/', sensitiv: true }
           })
         }
       >
@@ -28,7 +28,7 @@ const ZerotierFooter = () => {
       <Button
         onClick={() =>
           kernelCommand({
-            variables: { cmd: 'sudo zerotier-cli peers', path: '/' }
+            variables: { cmd: 'sudo zerotier-cli peers', path: '/', sensitiv: true }
           })
         }
       >

diff --git a/frontend/src/pages/vpn/containers/zerotierTable.tsx b/frontend/src/pages/vpn/containers/zerotierTable.tsx
@@ -6,6 +6,7 @@ import { useZerotierNetworksQuery, useChildProcessCmdMutation, ZerotierNetworksD
 const ZerotierTable = () => {
   const [kernelCommand] = useChildProcessCmdMutation();
   const { data: { zerotierNetworks: { networks = [] } = {} } = {} }: any = useZerotierNetworksQuery({
+    fetchPolicy: 'network-only',
     pollInterval: 5000
   });
   return (