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

Jump to bottom

Fix command modal for manual commands #2668

Merged
merged 4 commits into from
Oct 10, 2022
Merged

Fix command modal for manual commands #2668

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
f3692ed
Bump lxml version
argaudreau Sep 13, 2022
4afb5f6
Merge branch 'master' of github.com:mitre/caldera
argaudreau Sep 19, 2022
c6edba6
Fix command display modal for manual commands
argaudreau Oct 4, 2022
476502c
Merge branch 'master' into manual-command-cmd-display
clenk Oct 7, 2022
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
2 changes: 1 addition & 1 deletion app/api/v2/managers/operation_api_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ async def create_potential_link(self, operation_id: str, data: dict, access: Bas
file_svc=self.services['file_svc']))
executor = self.build_executor(data=data.pop('executor', {}), agent=agent)
ability = self.build_ability(data=data.pop('ability', {}), executor=executor)
link = Link.load(dict(command=encoded_command, paw=agent.paw, ability=ability, executor=executor,
link = Link.load(dict(command=encoded_command, plaintext_command=encoded_command, paw=agent.paw, ability=ability, executor=executor,
status=operation.link_status(), score=data.get('score', 0), jitter=data.get('jitter', 0),
cleanup=data.get('cleanup', 0), pin=data.get('pin', 0),
host=agent.host, deadman=data.get('deadman', False), used=data.get('used', []),
Expand Down
1 change: 0 additions & 1 deletion app/objects/secondclass/c_link.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ def is_valid_status(self, status):
def replace_origin_link_id(self):
decoded_cmd = self.decode_bytes(self.command)
self.command = self.encode_string(decoded_cmd.replace(self.RESERVED['origin_link_id'], self.id))
self.plaintext_command = decoded_cmd

def _emit_status_change_event(self, from_status, to_status):
event_svc = BaseService.get_service('event_svc')
Expand Down