Ransomware landing page #1326

VakarisZ · 2021-07-15T07:16:51Z

What does this PR do?

Fixes parts of #1241

Add any further explanations here.

PR Checklist

Have you added an explanation of what your changes do and why you'd like to include them?
Is the TravisCI build passing?
Was the CHANGELOG.md updated to reflect the changes?
Was the documentation framework updated to reflect the changes?

Testing Checklist

Added relevant unit tests?
Have you successfully tested your changes locally? Elaborate:

Tested by manual tests

Screenshots:

codecov · 2021-07-15T07:18:30Z

Codecov Report

Merging #1326 (6796845) into develop (f804d6c) will decrease coverage by 0.03%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #1326      +/-   ##
===========================================
- Coverage    40.31%   40.28%   -0.04%     
===========================================
  Files          471      475       +4     
  Lines        13826    14041     +215     
===========================================
+ Hits          5574     5656      +82     
- Misses        8252     8385     +133

Impacted Files	Coverage Δ
monkey/infection_monkey/monkey.py	`0.00% <0.00%> (ø)`
...nkey/infection_monkey/ransomware/file_selectors.py	`100.00% <0.00%> (ø)`
...unit_tests/infection_monkey/ransomware/conftest.py	`100.00% <0.00%> (ø)`
...ction_monkey/ransomware/ransomware_target_files.py	`100.00% <0.00%> (ø)`
...nkey/infection_monkey/ransomware/readme_dropper.py	`86.66% <0.00%> (ø)`
...on_monkey/ransomware/ransomware_payload_builder.py	`0.00% <0.00%> (ø)`
...ction_monkey/ransomware/in_place_file_encryptor.py	`100.00% <0.00%> (ø)`
...y/infection_monkey/ransomware/ransomware_config.py	`100.00% <0.00%> (ø)`
.../infection_monkey/ransomware/ransomware_payload.py	`97.87% <0.00%> (+1.53%)`	⬆️

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 f804d6c...6796845. Read the comment docs.

…add the ability to disable side navigation

…a Response object to be a promise instead of an object

…(if mode not chosen redirect to landing page, etc.)

…avigation button to go out of "active" mode on ransomware report tab

ilija-lazoroski · 2021-07-15T07:58:36Z

monkey/monkey_island/cc/ui/src/components/Main.tsx

+  LandingPage: '/landing-page',
+  GettingStartedPage: '/',


Shouldn't the landing page be / and the getting started page be /getting-started?

The /landing-page is only default as long as the mode is not chosen

ilija-lazoroski · 2021-07-15T08:10:14Z

monkey/monkey_island/cc/ui/src/components/pages/LandingPage.tsx

+      <h4 className={'monkey-description-title'}>What is Infection Monkey?</h4>
+      <strong>Infection Monkey</strong> is an open-source security tool for testing a data center's resiliency to
+      perimeter
+      breaches and internal server infections. The Monkey uses various methods to propagate across a data center
+      and reports to this Monkey Island Command and Control server.
+    </>


Isn't this duplicate to the Getting Started page ?

Yes, but this was a requirement we set in the issue

… navigation

mssalvatore · 2021-07-15T10:48:12Z

monkey/monkey_island/cc/ui/src/components/layouts/DisabledSidebarLayoutComponent.tsx

+export const DisabledSidebarLayoutComponent = ({component: Component, ...rest}) => (
+  <Route {...rest} render={() => (
+    <Row>
+      <Col sm={3} md={3} lg={3} xl={2} className='sidebar'>
+        <SideNavComponent disabled={true} completedSteps={rest['completedSteps']}/>
+      </Col>
+      <Component {...rest} />
+    </Row>
+    )}/>
+)


This appears to be mostly duplicated from StandardLayoutComponent. Why not just pass a sidebarDisabled prop to StandardLayoutComponent?

shreyamalviya

Some questions (not all related to the PR)

monkey/monkey_island/cc/ui/src/components/Main.tsx

monkey/monkey_island/cc/ui/src/components/SideNavComponent.tsx

shreyamalviya · 2021-07-15T10:53:06Z

monkey/monkey_island/cc/ui/src/components/Main.tsx

        }
      });
  };

