Fix merge conflicts with master

Author: argaudreau

app/objects/c_agent.py

@@ -1,6 +1,6 @@
 import re
 from base64 import b64decode
-from datetime import datetime
+from datetime import datetime, timezone
 from urllib.parse import urlparse
 
 import marshmallow as ma
@@ -113,7 +113,7 @@ def __init__(self, sleep_min=30, sleep_max=60, watchdog=0, platform='unknown', s
         self.pid = pid
         self.ppid = ppid
         self.trusted = trusted
-        self.created = datetime.now()
+        self.created = datetime.now(timezone.utc)
         self.last_seen = self.created
         self.last_trusted_seen = self.created
         self.executors = executors
@@ -189,7 +189,7 @@ async def get_preferred_executor(self, ability):
         return potential_executors[0]
 
     async def heartbeat_modification(self, **kwargs):
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
         self.last_seen = now
         if self.trusted:
             self.last_trusted_seen = now

app/objects/c_operation.py

@@ -5,7 +5,7 @@
 import uuid
 from collections import defaultdict
 from copy import deepcopy
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from importlib import import_module
 
@@ -145,7 +145,7 @@ def store(self, ram):
 
     def set_start_details(self):
         self.id = self.id if self.id else str(uuid.uuid4())
-        self.start = datetime.now()
+        self.start = datetime.now(timezone.utc)
 
     def add_link(self, link):
         self.chain.append(link)

app/objects/secondclass/c_fact.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 
 import marshmallow as ma
@@ -109,7 +109,7 @@ def __init__(self, trait, value=None, score=1, source=None, origin_type=None, li
         super().__init__()
         self.trait = trait
         self.value = value
-        self.created = datetime.now()
+        self.created = datetime.now(timezone.utc)
         self.score = score
         self.source = source
         self.origin_type = origin_type

app/objects/secondclass/c_link.py

@@ -2,7 +2,7 @@
 import logging
 import uuid
 from base64 import b64decode
-from datetime import datetime
+from datetime import datetime, timezone
 from importlib import import_module
 
 import marshmallow as ma
@@ -31,14 +31,14 @@ class Meta:
     status = ma.fields.Integer(missing=-3)
     score = ma.fields.Integer(missing=0)
     jitter = ma.fields.Integer(missing=0)
-    decide = ma.fields.DateTime(format='%Y-%m-%d %H:%M:%S')
+    decide = ma.fields.DateTime(format=BaseObject.TIME_FORMAT)
     pin = ma.fields.Integer(missing=0)
     pid = ma.fields.String()
     facts = ma.fields.List(ma.fields.Nested(FactSchema()))
     relationships = ma.fields.List(ma.fields.Nested(RelationshipSchema()))
     used = ma.fields.List(ma.fields.Nested(FactSchema()))
     unique = ma.fields.String()
-    collect = ma.fields.DateTime(format='%Y-%m-%d %H:%M:%S', default='')
+    collect = ma.fields.DateTime(format=BaseObject.TIME_FORMAT, default='')
     finish = ma.fields.String()
     ability = ma.fields.Nested(AbilitySchema())
     executor = ma.fields.Nested(ExecutorSchema())
@@ -47,7 +47,7 @@ class Meta:
     host = ma.fields.String(missing=None)
     output = ma.fields.String()
     deadman = ma.fields.Boolean()
-    agent_reported_time = ma.fields.DateTime(format='%Y-%m-%d %H:%M:%S', missing=None)
+    agent_reported_time = ma.fields.DateTime(format=BaseObject.TIME_FORMAT, missing=None)
 
     @ma.pre_load()
     def fix_ability(self, link, **_):
@@ -165,7 +165,7 @@ def __init__(self, command='', paw='', ability=None, executor=None, status=-3, s
         self.status = status
         self.score = score
         self.jitter = jitter
-        self.decide = datetime.now()
+        self.decide = datetime.now(timezone.utc)
         self.pid = None
         self.collect = None
         self.finish = None

app/objects/secondclass/c_result.py

@@ -8,7 +8,7 @@ class ResultSchema(ma.Schema):
     output = ma.fields.String()
     pid = ma.fields.String()
     status = ma.fields.String()
-    agent_reported_time = ma.fields.DateTime(format='%Y-%m-%d %H:%M:%S', missing=None)
+    agent_reported_time = ma.fields.DateTime(format=BaseObject.TIME_FORMAT, missing=None)
 
     @ma.post_load
     def build_result(self, data, **_):

app/service/app_svc.py

@@ -6,7 +6,7 @@
 import os
 import time
 from collections import namedtuple
-from datetime import datetime, date
+from datetime import datetime, timezone
 from importlib import import_module
 
 import aiohttp_jinja2
@@ -42,7 +42,7 @@ async def start_sniffer_untrusted_agents(self):
                 trusted_agents = await self.get_service('data_svc').locate('agents', match=dict(trusted=1))
                 next_check = self.get_config(name='agents', prop='untrusted_timer')
                 for a in trusted_agents:
-                    silence_time = (datetime.now() - a.last_trusted_seen).total_seconds()
+                    silence_time = (datetime.now(timezone.utc) - a.last_trusted_seen).total_seconds()
                     if silence_time > (self.get_config(name='agents', prop='untrusted_timer') + int(a.sleep_max)):
                         self.log.debug('Agent (%s) now untrusted. Last seen %s sec ago' % (a.paw, int(silence_time)))
                         a.trusted = 0
@@ -75,8 +75,9 @@ async def run_scheduler(self):
         while True:
             interval = 60
             for s in await self.get_service('data_svc').locate('schedules'):
-                now = datetime.now().time()
-                diff = datetime.combine(date.today(), now) - datetime.combine(date.today(), s.schedule)
+                now = datetime.now(timezone.utc).time()
+                today_utc = datetime.now(timezone.utc).date()
+                diff = datetime.combine(today_utc, now) - datetime.combine(today_utc, s.schedule)
                 if interval > diff.total_seconds() > 0:
                     self.log.debug('Pulling %s off the scheduler' % s.name)
                     sop = copy.deepcopy(s.task)

app/service/contact_svc.py

@@ -1,7 +1,7 @@
 import asyncio
 import re
 from collections import defaultdict
-from datetime import datetime
+from datetime import datetime, timezone
 from base64 import b64decode
 
 from app.objects.c_agent import Agent
@@ -162,7 +162,7 @@ async def _get_instructions(self, agent):
 
     @staticmethod
     def _convert_link_to_instruction(link):
-        link.collect = datetime.now()
+        link.collect = datetime.now(timezone.utc)
         payloads = [] if link.cleanup else link.executor.payloads
         uploads = [] if link.cleanup else link.executor.uploads
         return Instruction(id=link.unique,

app/service/event_svc.py

@@ -1,8 +1,9 @@
 import asyncio
-import datetime
 import json
 import websockets
 
+from datetime import datetime, timezone
+
 from app.service.interfaces.i_event_svc import EventServiceInterface
 from app.utility.base_service import BaseService
 
@@ -72,7 +73,7 @@ async def fire_event(self, exchange=None, queue=None, timestamp=True, **callback
         queue = queue or self.default_queue
         metadata = {}
         if timestamp:
-            metadata.update(dict(timestamp=datetime.datetime.now().timestamp()))
+            metadata.update(dict(timestamp=datetime.now(timezone.utc).timestamp()))
         callback_kwargs.update(dict(metadata=metadata))
         uri = '/'.join([self.ws_uri, exchange, queue])
         if self.global_listeners:

app/utility/base_world.py

@@ -6,7 +6,7 @@
 import subprocess
 import distutils.version
 from base64 import b64encode, b64decode
-from datetime import datetime
+from datetime import datetime, timezone
 from importlib import import_module
 from random import randint, choice
 from enum import Enum
@@ -23,7 +23,7 @@ class BaseWorld:
     _app_configuration = dict()
 
     re_base64 = re.compile('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', flags=re.DOTALL)
-    TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+    TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
 
     @staticmethod
     def apply_config(name, config):
@@ -80,7 +80,7 @@ def prepend_to_file(filename, line):
 
     @staticmethod
     def get_current_timestamp(date_format=TIME_FORMAT):
-        return datetime.now().strftime(date_format)
+        return datetime.now(timezone.utc).strftime(date_format)
 
     @staticmethod
     def get_timestamp_from_string(datetime_str, date_format=TIME_FORMAT):

static/css/core.css

@@ -37,6 +37,10 @@ body {
   border-radius: 50%;
 }
 
+.is-underlined {
+  text-decoration: underline;
+}
+
 main.main {
   min-height: 100%;
   width: 100%;
@@ -53,7 +57,12 @@ main.main {
   padding-bottom: 20px;
 }
 
-.menu-label {
+.menu-label.nav-header {
+  cursor: default;
+  background: none !important;
+  border-bottom: 2px solid #8B0000;
+  font-size: 0.75em;
+  letter-spacing: 0.1em;
   color: white !important;
   padding: 8px;
   border-radius: 4px;
@@ -109,10 +118,6 @@ main.main {
   background-color: #060606;
 }
 
-.nav-header {
-  cursor: default;
-}
-
 .nav-item.disabled {
   color: #a0a0a0;
 }