Island: remove the redundant line with total amount of exploited machines from ransomware report + small improvements in monkey_exploitation.py

monkey/monkey_island/cc/services/reporting/exploitations/monkey_exploitation.py

@@ -20,18 +20,20 @@ class MonkeyExploitation:
 
 
 def get_monkey_exploited() -> List[MonkeyExploitation]:
-    exploited_with_monkeys = [
+    exploited_nodes_monkeys_launched = [
         NodeService.get_displayed_node_by_id(monkey["_id"], True)
         for monkey in mongo.db.monkey.find({}, {"_id": 1})
         if not NodeService.get_monkey_manual_run(NodeService.get_monkey_by_id(monkey["_id"]))
     ]
 
-    exploited_without_monkeys = [
+    # The node got exploited, but no monkeys got launched.
+    # For example the exploited machine was too old.
+    exploited_nodes_monkeys_failed = [
         NodeService.get_displayed_node_by_id(node["_id"], True)
         for node in mongo.db.node.find({"exploited": True}, {"_id": 1})
     ]
 
-    exploited = exploited_with_monkeys + exploited_without_monkeys
+    exploited = exploited_nodes_monkeys_launched + exploited_nodes_monkeys_failed
 
     exploited = [
         MonkeyExploitation(

monkey/monkey_island/cc/ui/src/components/report-components/SecurityReport.js

@@ -1,4 +1,5 @@
 import React, {Fragment} from 'react';
+import Pluralize from 'pluralize';
 import BreachedServers from 'components/report-components/security/BreachedServers';
 import ScannedServers from 'components/report-components/security/ScannedServers';
 import PostBreach from 'components/report-components/security/PostBreach';
@@ -566,6 +567,12 @@ class ReportPageComponent extends AuthComponent {
         </div>
 
         <div style={{marginBottom: '20px'}}>
+          <p>
+            The Monkey successfully breached&nbsp;
+            <span className="badge badge-danger">
+              {this.state.report.glance.exploited_cnt}
+            </span> {Pluralize('machine', this.state.report.glance.exploited_cnt)}:
+          </p>
           <BreachedServers />
         </div>
 

monkey/monkey_island/cc/ui/src/components/report-components/security/BreachedServers.tsx

@@ -1,6 +1,5 @@
 import React, {useEffect, useState} from 'react';
 import ReactTable from 'react-table';
-import Pluralize from 'pluralize';
 import {renderArray, renderIpAddresses} from '../common/RenderArrays';
 import LoadingIcon from '../../ui-components/LoadingIcon';
 import IslandHttpClient from '../../IslandHttpClient';
@@ -39,10 +38,6 @@ function BreachedServersComponent() {
   let showPagination = exploitations.length > pageSize;
   return (
     <>
-      <p>
-        The Monkey successfully breached <span
-        className="badge badge-danger">{exploitations.length}</span> {Pluralize('machine', exploitations.length)}:
-      </p>
       <div className="data-table-container">
         <ReactTable
           columns={columns}