Solves External IP issue for the monkey Island #510

shivank1234 · 2019-12-16T13:50:38Z

What is this?

Fixes #467

Now , we can pass multiple External IP's of the Monkey Island Server to the monkey so that after breaching the host can connect back even if it is outside local LAN of the Monkey Island.

Checklist

Have you added an explanation of what your changes do and why you'd like to include them?
Have you successfully tested your changes locally?
Is the TravisCI build passing?

Proof that it works

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

Changes

Are the commit messages enough? If not, elaborate.

Syncing my Fork

VakarisZ · 2019-12-16T14:05:48Z

monkey/infection_monkey/monkey.py

@@ -79,12 +79,24 @@ def initialize(self):
        self._network = NetworkScanner()
        self._dropper_path = sys.argv[0]

+        server_num=0     
+        secondary_servers= len(self._args) 


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.

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

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

VakarisZ · 2019-12-16T14:08:58Z

monkey/infection_monkey/monkey.py

+            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])


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?

VakarisZ

Address my comments. Make sure to format code according to PEP8 (in pycharm alt+ctl+l). Lastly, make sure we can pass a list of servers trough configuration (UI)

danielguardicore · 2020-01-16T18:25:21Z

@shivank1234 do you intend to fix this?

shivank1234 · 2020-01-17T05:02:04Z

Ya, Currently working on it..
Sorry ,A Noobie
It is taking more time to fix...

ShayNehmad · 2020-01-20T11:30:57Z

Take your time @shivank1234. Feel free to reach out in Slack if you need advice 😇

update my fork

Updating Local Fork

VakarisZ · 2020-04-07T12:45:24Z

monkey/infection_monkey/monkey.py

@@ -72,7 +72,7 @@ def initialize(self):
        arg_parser = argparse.ArgumentParser()
        arg_parser.add_argument('-p', '--parent')
        arg_parser.add_argument('-t', '--tunnel')
-        arg_parser.add_argument('-s', '--server')
+        arg_parser.add_argument('-s', '--server',nargs = '+')


missing space after comma

VakarisZ · 2020-04-07T12:50:59Z

monkey/infection_monkey/monkey.py

-                WormConfiguration.command_servers.insert(0, self._default_server)
-            else:
-                LOG.debug("Default server: %s is already in command servers list" % self._default_server)
+           if self._default_server[0] not in WormConfiguration.command_servers:


This variable needs to be renamed to default_servers. Also, what does this if achieve?

Won't it break other fn which are using default_server as an attribute...?

VakarisZ · 2020-04-07T12:54:04Z

monkey/infection_monkey/monkey.py

+                LOG.debug("Default server: %s is already in command servers list" % self._default_server[0])
+           server_num=server_num+1
+
+        while server_num<(secondary_servers):


missing spaces around <

VakarisZ · 2020-04-07T12:54:46Z

monkey/infection_monkey/monkey.py

+           server_num=server_num+1
+
+        while server_num<(secondary_servers):
+           if self._default_server[server_num ] not in WormConfiguration.command_servers:


how is different from if on line 93?

Corrected ,Thx

Updating Local FOrk

codecov · 2020-04-21T13:12:31Z

Codecov Report

Merging #510 into develop will decrease coverage by 0.04%.
The diff coverage is 33.33%.

@@             Coverage Diff             @@
##           develop     #510      +/-   ##
===========================================
- Coverage    57.60%   57.56%   -0.05%     
===========================================
  Files          116      116              
  Lines         3892     3895       +3     
===========================================
  Hits          2242     2242              
- Misses        1650     1653       +3

Impacted Files	Coverage Δ
monkey/infection_monkey/config.py	`63.63% <20.00%> (-1.59%)`	⬇️
monkey/infection_monkey/model/host.py	`45.71% <100.00%> (-0.24%)`	⬇️

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 f3ec436...322036f. Read the comment docs.

monkey/infection_monkey/exploit/tools/helpers.py

VakarisZ · 2020-04-22T08:32:16Z

monkey/infection_monkey/monkey.py

@@ -72,26 +72,31 @@ def initialize(self):
        arg_parser = argparse.ArgumentParser()
        arg_parser.add_argument('-p', '--parent')
        arg_parser.add_argument('-t', '--tunnel')
-        arg_parser.add_argument('-s', '--server')
+        arg_parser.add_argument('-s', '--server', nargs = '+')


change --server to --servers. Same in dropper.py

monkey/infection_monkey/monkey.py

