Skip to content

1961 decouple dropper and wormconfig #1973

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
Merged
merged 7 commits into from
Jun 2, 2022
Merged

1961 decouple dropper and wormconfig #1973

merged 7 commits into from
Jun 2, 2022

Conversation

ilija-lazoroski
Copy link
Contributor

@ilija-lazoroski ilija-lazoroski commented May 31, 2022 •
edited
Loading

What does this PR do?

Fixes #1961 .

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?
  • 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 the Monkey locally with relevant config/running Island/...}

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

Explain Changes

Are the commit messages enough? If not, elaborate.

@ilija-lazoroski
Island, Agent: Move dropper option from WormConfiguration to consts
49654d4 
* Remove dropper_set_date, dropper_date_reference_path_windows
  dropper_date_reference_path_linux from internal config in the Island
* Remove all references to these options from data for tests
@ilija-lazoroski
Agent: Decouple dropper target paths from the config
b8e943f 
* Dropper target paths are now part of infection_monkey.model
@ilija-lazoroski
Island: Remove dropper target paths from the config
f7c2e90
@codecov
Copy link

codecov bot commented May 31, 2022 •
edited
Loading

Codecov Report

Merging #1973 (09958c2) into develop (1bfffb0) will increase coverage by 0.06%.
The diff coverage is 35.71%.

@@             Coverage Diff             @@
##           develop    #1973      +/-   ##
===========================================
+ Coverage    56.44%   56.50%   +0.06%     
===========================================
  Files          461      463       +2     
  Lines        13006    12986      -20     
===========================================
- Hits          7341     7338       -3     
+ Misses        5665     5648      -17
Impacted Files Coverage Δ
monkey/infection_monkey/config.py 35.29% <ø> (-6.82%) ⬇️
monkey/infection_monkey/dropper.py 0.00% <0.00%> (ø)
monkey/infection_monkey/exploit/hadoop.py 0.00% <0.00%> (ø)
monkey/infection_monkey/exploit/log4shell.py 0.00% <0.00%> (ø)
monkey/infection_monkey/exploit/mssqlexec.py 0.00% <0.00%> (ø)
monkey/infection_monkey/exploit/smbexec.py 0.00% <0.00%> (ø)
monkey/infection_monkey/exploit/web_rce.py 0.00% <0.00%> (ø)
monkey/infection_monkey/exploit/wmiexec.py 0.00% <0.00%> (ø)
monkey/monkey_island/cc/services/config.py 82.94% <ø> (-0.10%) ⬇️
...onkey_island/cc/services/config_schema/internal.py 100.00% <ø> (ø)
... and 35 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 b3710e4...09958c2. Read the comment docs.

shreyamalviya
shreyamalviya reviewed May 31, 2022
View reviewed changes
VakarisZ
VakarisZ reviewed May 31, 2022
View reviewed changes
VakarisZ
VakarisZ reviewed May 31, 2022
View reviewed changes
@VakarisZ
Copy link
Contributor

Looks good, except fix the comments

mssalvatore
mssalvatore reviewed May 31, 2022
View reviewed changes
VakarisZ and others added 3 commits June 1, 2022 13:04
@VakarisZ
Agent: Separate dropper path from agent binary path
711cab5
@ilija-lazoroski
Agent: Fix dropper date referencing
8ef0b44 
* Make dropper date reference path from strings to Path objects
* Fix try/except block logic and indentation
@ilija-lazoroski
Agent: Rename get_agent_dest_path to get_agent_dst_path
e4a2a54
mssalvatore
mssalvatore reviewed Jun 1, 2022
View reviewed changes
mssalvatore
mssalvatore reviewed Jun 1, 2022
View reviewed changes
mssalvatore
mssalvatore reviewed Jun 1, 2022
View reviewed changes
@ilija-lazoroski ilija-lazoroski force-pushed the 1961-decouple-dropper-and-wormconfig branch from 57b694d to 015ff8a Compare June 1, 2022 16:05
mssalvatore
mssalvatore approved these changes Jun 1, 2022
View reviewed changes
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.

Approved pending testing.

@ilija-lazoroski ilija-lazoroski force-pushed the 1961-decouple-dropper-and-wormconfig branch from 015ff8a to 5555ffb Compare June 1, 2022 16:43
@ilija-lazoroski ilija-lazoroski marked this pull request as ready for review June 1, 2022 16:55
@ilija-lazoroski ilija-lazoroski force-pushed the 1961-decouple-dropper-and-wormconfig branch from 5555ffb to f13a25d Compare June 1, 2022 17:05
@ilija-lazoroski ilija-lazoroski force-pushed the 1961-decouple-dropper-and-wormconfig branch from f13a25d to 09958c2 Compare June 2, 2022 09:01
@ilija-lazoroski ilija-lazoroski merged commit 0baacf3 into develop Jun 2, 2022
@ilija-lazoroski ilija-lazoroski deleted the 1961-decouple-dropper-and-wormconfig branch June 2, 2022 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VakarisZ VakarisZ VakarisZ left review comments

@shreyamalviya shreyamalviya shreyamalviya left review comments

@mssalvatore mssalvatore mssalvatore approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Decouple the dropper and the WormConfiguration
4 participants
@ilija-lazoroski @VakarisZ @mssalvatore @shreyamalviya