{this.props.data.status === ScanStatus.USED ?
{this.props.data.status === ScanStatus.USED ?
{output}
);
@@ -21,12 +21,23 @@ class T1018 extends React.Component {
static getScanInfoColumns() {
return ([{
columns: [
- {Header: 'Machine', id: 'machine', accessor: x => renderMachineFromSystemData(x.monkey), style: { 'whiteSpace': 'unset' }},
- {Header: 'First scan', id: 'started', accessor: x => x.started, style: { 'whiteSpace': 'unset' }},
- {Header: 'Last scan', id: 'finished', accessor: x => x.finished, style: { 'whiteSpace': 'unset' }},
- {Header: 'Systems found', id: 'systems', accessor: x => T1018.renderMachines(x.machines), style: { 'whiteSpace': 'unset' }},
- ]
- }])};
+ {
+ Header: 'Machine',
+ id: 'machine',
+ accessor: x => renderMachineFromSystemData(x.monkey),
+ style: {'whiteSpace': 'unset'}
+ },
+ {Header: 'First scan', id: 'started', accessor: x => x.started, style: {'whiteSpace': 'unset'}},
+ {Header: 'Last scan', id: 'finished', accessor: x => x.finished, style: {'whiteSpace': 'unset'}},
+ {
+ Header: 'Systems found',
+ id: 'systems',
+ accessor: x => T1018.renderMachines(x.machines),
+ style: {'whiteSpace': 'unset'}
+ },
+ ]
+ }])
+ };
render() {
return (
@@ -35,10 +46,10 @@ class T1018 extends React.Component {
{this.props.data.status === ScanStatus.USED ?
{cred}
)}
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1035.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1035.js
index 7345ca497..b95b6bb45 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1035.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1035.js
@@ -1,7 +1,7 @@
import React from 'react';
import '../../../styles/Collapse.scss'
import ReactTable from "react-table";
-import { getUsageColumns } from "./Helpers"
+import {getUsageColumns} from "./Helpers"
class T1035 extends React.Component {
@@ -17,10 +17,10 @@ class T1035 extends React.Component {
{this.props.data.services.length !== 0 ?
{this.props.data.status === ScanStatus.USED ?
{this.props.data.status === ScanStatus.USED ?
{this.props.data.scripts.length !== 0 ?
{this.props.data.status === ScanStatus.USED ?
{this.props.data.status === ScanStatus.USED ?
{this.props.data.status === ScanStatus.USED ?
{this.props.data.status === ScanStatus.USED ?
{this.props.data.status !== ScanStatus.UNSCANNED ?
{this.props.data.api_uses.length !== 0 ?
{this.props.data.deleted_files.length !== 0 ?
{cred}
)}
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1129.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1129.js
index 64db13f81..cd19be877 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1129.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1129.js
@@ -16,10 +16,10 @@ class T1129 extends React.Component {
{this.props.data.dlls.length !== 0 ?
- SSH key pair used by {keyInfo['name']} user found in {keyInfo['home_dir']}
)
+ keys.forEach(function (keyInfo) {
+ output.push(
+ SSH key pair used by {keyInfo['name']} user found in {keyInfo['home_dir']}
)
});
return ({output}
);
}
@@ -22,16 +22,21 @@ class T1145 extends React.Component {
static getKeysInfoColumns() {
return ([{
columns: [
- {Header: 'Machine',
+ {
+ Header: 'Machine',
id: 'machine',
accessor: x => renderMachineFromSystemData(x.machine),
- style: { 'whiteSpace': 'unset' }},
- {Header: 'Keys found',
+ style: {'whiteSpace': 'unset'}
+ },
+ {
+ Header: 'Keys found',
id: 'keys',
accessor: x => T1145.renderSSHKeys(x.ssh_info),
- style: { 'whiteSpace': 'unset' }},
- ]
- }])};
+ style: {'whiteSpace': 'unset'}
+ },
+ ]
+ }])
+ };
render() {
return (
@@ -40,10 +45,10 @@ class T1145 extends React.Component {
{this.props.data.status === ScanStatus.USED ?
{this.props.data.status === ScanStatus.USED ?
{this.props.data.status === ScanStatus.USED ?
Warning
- - You have unsubmitted changes. Submit them before proceeding. -
-
-
-
-
+ Warning
+
+ + You have unsubmitted changes. Submit them before proceeding. +
+
+
+
+
- {this.renderBasicNetworkWarning()}
-
-
)
+ {this.renderBasicNetworkWarning()}
+
+ )
};
renderRunningMonkeysWarning = () => {
return (
- { this.state.allMonkeysAreDead ?
- '' :
-
)
+ {this.state.allMonkeysAreDead ?
+ '' :
+
-
- Some monkeys are currently running. Note that changing the configuration will only apply to new
- infections.
-
- }
-
+
+ Some monkeys are currently running. Note that changing the configuration will only apply to new
+ infections.
+
+ }
+ )
};
renderBasicNetworkWarning = () => {
- if (this.state.selectedSection === 'basic_network'){
+ if (this.state.selectedSection === 'basic_network') {
return (
-
- The Monkey scans its subnet if "Local network scan" is ticked. Additionally the monkey scans machines
- according to its range class.
-
)
+
+ The Monkey scans its subnet if "Local network scan" is ticked. Additionally the monkey scans machines
+ according to its range class.
+ )
} else {
- return ()
+ return ()
}
};
@@ -480,8 +498,8 @@ class ConfigurePageComponent extends AuthComponent {
return ()
+ {this.state.sections.map(section => Monkey Configuration
{this.renderNav()} - { this.renderRunningMonkeysWarning()} - { content } + {this.renderRunningMonkeysWarning()} + {content}
-
+
- { this.state.lastAction === 'reset' ?
+ {this.state.lastAction === 'reset' ?
+
);
}
generateAttackSection() {
return (
Configuration reset successfully.
: ''}
- { this.state.lastAction === 'saved' ?
+ {this.state.lastAction === 'saved' ?
Configuration saved successfully.
: ''}
- { this.state.lastAction === 'import_failure' ?
+ {this.state.lastAction === 'import_failure' ?
Failed importing configuration. Invalid config file.
: ''}
- { this.state.lastAction === 'invalid_configuration' ?
+ {this.state.lastAction === 'invalid_configuration' ?
An invalid configuration file was imported or submitted.
: ''}
- { this.state.lastAction === 'import_success' ?
+ {this.state.lastAction === 'import_success' ?
Configuration imported successfully.
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/LicensePage.js b/monkey/monkey_island/cc/ui/src/components/pages/LicensePage.js
index b7a2ec077..3abd1682c 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/LicensePage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/LicensePage.js
@@ -18,8 +18,8 @@ class LicensePageComponent extends React.Component {
- { this.state.report.overview.cross_segment_issues.length > 0 ?
+ {this.state.report.overview.cross_segment_issues.length > 0 ?
Segmentation Issues
@@ -380,14 +386,14 @@ class ReportPageComponent extends AuthComponent {
{/* 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 ?
-
);
@@ -463,33 +469,35 @@ class ReportPageComponent extends AuthComponent {
Credentials Map
License
- Copyright 2017 Guardicore Ltd.
-
+ Copyright 2017 Guardicore Ltd.
+
Licensed under GPLv3.
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js b/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
index f9d1f4a83..adb91b908 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
@@ -54,7 +54,7 @@ class MapPageComponent extends AuthComponent {
};
updateTelemetryFromServer = () => {
- this.authFetch('/api/telemetry-feed?timestamp='+this.state.telemetryLastTimestamp)
+ this.authFetch('/api/telemetry-feed?timestamp=' + this.state.telemetryLastTimestamp)
.then(res => res.json())
.then(res => {
if ('telemetries' in res) {
@@ -75,8 +75,7 @@ class MapPageComponent extends AuthComponent {
this.authFetch('/api/netmap/node?id=' + event.nodes[0])
.then(res => res.json())
.then(res => this.setState({selected: res, selectedType: 'node'}));
- }
- else if (event.edges.length === 1) {
+ } else if (event.edges.length === 1) {
let displayedEdge = this.state.graph.edges.find(
function (edge) {
return edge['id'] === event.edges[0];
@@ -88,8 +87,7 @@ class MapPageComponent extends AuthComponent {
.then(res => res.json())
.then(res => this.setState({selected: res.edge, selectedType: 'edge'}));
}
- }
- else {
+ } else {
this.setState({selected: null, selectedType: null});
}
}
@@ -104,7 +102,9 @@ class MapPageComponent extends AuthComponent {
return (
This might take a few moments...
+ Are you sure you want to kill all monkeys?
+
Are you sure you want to kill all monkeys?
+
Legend:
- Exploit
+ Exploit
|
- Scan
+ Scan
|
- Tunnel
+ Tunnel
|
- Island Communication
+ Island Communication
- { this.renderTelemetryConsole() }
+ {this.renderTelemetryConsole()}
@@ -178,7 +178,8 @@ class MapPageComponent extends AuthComponent {
Monkey
Telemetry
-
}
Segmentation Issues
@@ -380,14 +386,14 @@ class ReportPageComponent extends AuthComponent {
{/* 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 ?
- Domain related recommendations
: null }
+ Domain related recommendations
: null}
{this.generateIssues(this.state.report.recommendations.domain_issues)}
{/* 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 ?
- Machine related recommendations
: null }
+ Machine related recommendations
: null}
{this.generateIssues(this.state.report.recommendations.issues)}
@@ -444,13 +450,13 @@ class ReportPageComponent extends AuthComponent {
- {this.generateReportPthMap()}
+ {this.generateReportPthMap()}
-
- This map visualizes possible attack paths through the network using credential compromise. Paths represent lateral movement opportunities by attackers. + This map visualizes possible attack paths through the network using credential compromise. Paths represent lateral + movement opportunities by attackers.
Legend:
- Access credentials |
+ Access credentials |
-
- +
-
-
)
+ - ATT&CK report -
-- This report shows information about ATT&CK techniques used by Infection Monkey. -
-
-
-
- -
+ ATT&CK report +
++ This report shows information about ATT&CK techniques used by Infection Monkey. +
+
+
+
+ + ) } generateReportFooter() { @@ -510,22 +518,22 @@ class ReportPageComponent extends AuthComponent { generateCrossSegmentIssue(crossSegmentIssue) { return
-
- {crossSegmentIssue['issues'].map(x =>
- x['is_self'] ?
-
- - {'Machine ' + x['hostname'] + ' has both ips: ' + x['source'] + ' and ' + x['target']} - - : -
- - {'IP ' + x['source'] + ' (' + x['hostname'] + ') connected to IP ' + x['target'] - + ' using the services: ' + Object.keys(x['services']).join(', ')} - - )} -
-
+ {crossSegmentIssue['issues'].map(x =>
+ x['is_self'] ?
+
- + {'Machine ' + x['hostname'] + ' has both ips: ' + x['source'] + ' and ' + x['target']} + + : +
- + {'IP ' + x['source'] + ' (' + x['hostname'] + ') connected to IP ' + x['target'] + + ' using the services: ' + Object.keys(x['services']).join(', ')} + + )} +
- The Monkey authenticated over the SSH protocol with private key {issue.ssh_key}. -
+ The Monkey authenticated over the SSH protocol with private key {issue.ssh_key}. +
The attack was made possible because the VSFTPD server was not patched against CVE-2011-2523. -
In July 2011, it was discovered that vsftpd version 2.3.4 downloadable from the master site had been compromised. - Users logging into a compromised vsftpd-2.3.4 server may issue a ":)" smileyface as the username and gain a command shell on port 6200. +
In July 2011, it was discovered that vsftpd version 2.3.4 downloadable from the master site had been + compromised. + Users logging into a compromised vsftpd-2.3.4 server may issue a ":)" smileyface as the username and gain a command + shell on port 6200.
- The Monkey executed commands by first logging in with ":)" in the username and then sending commands to the backdoor at port 6200. + The Monkey executed commands by first logging in with ":)" in the username and then sending commands to the backdoor + at port 6200.
Read more about the security issue and remediation here. + href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-2523" + >here.
The attack was made possible because the server is using an old version of Jakarta based file upload Multipart parser. For possible work-arounds and more info read here. + href="https://cwiki.apache.org/confluence/display/WW/S2-045" + >here.
The attack was made possible because the target machine used an outdated MSSQL server configuration allowing the usage of the xp_cmdshell command. To learn more about how to disable this feature, read - Microsoft's documentation. + href="https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/xp-cmdshell-server-configuration-option?view=sql-server-2017"> + Microsoft's documentation.
-
@@ -323,7 +334,7 @@ class RunMonkeyPageComponent extends AuthComponent { style={{'marginBottom': '2em'}}> {this.state.ips.map(ip =>Copy the following command to your machine and run it with Administrator or root privileges. @@ -344,7 +355,7 @@ class RunMonkeyPageComponent extends AuthComponent { />
- : null + : null } { this.state.isOnAws ? @@ -357,7 +368,8 @@ class RunMonkeyPageComponent extends AuthComponent { { this.state.isOnAws ?-
@@ -370,9 +382,12 @@ class RunMonkeyPageComponent extends AuthComponent {
- Error while collecting AWS machine data. Error message: {this.state.awsMachineCollectionErrorMsg}
+ Error while collecting AWS machine data. Error
+ message: {this.state.awsMachineCollectionErrorMsg}
Are you sure you've set the correct role on your Island AWS machine?
- Not sure what this is? Read the documentation!
+ Not sure what this is? Read
+ the documentation!
Reset environment
+
+ Reset environment
+
Are you sure you want to reset the environment?
@@ -40,7 +42,7 @@ class StartOverPageComponent extends AuthComponent { Some monkeys are still running. It's advised to kill all monkeys before resetting. : - + }
@@ -86,7 +89,7 @@ class StartOverPageComponent extends AuthComponent {
You can continue and Run More Monkeys as you wish,
and see the results on the Infection Map without deleting anything.
- { this.state.cleaned ?
+ {this.state.cleaned ?
Environment was reset successfully
@@ -106,8 +109,8 @@ class StartOverPageComponent extends AuthComponent {
.then(res => {
if (res['status'] === 'OK') {
this.setState({
- cleaned: true
- });
+ cleaned: true
+ });
}
});
}
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js b/monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js
index 120344eea..27fb50cd0 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js
@@ -5,14 +5,14 @@ import {DataTable} from 'react-data-components';
import AuthComponent from '../AuthComponent';
import download from 'downloadjs'
-const renderJson = (val) => ;
const renderTime = (val) => val.split('.')[0];
const columns = [
- { title: 'Time', prop: 'timestamp', render: renderTime},
- { title: 'Monkey', prop: 'monkey'},
- { title: 'Type', prop: 'telem_catagory'},
- { title: 'Details', prop: 'data', render: renderJson, width: '40%' }
+ {title: 'Time', prop: 'timestamp', render: renderTime},
+ {title: 'Monkey', prop: 'monkey'},
+ {title: 'Type', prop: 'telem_catagory'},
+ {title: 'Details', prop: 'data', render: renderJson, width: '40%'}
];
class TelemetryPageComponent extends AuthComponent {
@@ -29,7 +29,7 @@ class TelemetryPageComponent extends AuthComponent {
.then(res => this.setState({data: res.objects}));
};
-downloadIslandLog = () => {
+ downloadIslandLog = () => {
this.authFetch('/api/log/island/download')
.then(res => res.json())
.then(res => {
@@ -37,39 +37,39 @@ downloadIslandLog = () => {
let logContent = (res['log_file']);
download(logContent, filename, 'text/plain');
});
- };
+ };
render() {
return (
-
);
}
}
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/common/PaginatedTable.js b/monkey/monkey_island/cc/ui/src/components/report-components/common/PaginatedTable.js
index 5bc6183fd..c5300f657 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/common/PaginatedTable.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/common/PaginatedTable.js
@@ -18,8 +18,7 @@ class PaginatedTable extends Component {
/>
);
- }
- else {
+ } else {
return (
);
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/AttackReport.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/AttackReport.js
index 13f9cd92e..92dac6cff 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/security/AttackReport.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/security/AttackReport.js
@@ -100,9 +100,9 @@ class AttackReportPageComponent extends AuthComponent {
}
onToggle = technique =>
- this.setState(state => ({ collapseOpen: state.collapseOpen === technique ? null : technique }));
+ this.setState(state => ({collapseOpen: state.collapseOpen === technique ? null : technique}));
- getComponentClass(tech_id){
+ getComponentClass(tech_id) {
switch (this.state.report[tech_id].status) {
case ScanStatus.SCANNED:
return 'collapse-info';
@@ -113,9 +113,9 @@ class AttackReportPageComponent extends AuthComponent {
}
}
- getTechniqueCollapse(tech_id){
+ getTechniqueCollapse(tech_id) {
return (
-
-
- Log
-
-
-
-
-
- Monkey Island Logs
-
-
Download Monkey Island internal log file
-
+
@@ -146,23 +146,23 @@ class AttackReportPageComponent extends AuthComponent {
}
renderLegend() {
- return(
-
-
+ ;
}
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
index a7f2fe41c..2f56c7a76 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
@@ -20,9 +20,11 @@ export default class EventsModal extends Component {
-
+
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js
index b7fb90811..e124b6659 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsTimeline.js
@@ -22,8 +22,8 @@ export default class EventsTimeline extends Component {
key={index}
createdAt={event_time}
title={event.title}
- icon={
}>
- {event.message}
+ icon={}>
+ {event.message}
)
})
}
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarLabel.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarLabel.js
index 51c5ca380..2eb839504 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarLabel.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarLabel.js
@@ -15,7 +15,8 @@ const pillarToIcon = {
export default class PillarLabel extends Component {
render() {
const className = "label " + statusToLabelType[this.props.status];
- return ;
},
maxWidth: MAX_WIDTH_STATUS_COLUMN
},
- { Header: 'Zero Trust Principle', accessor: 'principle',
+ {
+ Header: 'Zero Trust Principle', accessor: 'principle',
style: {'whiteSpace': 'unset'} // This enables word wrap
},
- { Header: 'Monkey Tests', id: 'tests',
+ {
+ Header: 'Monkey Tests', id: 'tests',
style: {'whiteSpace': 'unset'}, // This enables word wrap
accessor: x => {
- return ;
}
}
]
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js
index 5ef75f2b4..0820fe3a6 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js
@@ -13,7 +13,7 @@ class ZeroTrustReportLegend extends Component {
-
@@ -32,7 +32,8 @@ class ZeroTrustReportLegend extends Component {
- {"\t"}At least one of the tests related to this component failed. This means that the Infection Monkey detected an unmet Zero Trust requirement.
+ {"\t"}At least one of the tests related to this component failed. This means that the Infection Monkey detected an
+ unmet Zero Trust requirement.
-
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/StatusesToPillarsSummary.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/StatusesToPillarsSummary.js
index d34a484b9..0002ba9e0 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/StatusesToPillarsSummary.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/StatusesToPillarsSummary.js
@@ -21,11 +21,11 @@ export default class StatusesToPillarsSummary extends Component {
14cbedff-3eed-4f8f-abb7-fffe92867ded
-
-
-
diff --git a/monkey/monkey_island/cc/ui/src/images/monkey-icon.svg b/monkey/monkey_island/cc/ui/src/images/monkey-icon.svg
index 837610f28..5e91edec1 100644
--- a/monkey/monkey_island/cc/ui/src/images/monkey-icon.svg
+++ b/monkey/monkey_island/cc/ui/src/images/monkey-icon.svg
@@ -2,7 +2,7 @@
@@ -10,8 +10,11 @@
diff --git a/monkey/monkey_island/cc/ui/src/images/zerotrust/im-alert-machine-icon.svg b/monkey/monkey_island/cc/ui/src/images/zerotrust/im-alert-machine-icon.svg
index 507541be4..341223590 100644
--- a/monkey/monkey_island/cc/ui/src/images/zerotrust/im-alert-machine-icon.svg
+++ b/monkey/monkey_island/cc/ui/src/images/zerotrust/im-alert-machine-icon.svg
@@ -1 +1,13 @@
-
\ No newline at end of file
+
diff --git a/monkey/monkey_island/cc/ui/src/images/zerotrust/im-alert-network-icon.svg b/monkey/monkey_island/cc/ui/src/images/zerotrust/im-alert-network-icon.svg
index 50dcc6726..0951d7ae2 100644
--- a/monkey/monkey_island/cc/ui/src/images/zerotrust/im-alert-network-icon.svg
+++ b/monkey/monkey_island/cc/ui/src/images/zerotrust/im-alert-network-icon.svg
@@ -1 +1,23 @@
-
\ No newline at end of file
+
diff --git a/monkey/monkey_island/cc/ui/src/index.html b/monkey/monkey_island/cc/ui/src/index.html
index 3e7028fc1..38b0c114d 100644
--- a/monkey/monkey_island/cc/ui/src/index.html
+++ b/monkey/monkey_island/cc/ui/src/index.html
@@ -8,6 +8,6 @@
-
+
-
)
+ return (
+
)
}
- generateReportContent(){
+ generateReportContent() {
let content = [];
Object.keys(this.state.report).forEach((tech_id) => {
content.push(this.getTechniqueCollapse(tech_id))
@@ -177,15 +177,14 @@ class AttackReportPageComponent extends AuthComponent {
render() {
let content;
- if (! this.state.runStarted)
- {
+ if (!this.state.runStarted) {
content =
You have to run a monkey before generating a report!
; - } else if (this.state.report === false){ - content = (Generating Report...
); + } else if (this.state.report === false) { + content = (Generating Report...
); } else if (Object.keys(this.state.report).length === 0) { if (this.state.runStarted) { content = (No techniques were scanned
); @@ -193,7 +192,7 @@ class AttackReportPageComponent extends AuthComponent { } else { content = this.generateReportContent(); } - return ( {content}
);
+ return ( {content}
);
}
}
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/BreachedServers.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/BreachedServers.js
index 16f445ce9..b1dc64f62 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/security/BreachedServers.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/security/BreachedServers.js
@@ -1,7 +1,7 @@
import React from 'react';
import ReactTable from 'react-table'
-let renderArray = function(val) {
+let renderArray = function (val) {
return {val.map(x =>
;
};
@@ -14,10 +14,12 @@ const columns = [
Header: 'Breached Servers',
columns: [
{Header: 'Machine', accessor: 'label'},
- {Header: 'IP Addresses', id: 'ip_addresses',
- accessor: x => renderIpAddresses(x)},
+ {
+ Header: 'IP Addresses', id: 'ip_addresses',
+ accessor: x => renderIpAddresses(x)
+ },
{Header: 'Exploits', id: 'exploits', accessor: x => renderArray(x.exploits)}
- ]
+ ]
}
];
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreach.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreach.js
index ea39e3c45..ebbc473f8 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreach.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreach.js
@@ -1,7 +1,7 @@
import React from 'react';
import ReactTable from 'react-table'
-let renderArray = function(val) {
+let renderArray = function (val) {
return {val.map(x => {x})};
};
@@ -15,36 +15,36 @@ let renderMachine = function (data) {
let renderPbaResults = function (results) {
let pbaClass = "";
- if (results[1]){
- pbaClass="pba-success"
+ if (results[1]) {
+ pbaClass = "pba-success"
} else {
- pbaClass="pba-danger"
+ pbaClass = "pba-danger"
}
return {x}
)} {results[0]}
};
const subColumns = [
- {id: 'pba_name', Header: "Name", accessor: x => x.name, style: { 'whiteSpace': 'unset' }, width: 160},
- {id: 'pba_output', Header: "Output", accessor: x => renderPbaResults(x.result), style: { 'whiteSpace': 'unset' }}
+ {id: 'pba_name', Header: "Name", accessor: x => x.name, style: {'whiteSpace': 'unset'}, width: 160},
+ {id: 'pba_output', Header: "Output", accessor: x => renderPbaResults(x.result), style: {'whiteSpace': 'unset'}}
];
let renderDetails = function (data) {
let defaultPageSize = data.length > pageSize ? pageSize : data.length;
let showPagination = data.length > pageSize;
return {val.map(x =>
;
};
@@ -13,11 +13,13 @@ const columns = [
{
Header: 'Scanned Servers',
columns: [
- { Header: 'Machine', accessor: 'label'},
- { Header: 'IP Addresses', id: 'ip_addresses',
- accessor: x => renderIpAddresses(x)},
- { Header: 'Accessible From', id: 'accessible_from_nodes', accessor: x => renderArray(x.accessible_from_nodes)},
- { Header: 'Services', id: 'services', accessor: x => renderArray(x.services)}
+ {Header: 'Machine', accessor: 'label'},
+ {
+ Header: 'IP Addresses', id: 'ip_addresses',
+ accessor: x => renderIpAddresses(x)
+ },
+ {Header: 'Accessible From', id: 'accessible_from_nodes', accessor: x => renderArray(x.accessible_from_nodes)},
+ {Header: 'Services', id: 'services', accessor: x => renderArray(x.services)}
]
}
];
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/StolenPasswords.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/StolenPasswords.js
index fde46f85a..25a701871 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/security/StolenPasswords.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/security/StolenPasswords.js
@@ -5,9 +5,9 @@ const columns = [
{
Header: 'Stolen Credentials',
columns: [
- { Header: 'Username', accessor: 'username'},
- { Header: 'Type', accessor: 'type'},
- { Header: 'Stolen From', accessor: 'origin'}
+ {Header: 'Username', accessor: 'username'},
+ {Header: 'Type', accessor: 'type'},
+ {Header: 'Stolen From', accessor: 'origin'}
]
}
];
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/StrongUsers.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/StrongUsers.js
index a8f045479..2c2a79c07 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/security/StrongUsers.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/security/StrongUsers.js
@@ -1,7 +1,7 @@
import React from 'react';
import ReactTable from 'react-table'
-let renderArray = function(val) {
+let renderArray = function (val) {
console.log(val);
return {x}
)}{val.map(x =>
;
};
@@ -10,9 +10,9 @@ const columns = [
{
Header: 'Powerful Users',
columns: [
- { Header: 'Username', accessor: 'username'},
- { Header: 'Machines', id: 'machines', accessor: x => renderArray(x.machines)},
- { Header: 'Services', id: 'services', accessor: x => renderArray(x.services_names)}
+ {Header: 'Username', accessor: 'username'},
+ {Header: 'Machines', id: 'machines', accessor: x => renderArray(x.machines)},
+ {Header: 'Services', id: 'services', accessor: x => renderArray(x.services_names)}
]
}
];
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js
index 761ff94a9..49905531c 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js
@@ -21,13 +21,13 @@ export default class EventsButton extends Component {
render() {
return {x}
)}
-
-
+
+
+
Events
- +
- There {Pluralize('is', this.props.events.length)} {
{this.props.events.length}
} {Pluralize('event', this.props.events.length)} associated with this finding.
+ There {Pluralize('is', this.props.events.length)} {{this.props.events.length}
} {Pluralize('event', this.props.events.length)} associated
+ with this finding.
{this.props.events.length > 5 ? this.renderButtons() : null}
{this.props.pillar}
+ return {this.props.pillar}
}
}
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PrinciplesStatusTable.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PrinciplesStatusTable.js
index b50ee0c28..6db2dfad3 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PrinciplesStatusTable.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PrinciplesStatusTable.js
@@ -10,19 +10,22 @@ const MAX_WIDTH_STATUS_COLUMN = 80;
const columns = [
{
columns: [
- { Header: 'Status', id: 'status',
+ {
+ Header: 'Status', id: 'status',
accessor: x => {
- return Legend
+Legend
@@ -50,7 +51,8 @@ class ZeroTrustReportLegend extends Component {
- {"\t"}This status means the test wasn't executed.To activate more tests, refer to the Monkey configuration page.
+ {"\t"}This status means the test wasn't executed.To activate more tests, refer to the Monkey configuration page.
;
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarPrinciplesStatus.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarPrinciplesStatus.js
index 8e4512ac7..8de7a4d21 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarPrinciplesStatus.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarPrinciplesStatus.js
@@ -9,14 +9,14 @@ export default class SinglePillarPrinciplesStatus extends AuthComponent {
render() {
if (this.props.principlesStatus.length === 0) {
return null;
- }
- else {
+ } else {
return (
-
- {
- this.props.statusesToPillars[status].map((pillar) => {
- return
+ })
+ }
}
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SummarySection.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SummarySection.js
index e4012bf50..0f937f341 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SummarySection.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SummarySection.js
@@ -14,9 +14,10 @@ export default class SummarySection extends Component {
- Get a quick glance at how your network aligns with the - Zero Trust eXtended (ZTX) framework - . + Get a quick glance at how your network aligns with the + Zero Trust eXtended (ZTX) framework + .
diff --git a/monkey/monkey_island/cc/ui/src/components/run-monkey/AwsRunTable.js b/monkey/monkey_island/cc/ui/src/components/run-monkey/AwsRunTable.js index 6a8fe9416..f2815a142 100644 --- a/monkey/monkey_island/cc/ui/src/components/run-monkey/AwsRunTable.js +++ b/monkey/monkey_island/cc/ui/src/components/run-monkey/AwsRunTable.js @@ -8,10 +8,10 @@ const columns = [ { Header: 'Machines', columns: [ - { Header: 'Machine', accessor: 'name'}, - { Header: 'Instance ID', accessor: 'instance_id'}, - { Header: 'IP Address', accessor: 'ip_address'}, - { Header: 'OS', accessor: 'os'} + {Header: 'Machine', accessor: 'name'}, + {Header: 'Instance ID', accessor: 'instance_id'}, + {Header: 'IP Address', accessor: 'ip_address'}, + {Header: 'OS', accessor: 'os'} ] } ]; @@ -44,7 +44,7 @@ class AwsRunTableComponent extends React.Component { selection.push(key); } // update the state - this.setState({ selection }); + this.setState({selection}); }; isSelected = key => { @@ -64,7 +64,7 @@ class AwsRunTableComponent extends React.Component { selection.push(item._original.instance_id); }); } - this.setState({ selectAll, selection }); + this.setState({selectAll, selection}); }; getTrProps = (s, r) => { diff --git a/monkey/monkey_island/cc/ui/src/components/ui-components/Checkbox.js b/monkey/monkey_island/cc/ui/src/components/ui-components/Checkbox.js index 74204973a..f200a6fdb 100644 --- a/monkey/monkey_island/cc/ui/src/components/ui-components/Checkbox.js +++ b/monkey/monkey_island/cc/ui/src/components/ui-components/Checkbox.js @@ -15,59 +15,68 @@ class CheckboxComponent extends React.PureComponent { this.props.name (the name of this component) and this.state.checked (boolean indicating if this component is checked or not) */ - constructor(props) { - super(props); - this.state = { - checked: this.props.checked, + constructor(props) { + super(props); + this.state = { + checked: this.props.checked, necessary: this.props.necessary, - isAnimating: false - }; - this.toggleChecked = this.toggleChecked.bind(this); - this.stopAnimation = this.stopAnimation.bind(this); - this.composeStateClasses = this.composeStateClasses.bind(this); - } + isAnimating: false + }; + this.toggleChecked = this.toggleChecked.bind(this); + this.stopAnimation = this.stopAnimation.bind(this); + this.composeStateClasses = this.composeStateClasses.bind(this); + } - //Toggles component. - toggleChecked() { - if (this.state.isAnimating) {return false;} - this.setState({ - checked: !this.state.checked, - isAnimating: true, - }, () => { this.props.changeHandler ? this.props.changeHandler(this.props.name, this.state.checked) : null}); - } + //Toggles component. + toggleChecked() { + if (this.state.isAnimating) { + return false; + } + this.setState({ + checked: !this.state.checked, + isAnimating: true, + }, () => { + this.props.changeHandler ? this.props.changeHandler(this.props.name, this.state.checked) : null + }); + } - // Stops ping animation on checkbox after click - stopAnimation() { - this.setState({ isAnimating: false }) - } + // Stops ping animation on checkbox after click + stopAnimation() { + this.setState({isAnimating: false}) + } - // Creates class string for component - composeStateClasses(core) { - let result = core; - if (this.state.necessary){ + // Creates class string for component + composeStateClasses(core) { + let result = core; + if (this.state.necessary) { return result + ' blocked' } - if (this.state.checked) { result += ' is-checked'; } - else { result += ' is-unchecked' } + if (this.state.checked) { + result += ' is-checked'; + } else { + result += ' is-unchecked' + } - if (this.state.isAnimating) { result += ' do-ping'; } - return result; - } + if (this.state.isAnimating) { + result += ' do-ping'; + } + return result; + } - render() { - const cl = this.composeStateClasses('ui-checkbox-btn'); - return ( -
-
-
-
-
- )
- }
+ render() {
+ const cl = this.composeStateClasses('ui-checkbox-btn');
+ return (
+
+
+
+
+
+ )
+ }
}
export default CheckboxComponent;
diff --git a/monkey/monkey_island/cc/ui/src/config/base.js b/monkey/monkey_island/cc/ui/src/config/base.js
index 65b6aff99..bea121a3c 100644
--- a/monkey/monkey_island/cc/ui/src/config/base.js
+++ b/monkey/monkey_island/cc/ui/src/config/base.js
@@ -1,5 +1,4 @@
'use strict';
// Settings configured here will be merged into the final config object.
-export default {
-}
+export default {}
diff --git a/monkey/monkey_island/cc/ui/src/images/infection-monkey.svg b/monkey/monkey_island/cc/ui/src/images/infection-monkey.svg
index 3a357890d..ee2d9cda0 100644
--- a/monkey/monkey_island/cc/ui/src/images/infection-monkey.svg
+++ b/monkey/monkey_island/cc/ui/src/images/infection-monkey.svg
@@ -2,30 +2,45 @@