monkey/infection_monkey/exploit/tools/helpers.py

monkey/infection_monkey/monkey.py

monkey/infection_monkey/exploit/tools/helpers.py

VakarisZ · 2020-04-23T09:13:55Z

monkey/infection_monkey/model/host.py

@@ -9,7 +9,7 @@ def __init__(self, ip_addr, domain_name=''):
        self.services = {}
        self.monkey_exe = None
        self.default_tunnel = None
-        self.default_server = None
+        self.server_list = None


We renamed this field because we are going to set it to a list of servers instead of a single server. My two questions to you (which are related) is what VictimHost class has to do with our change and did you also rename the usages of this property?

VakarisZ · 2020-04-23T09:30:25Z

monkey/infection_monkey/monkey.py

@@ -86,12 +86,17 @@ def initialize(self):
        self._network = NetworkScanner()
        self._dropper_path = sys.argv[0]

+        server_num=0     
+        server_count = len(self._default_server)


Doesn't make sense from readability perspective. If _default_server is in fact multiple servers we should rename it to _default_servers

monkey/infection_monkey/monkey.py

VakarisZ

Good job but still not finished. You still need to edit build_monkey_commandline() and dropper.py

Co-authored-by: VakarisZ <[email protected]>

Updating my Local Fork

monkey/infection_monkey/dropper.py

monkey/infection_monkey/monkey.py

VakarisZ · 2020-05-04T06:40:37Z

monkey/infection_monkey/monkey.py

+
+        if self._default_servers:
+         while server_num < (server_count):
+           if self._default_servers[server_num ] not in WormConfiguration.command_servers:


Isn't WormConfiguration.command_servers empty/contains default values at this point? Why don't you use list comprehension then?

monkey/infection_monkey/monkey.py

VakarisZ

Good job, but we still could do some minor improvements

VakarisZ · 2020-05-04T08:46:35Z

monkey/infection_monkey/monkey.py

+        def_server_list = [ def_server for def_server in WormConfiguration.command_servers ]
+        WormConfiguration.command_servers = [ server for server in self._default_servers ]


Why do you use list comprehension instead of simple assignment. what's the difference between def_server_list = [ def_server for def_server in WormConfiguration.command_servers ] and def_server_list = WormConfiguration.command_servers?

Sry, Had a silly doubt,Corrected

Updating Local Fork

…develop

shivank1234 · 2020-05-21T13:56:59Z

PR is merge ready and can be merged at maintainer's discretion.

VakarisZ · 2020-05-21T14:29:31Z

We need to do same changes in our bootloader before merging this.

shivank1234 added 2 commits December 16, 2019 14:23

Merge pull request #2 from guardicore/develop

70e4d18

Syncing my Fork

External IP Patch

81cc196

VakarisZ reviewed Dec 16, 2019

View reviewed changes

VakarisZ requested changes Dec 16, 2019

View reviewed changes

ShayNehmad assigned shivank1234 Jan 20, 2020

ShayNehmad added Island Feature Issue that describes a new feature to be implemented. labels Jan 20, 2020

shivank1234 added 3 commits January 23, 2020 13:21

Merge pull request #3 from guardicore/develop

2fe4457

update my fork

Merge pull request #4 from guardicore/develop

73be2fa

Updating Local Fork

Pre-Final Patch

b820eb0

VakarisZ reviewed Apr 7, 2020

View reviewed changes

Merge pull request #5 from guardicore/develop

87d5955

Updating Local FOrk

shivank1234 added 2 commits April 21, 2020 18:48

1

398d714

Pre-Final Patch 2

eb61651

VakarisZ reviewed Apr 22, 2020

View reviewed changes

monkey/infection_monkey/exploit/tools/helpers.py Outdated Show resolved Hide resolved

VakarisZ reviewed Apr 22, 2020

View reviewed changes

monkey/infection_monkey/monkey.py Outdated Show resolved Hide resolved

VakarisZ reviewed Apr 22, 2020

View reviewed changes

monkey/infection_monkey/monkey.py Outdated Show resolved Hide resolved

VakarisZ reviewed Apr 22, 2020

View reviewed changes

monkey/infection_monkey/exploit/tools/helpers.py Outdated Show resolved Hide resolved

VakarisZ reviewed Apr 22, 2020

View reviewed changes

monkey/infection_monkey/exploit/tools/helpers.py Outdated Show resolved Hide resolved

VakarisZ reviewed Apr 22, 2020

View reviewed changes

