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

Solves External IP issue for the monkey Island #510

Closed
wants to merge 20 commits into from
Closed

Solves External IP issue for the monkey Island #510

Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
70e4d18
Merge pull request #2 from guardicore/develop
shivank1234 Dec 16, 2019
81cc196
External IP Patch
shivank1234 Dec 16, 2019
2fe4457
Merge pull request #3 from guardicore/develop
shivank1234 Jan 23, 2020
73be2fa
Merge pull request #4 from guardicore/develop
shivank1234 Apr 6, 2020
b820eb0
Pre-Final Patch
shivank1234 Apr 7, 2020
87d5955
Merge pull request #5 from guardicore/develop
shivank1234 Apr 21, 2020
398d714
1
shivank1234 Apr 21, 2020
eb61651
Pre-Final Patch 2
shivank1234 Apr 21, 2020
9613b21
Pre Final Patch-3
shivank1234 Apr 23, 2020
e0c70e2
Final Patch 1
shivank1234 Apr 26, 2020
143d1ff
Update monkey/infection_monkey/monkey.py
shivank1234 May 1, 2020
38f912a
Update monkey/infection_monkey/monkey.py
shivank1234 May 1, 2020
db04abc
Merge pull request #6 from guardicore/develop
shivank1234 May 3, 2020
eb04e5c
Final Patch2
shivank1234 May 3, 2020
0765d33
Final Patch 3
shivank1234 May 4, 2020
318f9e8
Final Patch 4
shivank1234 May 4, 2020
14b5b68
Final Patch 5
shivank1234 May 4, 2020
c2f56e0
Merge pull request #7 from guardicore/develop
shivank1234 May 5, 2020
81b6dfd
Merge branch 'develop' of https://github.com/shivank1234/monkey into …
shivank1234 May 5, 2020
322036f
Final Patch 5
shivank1234 May 5, 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
14 changes: 13 additions & 1 deletion monkey/infection_monkey/monkey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,24 @@ def initialize(self):
self._network = NetworkScanner()
self._dropper_path = sys.argv[0]

server_num=0
shivank1234 marked this conversation as resolved.
Show resolved Hide resolved
secondary_servers= len(self._args)
Copy link
Contributor

Choose a reason for hiding this comment

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

not all command arguments are server ip's. Look above: there is -p for parrent argument, -t for tunnel argument and so on... I'm pretty sure this doesn't give you a number of servers passed with -s flag.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Noticed that.. Working on that ..
Thanks for your reviews .. :-)

Copy link
Contributor

Choose a reason for hiding this comment

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

This is not solve. Why is it called secondary_servers if it's argument list?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Corrected


if self._default_server:
if self._default_server not in WormConfiguration.command_servers:
LOG.debug("Added default server: %s" % self._default_server)
WormConfiguration.command_servers.insert(0, self._default_server)
WormConfiguration.command_servers.insert(server_num, self._default_server)
else:
LOG.debug("Default server: %s is already in command servers list" % self._default_server)
server_num=server_num+1

while server_num<(secondary_servers+1):
if self._args[server_num -1] not in WormConfiguration.command_servers:
LOG.debug("Added default server: %s" % self._args[server_num -1])
WormConfiguration.command_servers.insert(server_num, self._args[server_num-1])
else:
LOG.debug("Default server: %s is already in command servers list" % self._args[server_num-1])
Copy link
Contributor

Choose a reason for hiding this comment

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

Ok. So you add server IPs to command servers list. Can you verify that monkey tries all IPs in that list when connecting to server?

server_num=server_num+1

def start(self):
LOG.info("Monkey is running...")
Expand Down