+  checkMode = () => {


Could be named better. setModeFromBackend()?

shreyamalviya · 2021-07-15T10:58:39Z

monkey/monkey_island/cc/ui/src/components/Main.tsx

+  needsRedirectionToLandingPage = (route_path) => {
+    return (this.state.islandMode === null && route_path !== Routes.LandingPage)
+  }
+
+  needsRedirectionToGettingStarted = (route_path) => {
+    return route_path === Routes.LandingPage &&
+      this.state.islandMode !== null &&
+      this.state.islandMode !== undefined
+  }
+


You're checking that this.state.islandMode is not null or undefined in needsRedirectionToGettingStarted but only checking that it is null in needsRedirectionToLandingPage. Why aren't you checking if this.state.islandMode is null OR undefined needsRedirectionToLandingPage?

You're right, the check for undefined is unnecessary since we set the default to null

…Component.tsx into one component to remove duplication

…coded routes into an enum

…started page

VakarisZ requested review from ilija-lazoroski, mssalvatore and shreyamalviya July 15, 2021 07:16

VakarisZ added 6 commits July 15, 2021 10:19

Island: refactor Main.js and SideNavComponent.js into typescript and …

93b90db

…add the ability to disable side navigation

Island: Add LandingPage.tsx and DisabledSidebarLayoutComponent.tsx

b03c6d9

Island: Implements basics of page redirection when island mode is set

5743f8e

Island UI: fix a bug in IslandHttpClient.tsx that caused the body of …

980f06e

…a Response object to be a promise instead of an object

Island UI: finish the routing implementation related to landing page …

4dc138c

…(if mode not chosen redirect to landing page, etc.)

Island UI: implement scenario/mode reset upon starting over

dae6692

VakarisZ force-pushed the ransomware_landing_page branch from dc1dd11 to dae6692 Compare July 15, 2021 07:22

Island UI: fix a bug in side navigation that causes the report side n…

e9094bd

…avigation button to go out of "active" mode on ransomware report tab

ilija-lazoroski reviewed Jul 15, 2021

View reviewed changes

Island UI: fix a bug that broke completed step checkmarks in the side…

1a7b513

… navigation

mssalvatore reviewed Jul 15, 2021

View reviewed changes

shreyamalviya reviewed Jul 15, 2021

View reviewed changes

VakarisZ added 2 commits July 16, 2021 08:52

Island UI: merge StandardLayoutComponent.js and DisabledSidebarLayout…

63f885e

…Component.tsx into one component to remove duplication

Island UI: improve Main.tsx readability and finish exporting of hard-…

4293673

…coded routes into an enum

VakarisZ force-pushed the ransomware_landing_page branch from 9c0a423 to 4293673 Compare July 16, 2021 07:40

Island UI: fix a bug that causes page refresh to redirect to getting …

6796845

…started page

VakarisZ mentioned this pull request Jul 16, 2021

Sort report tabs according to scenario #1332

Merged

mssalvatore approved these changes Jul 16, 2021

View reviewed changes

VakarisZ merged commit 5a2bb51 into develop Jul 16, 2021

VakarisZ deleted the ransomware_landing_page branch July 16, 2021 11:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Ransomware landing page #1326

Ransomware landing page #1326

Uh oh!

VakarisZ commented Jul 15, 2021

Uh oh!

codecov bot commented Jul 15, 2021 •

edited

Loading

Uh oh!

ilija-lazoroski Jul 15, 2021

Uh oh!

VakarisZ Jul 15, 2021

Uh oh!

ilija-lazoroski Jul 15, 2021

Uh oh!

VakarisZ Jul 15, 2021

Uh oh!

mssalvatore Jul 15, 2021 •

edited

Loading

Uh oh!

shreyamalviya left a comment

Uh oh!

Uh oh!

Uh oh!

shreyamalviya Jul 15, 2021

Uh oh!

shreyamalviya Jul 15, 2021

Uh oh!

VakarisZ Jul 16, 2021

Uh oh!

Uh oh!

Ransomware landing page #1326

Ransomware landing page #1326

Uh oh!

Conversation

VakarisZ commented Jul 15, 2021

What does this PR do?

PR Checklist

Testing Checklist

Screenshots:

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

ilija-lazoroski Jul 15, 2021

Choose a reason for hiding this comment

Uh oh!

VakarisZ Jul 15, 2021

Choose a reason for hiding this comment

Uh oh!

ilija-lazoroski Jul 15, 2021

Choose a reason for hiding this comment

Uh oh!

VakarisZ Jul 15, 2021

Choose a reason for hiding this comment

Uh oh!

mssalvatore Jul 15, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shreyamalviya left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

shreyamalviya Jul 15, 2021

Choose a reason for hiding this comment

Uh oh!

shreyamalviya Jul 15, 2021

Choose a reason for hiding this comment

Uh oh!

VakarisZ Jul 16, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov bot commented Jul 15, 2021 •

edited

Loading

mssalvatore Jul 15, 2021 •

edited

Loading