monkey/infection_monkey/monkey.py Outdated Show resolved Hide resolved

Pre Final Patch-3

9613b21

VakarisZ reviewed Apr 23, 2020

View reviewed changes

monkey/infection_monkey/monkey.py Outdated Show resolved Hide resolved

VakarisZ reviewed Apr 23, 2020

View reviewed changes

monkey/infection_monkey/exploit/tools/helpers.py Outdated Show resolved Hide resolved

VakarisZ reviewed Apr 23, 2020

View reviewed changes

Final Patch 1

e0c70e2

VakarisZ reviewed Apr 27, 2020

View reviewed changes

monkey/infection_monkey/monkey.py Outdated Show resolved Hide resolved

VakarisZ reviewed Apr 27, 2020

View reviewed changes

monkey/infection_monkey/monkey.py Outdated Show resolved Hide resolved

VakarisZ requested changes Apr 27, 2020

View reviewed changes

shivank1234 and others added 4 commits May 1, 2020 16:54

Update monkey/infection_monkey/monkey.py

143d1ff

Co-authored-by: VakarisZ <[email protected]>

Update monkey/infection_monkey/monkey.py

38f912a

Co-authored-by: VakarisZ <[email protected]>

Merge pull request #6 from guardicore/develop

db04abc

Updating my Local Fork

Final Patch2

eb04e5c

VakarisZ reviewed May 4, 2020

View reviewed changes

monkey/infection_monkey/dropper.py Outdated Show resolved Hide resolved

VakarisZ reviewed May 4, 2020

View reviewed changes

monkey/infection_monkey/monkey.py Outdated Show resolved Hide resolved

VakarisZ reviewed May 4, 2020

View reviewed changes

monkey/infection_monkey/monkey.py Show resolved Hide resolved

VakarisZ requested changes May 4, 2020

View reviewed changes

shivank1234 added 2 commits May 4, 2020 13:57

Final Patch 3

0765d33

Final Patch 4

318f9e8

VakarisZ reviewed May 4, 2020

View reviewed changes

shivank1234 added 4 commits May 4, 2020 16:20

Final Patch 5

14b5b68

Merge pull request #7 from guardicore/develop

c2f56e0

Updating Local Fork

Merge branch 'develop' of https://github.com/shivank1234/monkey into …

81b6dfd

…develop

Final Patch 5

322036f

This was referenced Aug 17, 2020

'Run Monkey' on remote PCs Powershell UI #505

Open

Improve "Run monkey" page UI. #792

Closed

acepace closed this Nov 30, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Solves External IP issue for the monkey Island #510

Solves External IP issue for the monkey Island #510

shivank1234 commented Dec 16, 2019

VakarisZ Dec 16, 2019

shivank1234 Dec 17, 2019

VakarisZ Apr 7, 2020

shivank1234 Apr 7, 2020

VakarisZ Dec 16, 2019

VakarisZ left a comment

danielguardicore commented Jan 16, 2020

shivank1234 commented Jan 17, 2020

ShayNehmad commented Jan 20, 2020

VakarisZ Apr 7, 2020

shivank1234 Apr 7, 2020

VakarisZ Apr 7, 2020

shivank1234 Apr 7, 2020

VakarisZ Apr 7, 2020

VakarisZ Apr 7, 2020

shivank1234 Apr 7, 2020

codecov bot commented Apr 21, 2020 •

edited

Loading

VakarisZ Apr 22, 2020

VakarisZ Apr 23, 2020

VakarisZ Apr 23, 2020

VakarisZ left a comment

VakarisZ May 4, 2020

VakarisZ left a comment

VakarisZ May 4, 2020

shivank1234 May 4, 2020

shivank1234 commented May 21, 2020

VakarisZ commented May 21, 2020

		def_server_list = [ def_server for def_server in WormConfiguration.command_servers ]
		WormConfiguration.command_servers = [ server for server in self._default_servers ]

Solves External IP issue for the monkey Island #510

Solves External IP issue for the monkey Island #510

Conversation

shivank1234 commented Dec 16, 2019

What is this?

Checklist

Proof that it works

Changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VakarisZ left a comment

Choose a reason for hiding this comment

danielguardicore commented Jan 16, 2020

shivank1234 commented Jan 17, 2020

ShayNehmad commented Jan 20, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Apr 21, 2020 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VakarisZ left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VakarisZ left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shivank1234 commented May 21, 2020

VakarisZ commented May 21, 2020

codecov bot commented Apr 21, 2020 •

edited

Loading