p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into attack_configuration

This commit is contained in:
VakarisZ 2019-05-06 15:25:51 +03:00
parent c3aa316c07 576af97a82
commit ae074c6914
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/infection_monkey/exploit/sshexec.py
View File

@ -84,7 +84,7 @@ class SSHExploiter(HostExploiter):
self.report_login_attempt(True, user, curpass)
break
except Exception as exc:
except paramiko.AuthenticationException as exc:
LOG.debug("Error logging into victim %r with user"
" %s and password '%s': (%s)", self.host,
user, curpass, exc)

14
monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
View File

@ -404,15 +404,17 @@ class ReportPageComponent extends AuthComponent {
generateReportRecommendationsSection() {
return (
<div id="recommendations">
<h3>
Domain related recommendations
</h3>
{/* Checks if there are any domain issues. If there are more then one: render the title. Otherwise,
* don't render it (since the issues themselves will be empty. */}
{Object.keys(this.state.report.recommendations.domain_issues).length !== 0 ?
<h3>Domain related recommendations</h3> : null }
<div>
{this.generateIssues(this.state.report.recommendations.domain_issues)}
</div>
<h3>
Machine related Recommendations
</h3>
{/* Checks if there are any issues. If there are more then one: render the title. Otherwise,
* don't render it (since the issues themselves will be empty. */}
{Object.keys(this.state.report.recommendations.issues).length !== 0 ?
<h3>Machine related recommendations</h3> : null }
<div>
{this.generateIssues(this.state.report.recommendations.issues)}
</div>