Configuration UI improvements #707

VakarisZ · 2020-07-03T14:59:45Z

What is this?

Fixes #637

Checklist

Ask Shreya to add descriptions to PBA's she added.
Synch links with new documentation framework.
Instead of "Basic - ..." we should highlight essential tabs with green colour (DONE)
Create an advanced selector, that allows to select/deselect on click. On click
information about clicked property is shown in selectors info pane. Advanced selector
also has space for custom buttons. (DONE)

Basic - Exploits

Should be renamed to Exploits (DONE)

General

Renamed to "Exploiters" (DONE)
Exploiter selector moved here from "Exploits" tab. (DONE)
"Exploit network machines" is removed (you can deselect all exploiters) (DONE)

Basic - Network

Should be renamed to Network (DONE)

General

Should be renamed to "Scope" (DONE)

Monkey

Behaviour

"Self delete on cleanup" - moved to Internal/Monkey (on by default). (DONE)
"Serialize config" - moved to Internal/Monkey (off by default). (DONE)
"Use file logging" - moved to Internal/Monkey (on by default). (DONE)
Renamed to "Post breach" (DONE)

General

"Is monkey alive" - hidden, moved to internal->monkey. (DONE)
"Post breach actions" - advanced selector with info pane that displays
what each post breach action does. (DONE)
PBA selector moved to "Post breach" (DONE)

Lifecycle

Renamed to "Persistent scanning"
"Max victims to exploit" - Moved to internal, increased default to 100. (DONE)
"Max victims to find" - Moved to internal. (DONE)

System info

"System info collectors" refactored into advanced selector component. (DONE)
"Collect system info" - removed. Same can be achieved by disabling all collectors. (DONE)
"Should use mimikatz" - refactored into Mimikatz system info collector. (DONE)
"Harvest Azure credentials" - refactored into system info collector. (DONE)

Monkey Island

Servers

Whole "Servers" section moved to Internal. "Command servers" uses all local interfaces
which is a reasonable default. "Current server" is also chosen automatically/doesn't matter. (DONE)

Internet services

Section moved to "Internal -> Monkey" (DONE)

Network

Whole tab moved to internal (DONE)

Exploits

Tab moved to be after "Network" (DONE)
Everything in this tab except "Exploits" are moved to "Internal". (DONE)

General

Exploits

"Exploits" made into advanced selector. Info pane displays information about exploiters, there is a button
that de-selects all exploiters. (DONE)

Internal

Refactored into sub-tabs or dropdowns for each section. (DONE)

Proof that it works

…ed it in a way that allows to define all advanced selector properties on config_schema.py

…iption (because advanced multi select has title and description built in)

… title from description

…ation_improvements # Conflicts: # monkey/monkey_island/cc/ui/package-lock.json

…he front

…chieved by removing all exploiters.

…ation_improvements # Conflicts: # monkey/monkey_island/cc/ui/package-lock.json

…ation_improvements

…s->General to Exploits->Exploiters

… "Behaviour" renamed to "Post breach" in config

… sections

…reased "victims_max_exploit" default to 100

Now can use whitespace

…m/guardicore/monkey into feature/configuration_improvement

…m/guardicore/monkey into feature/configuration_improvements

…ation_improvements

codecov · 2020-07-26T08:28:03Z

Codecov Report

Merging #707 into develop will increase coverage by 0.19%.
The diff coverage is 85.00%.

@@             Coverage Diff             @@
##           develop     #707      +/-   ##
===========================================
+ Coverage    59.85%   60.04%   +0.19%     
===========================================
  Files          147      157      +10     
  Lines         4795     4818      +23     
===========================================
+ Hits          2870     2893      +23     
  Misses        1925     1925

Impacted Files	Coverage Δ
...ection_monkey/system_info/system_info_collector.py	`70.58% <0.00%> (ø)`
monkey/monkey_island/cc/services/config.py	`28.57% <33.33%> (ø)`
monkey/infection_monkey/system_info/__init__.py	`42.18% <50.00%> (+0.91%)`	⬆️
...key/monkey_island/cc/services/post_breach_files.py	`40.00% <50.00%> (ø)`
monkey/common/data/system_info_collectors_names.py	`100.00% <100.00%> (ø)`
monkey/common/data/validation_formats.py	`100.00% <100.00%> (ø)`
monkey/infection_monkey/config.py	`63.88% <100.00%> (-0.74%)`	⬇️
...y/monkey_island/cc/services/config_schema/basic.py	`100.00% <100.00%> (ø)`
..._island/cc/services/config_schema/basic_network.py	`100.00% <100.00%> (ø)`
..._island/cc/services/config_schema/config_schema.py	`100.00% <100.00%> (ø)`
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5370743...fade717. Read the comment docs.

