;
};
+export let renderMachineArray = function(array) {
+ return <>{array.map(x => {x.network_interfaces[0]}
)};
+}
+
export let renderLimitedArray = function (array,
limit,
className='',
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/ScannedServers.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/ScannedServers.js
index 229bbfed2..b2a58d85f 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/security/ScannedServers.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/security/ScannedServers.js
@@ -1,19 +1,20 @@
import React from 'react';
import ReactTable from 'react-table';
import Pluralize from 'pluralize';
-import {renderArray, renderIpAddresses} from '../common/RenderArrays';
+import {renderArray, renderIpAddresses, renderMachineArray} from '../common/RenderArrays';
const columns = [
{
Header: 'Scanned Servers',
columns: [
- {Header: 'Machine', accessor: 'label'},
+ {Header: 'Machine', id: 'machine', accessor: x => x.ip_addresses[0]},
{
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: 'Accessible From', id: 'accessible_from_nodes',
+ accessor: x => renderMachineArray(x.accessible_from_nodes)},
{Header: 'Services', id: 'services', accessor: x => renderArray(x.services)}
]
}
@@ -27,7 +28,6 @@ class ScannedServersComponent extends React.Component {
}
render() {
-
let defaultPageSize = this.props.data.length > pageSize ? pageSize : this.props.data.length;
let showPagination = this.props.data.length > pageSize;
diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/reporting/test_report.py b/monkey/tests/unit_tests/monkey_island/cc/services/reporting/test_report.py
new file mode 100644
index 000000000..cd38d6a6b
--- /dev/null
+++ b/monkey/tests/unit_tests/monkey_island/cc/services/reporting/test_report.py
@@ -0,0 +1,77 @@
+from ipaddress import IPv4Interface
+from unittest.mock import MagicMock
+
+from monkey_island.cc.models import CommunicationType, Machine, Node
+from monkey_island.cc.services.reporting.report import ReportService
+
+ISLAND_MACHINE = Machine(
+ id=99,
+ island=True,
+ hostname="Island",
+ hardware_id=5,
+ network_interfaces=[IPv4Interface("10.10.10.99/24")],
+)
+
+MACHINE_1 = Machine(
+ id=1,
+ hardware_id=9,
+ hostname="machine_1",
+ network_interfaces=[IPv4Interface("10.10.10.1/24")],
+)
+
+MACHINE_2 = Machine(
+ id=2,
+ hardware_id=9,
+ network_interfaces=[IPv4Interface("10.10.10.2/24")],
+)
+
+MACHINE_3 = Machine(
+ id=3,
+ hardware_id=9,
+ network_interfaces=[IPv4Interface("10.10.10.3/24")],
+)
+
+NODES = [
+ Node(
+ machine_id=1,
+ connections={"2": frozenset([CommunicationType.EXPLOITED, CommunicationType.SCANNED])},
+ ),
+ Node(machine_id=99, connections={"1": frozenset([CommunicationType.SCANNED])}),
+ Node(
+ machine_id=3,
+ connections={"99": frozenset([CommunicationType.CC, CommunicationType.EXPLOITED])},
+ ),
+]
+
+MACHINES = [MACHINE_1, MACHINE_2, MACHINE_3, ISLAND_MACHINE]
+
+EXPECTED_SCANNED_MACHINES = [
+ {
+ "hostname": MACHINE_1.hostname,
+ "ip_addresses": [str(iface.ip) for iface in MACHINE_1.network_interfaces],
+ "accessible_from_nodes": [ISLAND_MACHINE.dict(simplify=True)],
+ "services": [],
+ "domain_name": "",
+ },
+ {
+ "hostname": MACHINE_2.hostname,
+ "ip_addresses": [str(iface.ip) for iface in MACHINE_2.network_interfaces],
+ "accessible_from_nodes": [MACHINE_1.dict(simplify=True)],
+ "services": [],
+ "domain_name": "",
+ },
+]
+
+
+def get_machine_by_id(machine_id):
+ return [machine for machine in MACHINES if machine_id == machine.id][0]
+
+
+def test_get_scanned():
+ ReportService._node_repository = MagicMock()
+ ReportService._node_repository.get_nodes.return_value = NODES
+ ReportService._machine_repository = MagicMock()
+ ReportService._machine_repository.get_machines.return_value = MACHINES
+ ReportService._machine_repository.get_machine_by_id = get_machine_by_id
+ scanned = ReportService.get_scanned()
+ assert scanned == EXPECTED_SCANNED_MACHINES