Merge pull request #2187 from mitre/origin-link-id-update

Origin link ID storage fix

Author: uruwhy

app/objects/c_agent.py

@@ -37,7 +37,7 @@ class AgentFieldsSchema(ma.Schema):
     proxy_receivers = ma.fields.Dict(keys=ma.fields.String(), values=ma.fields.List(ma.fields.String()),
                                      allow_none=True)
     proxy_chain = ma.fields.List(ma.fields.List(ma.fields.String()), allow_none=True)
-    origin_link_id = ma.fields.Integer()
+    origin_link_id = ma.fields.String()
     deadman_enabled = ma.fields.Boolean(allow_none=True)
     available_contacts = ma.fields.List(ma.fields.String(), allow_none=True)
     host_ip_addrs = ma.fields.List(ma.fields.String(), allow_none=True)
@@ -98,7 +98,7 @@ def is_global_variable(cls, variable):
     def __init__(self, sleep_min=30, sleep_max=60, watchdog=0, platform='unknown', server='unknown', host='unknown',
                  username='unknown', architecture='unknown', group='red', location='unknown', pid=0, ppid=0,
                  trusted=True, executors=(), privilege='User', exe_name='unknown', contact='unknown', paw=None,
-                 proxy_receivers=None, proxy_chain=None, origin_link_id=0, deadman_enabled=False,
+                 proxy_receivers=None, proxy_chain=None, origin_link_id='', deadman_enabled=False,
                  available_contacts=None, host_ip_addrs=None, upstream_dest=None, pending_contact=None):
         super().__init__()
         self.paw = paw if paw else self.generate_name(size=6)

tests/api/v2/handlers/test_agents_api.py

@@ -57,7 +57,7 @@ def new_agent_payload():
         'contact': 'HTTP',
         'proxy_receivers': {},
         'proxy_chain': [],
-        'origin_link_id': 0,
+        'origin_link_id': '',
         'deadman_enabled': True,
         'available_contacts': ['HTTP'],
         'host_ip_addrs': []

tests/services/test_rest_svc.py

@@ -86,7 +86,7 @@ def test_delete_operation(self, loop, rest_svc, data_svc):
                                               'host': 'unknown', 'paw': '123', 'pid': 0,
                                               'display_name': 'unknown$unknown', 'group': 'red', 'location': 'unknown',
                                               'privilege': 'User', 'proxy_receivers': {}, 'proxy_chain': [],
-                                              'origin_link_id': 0, 'deadman_enabled': False,
+                                              'origin_link_id': '', 'deadman_enabled': False,
                                               'available_contacts': ['unknown'], 'pending_contact': 'unknown',
                                               'host_ip_addrs': [], 'upstream_dest': '://None:None'}],
                               'visibility': 50, 'autonomous': 1, 'chain': [], 'auto_close': False,
@@ -161,7 +161,7 @@ def test_create_operation(self, loop, rest_svc, data_svc):
                      'executors': ['pwsh', 'psh'], 'ppid': 0, 'sleep_min': 2, 'server': '://None:None',
                      'platform': 'windows', 'host': 'unknown', 'paw': '123', 'pid': 0,
                      'display_name': 'unknown$unknown', 'group': 'red', 'location': 'unknown', 'privilege': 'User',
-                     'proxy_receivers': {}, 'proxy_chain': [], 'origin_link_id': 0,
+                     'proxy_receivers': {}, 'proxy_chain': [], 'origin_link_id': '',
                      'deadman_enabled': False, 'available_contacts': ['unknown'], 'pending_contact': 'unknown',
                      'host_ip_addrs': [], 'upstream_dest': '://None:None'}],
                 'visibility': 50, 'autonomous': 1, 'chain': [], 'auto_close': False, 'objective': '',