Skip to content

Conversation

VakarisZ
Copy link
Contributor

What does this PR do?

Fixes #957

Add any further explanations here.

PR Checklist

  • Is the TravisCI build passing?
  • Was the CHANGELOG.md updated to reflect the changes?
  • Was the documentation framework updated to reflect the changes?
  • Have you checked that you haven't introduced any duplicate code?

Testing Checklist

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

    Tested by running manually, going through all the cases and UI states

  • If applicable, add screenshots or log transcripts of the feature working
    reset_done
    reset_idle
    still_running

Collection name properties are useful for queries related to these specific collections
This endpoint allows to delete the data gathered by agents without resetting config related databases
New modal allows to save clicks, explains the situation better, offers to export the config and allows deleting agent data without deleting config
@codecov
Copy link

codecov bot commented Apr 21, 2022

Codecov Report

Merging #1909 (ab46525) into develop (704cc8c) will decrease coverage by 0.38%.
The diff coverage is 53.84%.

❗ Current head ab46525 differs from pull request most recent head 193bcdb. Consider uploading reports for the commit 193bcdb to get more accurate results

@@             Coverage Diff             @@
##           develop    #1909      +/-   ##
===========================================
- Coverage    54.90%   54.52%   -0.39%     
===========================================
  Files          446      446              
  Lines        12637    12848     +211     
===========================================
+ Hits          6938     7005      +67     
- Misses        5699     5843     +144     
Impacted Files Coverage Δ
monkey/monkey_island/cc/resources/root.py 50.00% <0.00%> (-4.55%) ⬇️
monkey/monkey_island/cc/services/database.py 80.00% <55.55%> (-8.47%) ⬇️
monkey/monkey_island/cc/models/config.py 100.00% <100.00%> (ø)
...onkey/monkey_island/cc/models/island_mode_model.py 100.00% <100.00%> (ø)
monkey/infection_monkey/monkey.py 0.00% <0.00%> (ø)
monkey/infection_monkey/model/__init__.py 100.00% <0.00%> (ø)
...imikatz_collector/mimikatz_credential_collector.py 100.00% <0.00%> (ø)
monkey/common/cmd/cmd_runner.py 31.88% <0.00%> (+1.37%) ⬆️
...ost_breach/actions/communicate_as_backdoor_user.py 64.86% <0.00%> (+1.40%) ⬆️
.../credential_store/aggregating_credentials_store.py 89.58% <0.00%> (+2.08%) ⬆️
... and 2 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 704cc8c...193bcdb. Read the comment docs.

Copy link
Collaborator

@mssalvatore mssalvatore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just two small things.

To exit a scenario and select another one, click on "Start Over".

To exit a scenario and select another one, click on "Reset".
<!--- TODO fix the screenshot --->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just fix it instead of leaving a TODO?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I left this here because I knew I'll forget this :D

!props.allMonkeysAreDead ?
<div className='alert alert-warning'>
<FontAwesomeIcon icon={faExclamationTriangle} style={{'marginRight': '5px'}}/>
Can't reset the Island while Monkey agents are still running!
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Can't reset the Island while Monkey agents are still running!
Please stop all running agents before attempting to reset the Island.

@VakarisZ VakarisZ merged commit b9efc2d into develop Apr 22, 2022
@VakarisZ VakarisZ deleted the 957-island-reset-improvements branch April 22, 2022 07:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Start Over" but keep configuration
3 participants