ShayNehmad · 2020-07-26T08:36:06Z

monkey/monkey_island/cc/services/config_schema/basic.py

+                        "Password1!",
+                        "1234",
+                        "password",
+                        "12345678"


Suggested change

"Password1!",

"1234",

"password",

"12345678"

"Password1!",

"password",

"root",

"12345678",

"qwerty",

"iloveyou"

Probably time to update the default passwords list? Just an idea

Good idea, updated a bit. Shame that we have limited brute forcing capabilities due to performance and noise generation

ShayNehmad

A few small comments, and some more that that came up while testing:

Unsubmitted changes

When clicking on the tabs after unchanged changes I don't get a warning for unsubmitted changes UNTIL I click on the ATT&CK tab.

Validation in the network tab

Warning format

We should make the warning grammatically correct (start with a capital letter, end with .).

Validation misses

123.123.123/1.123.1 match for ip-range validation.

ShayNehmad · 2020-07-26T08:40:33Z

monkey/monkey_island/cc/ui/src/components/configuration-components/ValidationFormats.js

+    '^'+ipRegex+'$|', // Single IP
+    '^'+ipRegex+'-'+ipRegex+'$|', // IP range IP-IP
+    '^'+ipRegex+'/'+cidrNotationRegex+'$|', // IP range with cidr notation: IP/cidr
+    hostnameRegex, // IP range with cidr notation: IP/cidr


copy-pasta documentation

ShayNehmad · 2020-07-26T08:51:32Z

monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js

      return (<div className='alert alert-info'>
        <FontAwesomeIcon icon={faInfoCircle} style={{'marginRight': '5px'}}/>
-        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 "Scan target list".
      </div>)


We should move this warning into the "scope" section of the configuration page. It's out of place at the top of the page.

ShayNehmad · 2020-07-26T10:56:54Z

monkey/monkey_island/cc/ui/src/components/configuration-components/ValidationFormats.js

@@ -0,0 +1,21 @@
+const ipRegex = '((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'


monkey\monkey\monkey_island\cc\ui\src\components\configuration-components\ValidationFormats.js 1:57 warning Unnecessary escape character: \. no-useless-escape

…statistics

…/sections. Moved network warning under "Scope"

…ent' into feature/configuration_improvements # Conflicts: # monkey/monkey_island/cc/ui/src/components/configuration-components/ValidationFormats.js

VakarisZ added 5 commits June 30, 2020 16:07

PBA file refactoring almost working

aad9e50

Finished PBA refactoring

fda600e

Grouped stylesheets into components and pages

67eeb2b

Removed old react-jsonshema-form npm package

989020c

Finished AdvancedMultiSelect component

6a824ef

VakarisZ requested a review from ShayNehmad July 3, 2020 14:59

ShayNehmad mentioned this pull request Jul 16, 2020

Migrated and updated docs from our wiki to the new docs site #718

Merged

3 tasks

VakarisZ added 18 commits July 20, 2020 15:10

Added advanced selector component to all config definitions, refactor…

fb9428b

…ed it in a way that allows to define all advanced selector properties on config_schema.py

Added style that allows hiding config input component title and descr…

35e90fc

…iption (because advanced multi select has title and description built in)

Changed the style in configuration page to differentiate config value…

f790750

… title from description

Merge remote-tracking branch 'upstream/develop' into feature/configur…

c88488c

…ation_improvements # Conflicts: # monkey/monkey_island/cc/ui/package-lock.json

Removed hidden descriptions

167d1f5

Changed important tabs to be highlighted rather than having text in t…

9f21ce0

…he front

Hid "Is monkey alive" field in configuration

f70b224

Removed should exploit network machines config param - same will be a…

eb4056a

…chieved by removing all exploiters.

Merge remote-tracking branch 'upstream/develop' into feature/configur…

8c356d9

…ation_improvements # Conflicts: # monkey/monkey_island/cc/ui/package-lock.json

Merge remote-tracking branch 'upstream/develop' into feature/configur…

eba779c

…ation_improvements

Renamed values in config: Network->General to Network->Scope, Exploit…

3fec6ac

…s->General to Exploits->Exploiters

Split up config_schema.py into separate files

8b27973

Mimikatz, Azure collectors moved to system info collectors in config,…

2c96ace

… "Behaviour" renamed to "Post breach" in config

Moved "is monkey alive" into internal(still hidden) config, fixed PBA UI

57ee55d

Removed "Monkey island" config tab (moved everything into internal)

b2eb5a4

"Network" config section moved to "Internal"

2506fdc

"Exploits" config section moved to "Internal", UI fix for other moved…

