Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Origin link ID storage fix #2187

Merged
merged 4 commits into from
Oct 18, 2021
Merged

Origin link ID storage fix #2187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64db2a6
Change origin link ID storage type from int to string to match UUID l…
uruwhy Jun 25, 2021
e27ddfd
Test update for new origin link ID format
uruwhy Jun 25, 2021
adb1c48
Merge branch 'master' into origin-link-id-update
uruwhy Oct 13, 2021
b4628bf
Fix test
uruwhy Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/objects/c_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/api/v2/handlers/test_agents_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': []
Expand Down
4 changes: 2 additions & 2 deletions tests/services/test_rest_svc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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': '',
Expand Down