+
+ {this.props.data.status === ScanStatus.USED ? +
+
+ );
+ }
+ }
+
+ export default T1087;
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1099.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1099.js
new file mode 100644
index 000000000..2c95cdba9
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1099.js
@@ -0,0 +1,45 @@
+import React from 'react';
+import ReactTable from 'react-table';
+import {renderMachineFromSystemData, ScanStatus} from './Helpers';
+import MitigationsComponent from './MitigationsComponent';
+
+class T1099 extends React.Component {
+
+ constructor(props) {
+ super(props);
+ }
+
+ static getColumns() {
+ return ([{
+ columns: [
+ { Header: 'Machine',
+ id: 'machine',
+ accessor: x => renderMachineFromSystemData(x.machine),
+ style: {'whiteSpace': 'unset'}},
+ { Header: 'Result',
+ id: 'result',
+ accessor: x => x.result,
+ style: {'whiteSpace': 'unset'}}
+ ]
+ }])
+ }
+
+ render() {
+ return (
+ {this.props.data.message}
+ + {this.props.data.status === ScanStatus.USED ? +
+
+ {this.props.data.status === ScanStatus.USED ? +
+
+ );
+ }
+ }
+
+ export default T1099;
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1146.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1146.js
new file mode 100644
index 000000000..26693b892
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1146.js
@@ -0,0 +1,45 @@
+import React from 'react';
+import ReactTable from 'react-table';
+import {renderMachineFromSystemData, ScanStatus} from './Helpers';
+import MitigationsComponent from './MitigationsComponent';
+
+class T1146 extends React.Component {
+
+ constructor(props) {
+ super(props);
+ }
+
+ static getColumns() {
+ return ([{
+ columns: [
+ { Header: 'Machine',
+ id: 'machine',
+ accessor: x => renderMachineFromSystemData(x.machine),
+ style: {'whiteSpace': 'unset'}},
+ { Header: 'Result',
+ id: 'result',
+ accessor: x => x.result,
+ style: {'whiteSpace': 'unset'}}
+ ]
+ }])
+ }
+
+ render() {
+ return (
+ {this.props.data.message}
+ + {this.props.data.status === ScanStatus.USED ? +
+
+ {this.props.data.status === ScanStatus.USED ? +
+
+ );
+ }
+ }
+
+ export default T1146;
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1216.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1216.js
new file mode 100644
index 000000000..e608492a1
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1216.js
@@ -0,0 +1,45 @@
+import React from 'react';
+import ReactTable from 'react-table';
+import {renderMachineFromSystemData, ScanStatus} from './Helpers';
+import MitigationsComponent from './MitigationsComponent';
+
+class T1216 extends React.Component {
+
+ constructor(props) {
+ super(props);
+ }
+
+ static getColumns() {
+ return ([{
+ columns: [
+ { Header: 'Machine',
+ id: 'machine',
+ accessor: x => renderMachineFromSystemData(x.machine),
+ style: {'whiteSpace': 'unset'}},
+ { Header: 'Result',
+ id: 'result',
+ accessor: x => x.result,
+ style: {'whiteSpace': 'unset'}}
+ ]
+ }])
+ }
+
+ render() {
+ return (
+ {this.props.data.message}
+ + {this.props.data.status === ScanStatus.USED ? +
+
+ {this.props.data.status === ScanStatus.USED ? +
+
+ );
+ }
+}
+
+export default T1216;
diff --git a/monkey/monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js b/monkey/monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
index 27800cb97..9007194b0 100644
--- a/monkey/monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
+++ b/monkey/monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
@@ -274,9 +274,9 @@ class PreviewPaneComponent extends AuthComponent {
let label = '';
if (!this.props.item) {
label = '';
- } else if (this.props.item.hasOwnProperty('label')) {
+ } else if (Object.prototype.hasOwnProperty.call(this.props.item, 'label')) {
label = this.props.item['label'];
- } else if (this.props.item.hasOwnProperty('_label')) {
+ } else if (Object.prototype.hasOwnProperty.call(this.props.item, '_label')) {
label = this.props.item['_label'];
}
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
index f3b3e190c..426e66c0a 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
@@ -140,7 +140,7 @@ class ConfigurePageComponent extends AuthComponent {
// Change value in attack configuration
// Go trough each column in matrix, searching for technique
Object.entries(this.state.attackConfig).forEach(techType => {
- if (techType[1].properties.hasOwnProperty(technique)) {
+ if (Object.prototype.hasOwnProperty.call(techType[1].properties, technique)) {
let tempMatrix = this.state.attackConfig;
tempMatrix[techType[0]].properties[technique].value = value;
this.setState({attackConfig: tempMatrix});
@@ -151,7 +151,8 @@ class ConfigurePageComponent extends AuthComponent {
Object.entries(this.state.attackConfig).forEach(otherType => {
Object.entries(otherType[1].properties).forEach(otherTech => {
// If this technique depends on a technique that was changed
- if (otherTech[1].hasOwnProperty('depends_on') && otherTech[1]['depends_on'].includes(technique)) {
+ if (Object.prototype.hasOwnProperty.call(otherTech[1], 'depends_on') &&
+ otherTech[1]['depends_on'].includes(technique)) {
this.attackTechniqueChange(otherTech[0], value, true)
}
})
@@ -393,7 +394,7 @@ class ConfigurePageComponent extends AuthComponent {
render() {
let displayedSchema = {};
- if (this.state.schema.hasOwnProperty('properties') && this.state.selectedSection !== 'attack') {
+ if (Object.prototype.hasOwnProperty.call(this.state.schema, 'properties') && this.state.selectedSection !== 'attack') {
displayedSchema = this.state.schema['properties'][this.state.selectedSection];
displayedSchema['definitions'] = this.state.schema['definitions'];
}
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js b/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
index df8aa08d0..cbe3867ee 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
@@ -2,9 +2,8 @@ import React from 'react';
import {Button, Col, Container, Form, Row} from 'react-bootstrap';
import AuthService from '../../services/AuthService';
-import Particles from 'react-particles-js';
-import {particleParams} from '../../styles/components/particle-component/AuthPageParams';
import monkeyGeneral from '../../images/militant-monkey.svg';
+import ParticleBackground from '../ui-components/ParticleBackground';
class LoginPageComponent extends React.Component {
login = (event) => {
@@ -60,7 +59,7 @@ class LoginPageComponent extends React.Component {
render() {
return (
{this.props.data.message}
+ + {this.props.data.status === ScanStatus.USED ? +
+ The attack was made possible because the server is using an old version of Drupal, for which REST API is + enabled. For possible workarounds, fixes and more info read + here. +
{tech_type.title}
); for(const tech_id in this.state.techniques){ - if (! this.state.techniques.hasOwnProperty(tech_id)){ + if (! Object.prototype.hasOwnProperty.call(this.state.techniques, tech_id)){ continue; } let technique = this.state.techniques[tech_id]; diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreachParser.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreachParser.js index b56a532f7..4bb420f71 100644 --- a/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreachParser.js +++ b/monkey/monkey_island/cc/ui/src/components/report-components/security/PostBreachParser.js @@ -1,33 +1,62 @@ export default function parsePbaResults(results) { - results.pba_results = aggregateShellStartupPba(results.pba_results); + results.pba_results = aggregateMultipleResultsPba(results.pba_results); return results; } const SHELL_STARTUP_NAME = 'Modify shell startup file'; +const CMD_HISTORY_NAME = 'Clear command history'; -function aggregateShellStartupPba(results) { - let isSuccess = false; - let aggregatedPbaResult = undefined; - let successfulOutputs = ''; - let failedOutputs = ''; +const multipleResultsPbas = [SHELL_STARTUP_NAME, CMD_HISTORY_NAME] - for(let i = 0; i < results.length; i++){ - if(results[i].name === SHELL_STARTUP_NAME && aggregatedPbaResult === undefined){ - aggregatedPbaResult = results[i]; +function aggregateMultipleResultsPba(results) { + let aggregatedPbaResults = {}; + multipleResultsPbas.forEach(function(pba) { + aggregatedPbaResults[pba] = { + aggregatedResult: undefined, + successfulOutputs: '', + failedOutputs: '', + isSuccess: false } - if(results[i].name === SHELL_STARTUP_NAME && results[i].result[1]){ - successfulOutputs += results[i].result[0]; - isSuccess = true; + }) + + function aggregateResults(result) { + if (aggregatedPbaResults[result.name].aggregatedResult === undefined) { + aggregatedPbaResults[result.name].aggregatedResult = result; } - if(results[i].name === SHELL_STARTUP_NAME && ! results[i].result[1]){ - failedOutputs += results[i].result[0]; + if (result.result[1]) { + aggregatedPbaResults[result.name].successfulOutputs += result.result[0]; + aggregatedPbaResults[result.name].isSuccess = true; + } + else if (!result.result[1]) { + aggregatedPbaResults[result.name].failedOutputs += result.result[0]; } } - if(aggregatedPbaResult === undefined) return results; - results = results.filter(result => result.name !== SHELL_STARTUP_NAME); - aggregatedPbaResult.result[0] = successfulOutputs + failedOutputs; - aggregatedPbaResult.result[1] = isSuccess; - results.push(aggregatedPbaResult); + function checkAggregatedResults(pbaName) { // if this pba's results were aggregated, push to `results` + if (aggregatedPbaResults[pbaName].aggregatedResult !== undefined) { + aggregatedPbaResults[pbaName].aggregatedResult.result[0] = (aggregatedPbaResults[pbaName].successfulOutputs + + aggregatedPbaResults[pbaName].failedOutputs); + aggregatedPbaResults[pbaName].aggregatedResult.result[1] = aggregatedPbaResults[pbaName].isSuccess; + results.push(aggregatedPbaResults[pbaName].aggregatedResult); + } + } + + // check for pbas with multiple results and aggregate their results + for (let i = 0; i < results.length; i++) + if (multipleResultsPbas.includes(results[i].name)) + aggregateResults(results[i]); + + // if no modifications were made to the results, i.e. if no pbas had mutiple results, return `results` as it is + let noResultsModifications = true; + multipleResultsPbas.forEach((pba) => { + if (aggregatedPbaResults[pba].aggregatedResult !== undefined) + noResultsModifications = false; + }) + if (noResultsModifications) + return results; + + // if modifications were made, push aggregated results to `results` and return + results = results.filter(result => !multipleResultsPbas.includes(result.name)); + multipleResultsPbas.forEach(pba => checkAggregatedResults(pba)); return results; } diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/venn-components/VennDiagram.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/venn-components/VennDiagram.js index e6a2ddd36..4eddb420d 100644 --- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/venn-components/VennDiagram.js +++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/venn-components/VennDiagram.js @@ -209,7 +209,7 @@ class VennDiagram extends React.Component { if (key_ === 'Data') { this.layout[key_].fontStyle = this.fontStyles[0]; - } else if (this.layout[key_].hasOwnProperty('cx')) { + } else if (Object.prototype.hasOwnProperty.call(this.layout[key_], 'cx')) { this.layout[key_].fontStyle = this.fontStyles[1]; } else { this.layout[key_].fontStyle = this.fontStyles[2]; @@ -229,7 +229,7 @@ class VennDiagram extends React.Component { // equivalent to center translate (width/2, height/2) let viewPortParameters = (-this.width / 2) + ' ' + (-this.height / 2) + ' ' + this.width + ' ' + this.height; let nodes = Object.values(this.layout).map((d_, i_) => { - if (d_.hasOwnProperty('cx')) { + if (Object.prototype.hasOwnProperty.call(d_, 'cx')) { return (
+ 
+
+ );
+}
diff --git a/monkey/monkey_island/cc/ui/src/components/ui-components/ParticleBackground.js b/monkey/monkey_island/cc/ui/src/components/ui-components/ParticleBackground.js
new file mode 100644
index 000000000..23d607311
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/ui-components/ParticleBackground.js
@@ -0,0 +1,7 @@
+import Particles from 'react-particles-js';
+import {particleParams} from '../../styles/components/particle-component/ParticleBackgroundParams';
+import React from 'react';
+
+export default function ParticleBackground() {
+ return ({props.text.toUpperCase()}
+