p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into feature/configuration_improvements

This commit is contained in:
VakarisZ 2020-07-24 11:25:06 +03:00
parent d049b88c99 53707436df
commit e8d210f001
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
monkey/infection_monkey/post_breach/actions/change_file_privileges.py
View File

@ -2,7 +2,6 @@ from common.data.post_breach_consts import POST_BREACH_SETUID_SETGID
from infection_monkey.post_breach.pba import PBA from infection_monkey.post_breach.pba import PBA
from infection_monkey.post_breach.setuid_setgid.setuid_setgid import \ from infection_monkey.post_breach.setuid_setgid.setuid_setgid import \
get_commands_to_change_setuid_setgid get_commands_to_change_setuid_setgid
from infection_monkey.utils.environment import is_windows_os
class ChangeSetuidSetgid(PBA): class ChangeSetuidSetgid(PBA):

1
monkey/infection_monkey/post_breach/actions/use_trap_command.py
View File

@ -2,7 +2,6 @@ from common.data.post_breach_consts import POST_BREACH_TRAP_COMMAND
from infection_monkey.post_breach.pba import PBA from infection_monkey.post_breach.pba import PBA
from infection_monkey.post_breach.trap_command.trap_command import \ from infection_monkey.post_breach.trap_command.trap_command import \
get_trap_commands get_trap_commands
from infection_monkey.utils.environment import is_windows_os
class TrapCommand(PBA): class TrapCommand(PBA):

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

@ -62,8 +62,10 @@ class PBA(Plugin):
exec_funct = self._execute_default exec_funct = self._execute_default
result = exec_funct() result = exec_funct()
if self.scripts_were_used_successfully(result): if self.scripts_were_used_successfully(result):
T1064Telem(ScanStatus.USED, "Scripts were used to execute %s post breach action." % self.name).send() T1064Telem(ScanStatus.USED, f"Scripts were used to execute {self.name} post breach action.").send()
PostBreachTelem(self, result).send() PostBreachTelem(self, result).send()
else:
LOG.debug(f"No command available for PBA '{self.name}' on current OS, skipping.")
def is_script(self): def is_script(self):
""" """

11
monkey/monkey_island/cc/ui/src/styles/components/Checkbox.scss
View File

@ -7,7 +7,8 @@ $black: #000000;
.ui-checkbox-btn { .ui-checkbox-btn {
position: relative; position: relative;
display: inline-block; display: flex;
align-items: center;
background-color: rgba(red, .6); background-color: rgba(red, .6);
text-align: center; text-align: center;
width: 100%; width: 100%;
@ -100,15 +101,13 @@ $black: #000000;
} }
.attack-matrix .ui-checkbox-btn label { .attack-matrix .ui-checkbox-btn label {
width:100%;
font-weight: 700; font-weight: 700;
padding-top: 0; padding-top: 0;
position: relative;
float: left;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
margin-bottom: 5px;
margin-top: 5px;
} }
.attack-matrix div.rt-td>div { .attack-matrix div.rt-td>div {