-
Notifications
You must be signed in to change notification settings - Fork 795
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
1996 island worm config decouple #2017
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #2017 +/- ##
===========================================
- Coverage 56.81% 56.80% -0.01%
===========================================
Files 462 463 +1
Lines 12810 12822 +12
===========================================
+ Hits 7278 7284 +6
- Misses 5532 5538 +6
Continue to review full report at Codecov.
|
monkey/monkey_island/cc/services/attack/technique_reports/T1065.py
Outdated
Show resolved
Hide resolved
""" | ||
local_ips = local_ip_addresses() | ||
|
||
return {"ip_addresses": local_ips} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
return {"ip_addresses": local_ips} | |
return local_ips |
Since this is a collection, we can just return a list.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can't do that without changes to monkey/monkey_island/cc/services/representations.py:normalize_object
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'll have to fix that at some point, but now probably isn't the time. The :return:
in the docstring is wrong, though.
* It removes whole island_server section from internal config
* leftover from renaming credential_classes
* adds get_tunnel_info in monkey model
@@ -14,6 +14,9 @@ class T1065(AttackTechnique): | |||
|
|||
@staticmethod | |||
def get_report_data(): | |||
port = ConfigService.get_config_value(CURRENT_SERVER_PATH).split(":")[1] | |||
monkey = Monkey.objects.first() | |||
tunnel = monkey.get_tunnel_info()["tunnel"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm fixing this now
Non standard ports attack technique should include ports agent used for tunneling
3253502
to
5fbe01a
Compare
34fa56d
to
5817fbd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved, but fix the docstring for the ip_addresses
endpoint.
5817fbd
to
0082cd2
Compare
What does this PR do?
Fixes #1996.
Add any further explanations here.
PR Checklist
Testing Checklist
Explain Changes
Are the commit messages enough? If not, elaborate.