Updating timestamp to UTC and updating timestamp format

Author: uruwhy

app/h_terminal.py

@@ -1,6 +1,8 @@
 import json
 
-from datetime import datetime
+from datetime import datetime, timezone
+
+from app.utility.base_world import BaseWorld
 
 
 class Handle:
@@ -14,8 +16,8 @@ async def run(socket, path, services):
         cmd = await socket.recv()
         handler = services.get('term_svc').socket_conn.tcp_handler
         paw = next(i.paw for i in handler.sessions if i.id == int(session_id))
-        services.get('contact_svc').report['websocket'].append(
-            dict(paw=paw, date=datetime.now().strftime('%Y-%m-%d %H:%M:%S'), cmd=cmd)
+        services.get('contact_svc').report['WEBSOCKET'].append(
+            dict(paw=paw, date=datetime.now(timezone.utc).strftime(BaseWorld.TIME_FORMAT), cmd=cmd)
         )
         status, pwd, reply, response_time = await handler.send(session_id, cmd)
         await socket.send(json.dumps(dict(response=reply.strip(), pwd=pwd, status=status, response_time=response_time)))

shells/commands/commands.go

@@ -24,11 +24,11 @@ func RunCommand(message string, httpServer string, profile map[string]interface{
     } else if (strings.HasPrefix(message, "download")) {
         pieces := strings.Split(message, "download")
         go download(httpServer, pieces[1])
-        return []byte("Download initiated\n"), 0, time.Now()
+        return []byte("Download initiated\n"), 0, getUTCTimeStamp()
     } else if (strings.HasPrefix(message, "upload")) {
         pieces := strings.Split(message, "upload")
         go upload(httpServer, pieces[1])
-        return []byte("Upload initiated\n"), 0, time.Now()
+        return []byte("Upload initiated\n"), 0, getUTCTimeStamp()
     } else {
         bites, status, executionTimestamp := execute(message, strings.Split(reflect.ValueOf(profile["executors"]).String(), ",")[0])
         return bites, status, executionTimestamp
@@ -42,26 +42,26 @@ func execute(command string, executor string) ([]byte, int, time.Time) {
     var executionTimestamp time.Time
     if runtime.GOOS == "windows" {
         if executor == "cmd" {
-            executionTimestamp = time.Now()
+            executionTimestamp = getUTCTimeStamp()
             bites, error = exec.Command("cmd.exe", "/c", command).Output()
         } else {
-            executionTimestamp = time.Now()
+            executionTimestamp = getUTCTimeStamp()
             bites, error = exec.Command("powershell.exe", "-ExecutionPolicy", "Bypass", "-C", command).Output()
         }
     } else {
-        executionTimestamp = time.Now()
+        executionTimestamp = getUTCTimeStamp()
         bites, error = exec.Command("sh", "-c", command).Output()
     }
     if error != nil {
-        executionTimestamp = time.Now()
+        executionTimestamp = getUTCTimeStamp()
         bites = []byte(string(error.Error()))
         status = 1
 	}
 	return []byte(fmt.Sprintf("%s%s", bites, "\n")), status, executionTimestamp
 }
 
 func changeDirectory(target string) ([]byte, time.Time) {
-    executionTimestamp := time.Now()
+    executionTimestamp := getUTCTimeStamp()
     os.Chdir(strings.TrimSpace(target))
     return []byte(" "), executionTimestamp
 }
@@ -120,3 +120,7 @@ func upload(server string, file string) []byte {
     resp.Body.Close()
     return []byte(" ")
 }
+
+func getUTCTimeStamp() time.Time {
+	return time.Now().UTC()
+}