bca5ad9

… sections

Moved "victims_max_exploit" and "victims_max_find" to "internal", inc…

db6552a

…reased "victims_max_exploit" default to 100

VakarisZ marked this pull request as ready for review July 23, 2020 07:58

VakarisZ and others added 4 commits July 23, 2020 16:04

Added validation to important tabs (not-internal)

5449084

Update descriptions of config values

336c3cb

Now can use whitespace

Merge branch 'feature/configuration_improvement' of https://github.co…

b25802c

…m/guardicore/monkey into feature/configuration_improvement

Changed empty checkbox UI to unfilled in AdvancedMultiSelect.js

c9468b8

VakarisZ added 13 commits July 24, 2020 09:45

Changed exploiter documentation links in config

696dd83

Merge branch 'feature/configuration_improvement' of https://github.co…

c1717d0

…m/guardicore/monkey into feature/configuration_improvements

Added hostname's to IP range validation

cc78076

Added descriptions to post breach actions, where it was missing

a1c11df

Fixed double (( typo in WMI exploiter documentation

09734df

Merge remote-tracking branch 'upstream/develop' into feature/configur…

d049b88

…ation_improvements

Merge remote-tracking branch 'upstream/develop' into feature/configur…

e8d210f

…ation_improvements

Typo fixes and improvements

cf45ec9

Rolled back server_config.json to a clean one

76401f0

Separated InternalConfig into separate tabs for easier navigation

ecea415

Linting fixes

b366d12

Bugfix in HeightCalculator.js

49825d4

More linting fixes

951794a

ShayNehmad assigned VakarisZ Jul 26, 2020

Fix import formatting

0deb8c6

ShayNehmad reviewed Jul 26, 2020

View reviewed changes

ShayNehmad suggested changes Jul 26, 2020

View reviewed changes

ShayNehmad reviewed Jul 26, 2020

View reviewed changes

ShayNehmad and others added 7 commits July 26, 2020 14:40

Clean some JS warnings

e21d67c

Updated default password list according to the most popular password …

02a710e

…statistics

Validation bugfix (unescaped .), improved comments

026daba

Added custom config validation errors

0be9b19

Added the the ability to assing info/warnings to configuration fields…

64a8d71

…/sections. Moved network warning under "Scope"

Merge remote-tracking branch 'upstream/feature/configuration_improvem…

fd1d340

…ent' into feature/configuration_improvements # Conflicts: # monkey/monkey_island/cc/ui/src/components/configuration-components/ValidationFormats.js

Linting fixes in ValidationErrorMessages.js and ValidationFormats.js

fade717

ShayNehmad approved these changes Jul 27, 2020

View reviewed changes

VakarisZ merged commit c1c412f into develop Jul 27, 2020

ShayNehmad deleted the feature/configuration_improvement branch July 27, 2020 17:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Configuration UI improvements #707

Configuration UI improvements #707

Uh oh!

VakarisZ commented Jul 3, 2020 •

edited

Loading

Uh oh!

codecov bot commented Jul 26, 2020 •

edited

Loading

Uh oh!

ShayNehmad Jul 26, 2020

Uh oh!

VakarisZ Jul 27, 2020

Uh oh!

ShayNehmad left a comment

Uh oh!

ShayNehmad Jul 26, 2020

Uh oh!

ShayNehmad Jul 26, 2020

Uh oh!

ShayNehmad Jul 26, 2020

Uh oh!

Uh oh!

		@@ -0,0 +1,21 @@
		const ipRegex = '((25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\.){3}(25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)'

Configuration UI improvements #707

Configuration UI improvements #707

Uh oh!

Conversation

VakarisZ commented Jul 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What is this?

Checklist

Basic - Exploits

General

Basic - Network

General

Monkey

Behaviour

General

Lifecycle

System info

Monkey Island

Servers

Internet services

Network

Exploits

General

Exploits

Internal

Proof that it works

Uh oh!

codecov bot commented Jul 26, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ShayNehmad Jul 26, 2020

Choose a reason for hiding this comment

Uh oh!

VakarisZ Jul 27, 2020

Choose a reason for hiding this comment

Uh oh!

ShayNehmad left a comment

Choose a reason for hiding this comment

Unsubmitted changes

Validation in the network tab

Warning format

Validation misses

Uh oh!

ShayNehmad Jul 26, 2020

Choose a reason for hiding this comment

Uh oh!

ShayNehmad Jul 26, 2020

Choose a reason for hiding this comment

Uh oh!

ShayNehmad Jul 26, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

VakarisZ commented Jul 3, 2020 •

edited

Loading

codecov bot commented Jul 26, 2020 •

edited

Loading