p59342861
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Agent: Catch timeout error in PBA base class

This commit is contained in:
Shreya Malviya 2022-04-01 12:04:59 +05:30
parent 4cc57f1236
commit 9ac4d23f28
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
monkey/infection_monkey/post_breach/pba.py
View File

@ -19,7 +19,12 @@ class PBA:
"""
def __init__(
self, telemetry_messenger: ITelemetryMessenger, name="unknown", linux_cmd="", windows_cmd="", timeout: int = LONG_REQUEST_TIMEOUT
self,
telemetry_messenger: ITelemetryMessenger,
name="unknown",
linux_cmd="",
windows_cmd="",
timeout: int = LONG_REQUEST_TIMEOUT,
):
"""
:param name: Name of post breach action.
@ -78,9 +83,10 @@ class PBA:
self.command, stderr=subprocess.STDOUT, shell=True, timeout=self.timeout
).decode()
return output, True
except subprocess.CalledProcessError as e:
# Return error output of the command
return e.output.decode(), False
except subprocess.CalledProcessError as err:
return err.output.decode(), False
except subprocess.TimeoutExpired as err:
return str(err), False
@staticmethod
def choose_command(linux_cmd, windows_cmd):