Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Run page ui improvements #840

Merged
merged 19 commits into from
Sep 28, 2020
Merged

Run page ui improvements #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5eaed08
Basic structure of run monkey page step by step wizard
VakarisZ Aug 21, 2020
5226442
Added command display component and tabs to it
VakarisZ Aug 24, 2020
0d047b2
More work and styling of monkey run page components
VakarisZ Aug 25, 2020
e42c4a0
More work and styling of monkey run page components
VakarisZ Aug 25, 2020
d8a0a6d
More work on Run monkey page
VakarisZ Aug 31, 2020
0471229
Small os_compat readme improvement: added default debian login info
VakarisZ Aug 31, 2020
c4f4a8e
Refactored UI of run monkey page
VakarisZ Sep 18, 2020
38b1cfa
Removed not working "Back" button from run monkey page, also removed …
VakarisZ Sep 18, 2020
ac9c04e
Merge remote-tracking branch 'origin/run_page_ui_improvements' into r…
VakarisZ Sep 18, 2020
6eab147
Merge remote-tracking branch 'upstream/develop' into run_page_ui_impr…
VakarisZ Sep 18, 2020
5331095
Removed unused function
VakarisZ Sep 18, 2020
3c410d6
Fixed conflicting dependencies that require botocore >= 1.18.0
VakarisZ Sep 18, 2020
4d87514
Revert "Fixed conflicting dependencies that require botocore >= 1.18.0"
VakarisZ Sep 18, 2020
dcf1b49
Fixed conflicting dependencies that require botocore >= 1.18.0
VakarisZ Sep 18, 2020
62708cf
Fixed es-lint warnings and increased upper warning limit
VakarisZ Sep 18, 2020
6e10dd2
Run monkey page: fixed a bunch of bugs, CR comments
VakarisZ Sep 23, 2020
c5e4493
Improved run monkey error modal to display any kind of error.
VakarisZ Sep 23, 2020
12e7c40
Increased js warning limit to 7, because I used ` for classnames.
VakarisZ Sep 23, 2020
1559504
Fixed js warning in error modal
VakarisZ Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ script:
- cd monkey_island/cc/ui
- npm ci # See https://docs.npmjs.com/cli/ci.html
- eslint ./src --quiet # Test for errors
- JS_WARNINGS_AMOUNT_UPPER_LIMIT=4
- JS_WARNINGS_AMOUNT_UPPER_LIMIT=7
- eslint ./src --max-warnings $JS_WARNINGS_AMOUNT_UPPER_LIMIT # Test for max warnings

# Build documentation
Expand Down
1 change: 1 addition & 0 deletions envs/os_compatibility/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ A quick reference for usernames on different machines (if in doubt check officia
- Ubuntu: ubuntu
- Oracle: clckwrk
- CentOS: centos
- Debian: admin
- Everything else: ec2-user

To manually verify the machine is compatible use commands to download and execute the monkey.
Expand Down
2 changes: 1 addition & 1 deletion monkey/monkey_island/cc/resources/local_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def run_local_monkey():
logger.error('popen failed', exc_info=True)
return False, "popen failed: %s" % exc

return True, "pis: %s" % pid
return True, ""


class LocalRun(flask_restful.Resource):
Expand Down
4 changes: 2 additions & 2 deletions monkey/monkey_island/cc/ui/src/components/Main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Container} from 'react-bootstrap';

import RunServerPage from 'components/pages/RunServerPage';
import ConfigurePage from 'components/pages/ConfigurePage';
import RunMonkeyPage from 'components/pages/RunMonkeyPage';
import RunMonkeyPage from 'components/pages/RunMonkeyPage/RunMonkeyPage';
import MapPage from 'components/pages/MapPage';
import TelemetryPage from 'components/pages/TelemetryPage';
import StartOverPage from 'components/pages/StartOverPage';
Expand All @@ -30,7 +30,7 @@ const reportZeroTrustRoute = '/report/zeroTrust';

class AppComponent extends AuthComponent {
updateStatus = () => {
if (this.state.isLoggedIn === false){
if (this.state.isLoggedIn === false) {
return
}
this.auth.loggedIn()
Expand Down
Loading