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.

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

1888 rename monkey endpoint #1893

Merged
merged 5 commits into from
Apr 19, 2022
Merged

Conversation

ilija-lazoroski
Copy link
Contributor

@ilija-lazoroski ilija-lazoroski commented Apr 15, 2022

What does this PR do?

Fixes #1888 .
Renames api/monkey to api/agent

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 on AWS, running manual commands, ssh exploit and some manual tests

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

Explain Changes

Are the commit messages enough? If not, elaborate.

@codecov
Copy link

codecov bot commented Apr 15, 2022

Codecov Report

Merging #1893 (ab24bf0) into develop (e9895a0) will increase coverage by 0.09%.
The diff coverage is 33.33%.

@@             Coverage Diff             @@
##           develop    #1893      +/-   ##
===========================================
+ Coverage    54.89%   54.98%   +0.09%     
===========================================
  Files          447      447              
  Lines        12655    12683      +28     
===========================================
+ Hits          6947     6974      +27     
- Misses        5708     5709       +1     
Impacted Files Coverage Δ
monkey/infection_monkey/control.py 28.68% <ø> (ø)
...fection_monkey/exploit/caching_agent_repository.py 60.00% <ø> (ø)
monkey/infection_monkey/master/control_channel.py 36.58% <ø> (ø)
monkey/monkey_island/cc/resources/monkey.py 20.77% <ø> (ø)
monkey/monkey_island/cc/services/remote_run_aws.py 53.84% <0.00%> (+7.69%) ⬆️
monkey/monkey_island/cc/app.py 74.34% <100.00%> (-2.90%) ⬇️
..._collectors/mimikatz_collector/pypykatz_handler.py 75.00% <0.00%> (+5.00%) ⬆️

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 e9895a0...ab24bf0. Read the comment docs.

@ilija-lazoroski ilija-lazoroski marked this pull request as ready for review April 18, 2022 11:54
@ilija-lazoroski ilija-lazoroski requested review from mssalvatore and shreyamalviya and removed request for mssalvatore April 18, 2022 11:55
Comment on lines 134 to 138
+ r":5000/api/agent/download/linux "
+ r"-O monkey-linux-"
+ bit_text
+ r"; chmod +x monkey-linux-"
+ bit_text
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need bit_text here anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think so. I have assumed that this is not the task to remove that..

Copy link
Contributor

@shreyamalviya shreyamalviya Apr 18, 2022

Choose a reason for hiding this comment

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

It's removed in the windows function in this file. Might as well remove it here too.

@mssalvatore mssalvatore merged commit 587331d into develop Apr 19, 2022
@mssalvatore mssalvatore deleted the 1888-rename-monkey-endpoint branch April 19, 2022 11:37
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.

Fix endpoint naming
4 participants