p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity
10,243 Commits 31 Branches 20 Tags 48 MiB
Commit Graph

10243 Commits

Author SHA1 Message Date
Mike Salvatore 9f5aa5a055 Agent: Drop DEFAULT_DISCONNECT_TIMEOUT to 2 minutes 
Agents should be sending data back to the island very frequently. 2
minutes should be plenty.

Consider adding a heartbeat and reducing this timeout further.
 2022-09-09 08:13:02 -04:00
Kekoa Kaaikala 0b27e12b0f Merge pull request #2249 from guardicore/2216-wait-for-relay-users-to-disconnect 
Agent: Wait for relay users to disconnect
 2022-09-09 08:13:02 -04:00
Mike Salvatore 5a83401a02 Agent: Add RelayUserHandler._remove_expired_users() 2022-09-09 08:13:02 -04:00
Mike Salvatore e2736a9273 Agent: Lock RelayUserHandler.has_*_users() 2022-09-09 08:13:02 -04:00
Kekoa Kaaikala 90dcb0a91e Agent: Wait for relay users to disconnect 2022-09-09 08:13:02 -04:00
Mike Salvatore 4bff110f35 Merge branch '2216-add-tcprelay' into tcp-relay 
PR #2231
 2022-09-09 08:12:50 -04:00
Mike Salvatore ee262778de Merge pull request #2243 from guardicore/2216-pass-servers-to-exploiters 
2216 pass servers to exploiters
 2022-09-09 08:07:24 -04:00
Mike Salvatore f16f111543 Merge pull request #2242 from guardicore/2216-modify-agent-build-commands 
2216 modify agent build commands
 2022-09-09 08:07:24 -04:00
Ilija Lazoroski 4fca8ccf5d UT: Fix credentials passed to exploiter test 2022-09-09 08:07:24 -04:00
Mike Salvatore 579616dd91 Merge pull request #2241 from guardicore/2216-modify-agent-command-line-arguments 
Agent: Modify command line arguments to accept list of servers
 2022-09-09 08:07:24 -04:00
Ilija Lazoroski 067d50f3c4 Agent: Modify agent build command line to accept list of servers 2022-09-09 08:07:24 -04:00
Ilija Lazoroski f93125f671 Agent: Pass servers when running exploits in Puppet 2022-09-09 08:07:24 -04:00
Ilija Lazoroski e842c45e42 Agent: Add list of servers to dropper 2022-09-09 08:07:24 -04:00
Ilija Lazoroski ddc4f4d836 Agent: Remove tunnel from aget build command functions 2022-09-09 08:07:24 -04:00
Ilija Lazoroski c51217507a Agent: Pass servers to exploit_host in ExploiterWrapper.Inner 2022-09-09 08:07:24 -04:00
Ilija Lazoroski 33f20c7da0 Agent: Remove tunnel argument from dropper 2022-09-09 08:07:24 -04:00
Ilija Lazoroski 4ad2c35c94 UT: Remove tunnel from build_monkey_commandline 2022-09-09 08:07:24 -04:00
Ilija Lazoroski 8fc0d52b8b Agent: Pass list of servers in HostExploiter.exploit_host 2022-09-09 08:07:24 -04:00
Ilija Lazoroski 0f73cc91f2 Changelog: Add entry for changing "-s/--server" to "-s/--servers" 2022-09-09 08:07:24 -04:00
Ilija Lazoroski b2f0b54d37 Agent: Add list of server when propagating 2022-09-09 08:07:24 -04:00
Mike Salvatore 1776b3b0b7 Agent: Modify exception message when server connection fails 2022-09-09 08:07:24 -04:00
Ilija Lazoroski f104f31dcd Agent: Pass list of servers to Exploiter.exploit_hosts 2022-09-09 08:07:24 -04:00
Ilija Lazoroski c9a9367dd1 Changelog: Change -s/--servers to accept list of servers 2022-09-09 08:07:24 -04:00
Ilija Lazoroski 8b2107d197 Agent: Accept list of servers in AutomatedMaster 2022-09-09 08:07:24 -04:00
Ilija Lazoroski c44a0406ee Changelog: Add entry for removing -t/--tunnel from agent command line arguments 2022-09-09 08:07:24 -04:00
Ilija Lazoroski a79b579cdc Agent: Construct AutomatedMaster with list of servers 2022-09-09 08:07:24 -04:00
Ilija Lazoroski ba187ed830 Agent: Modify command line arguments to accept list of servers 
Removes tunnel argument
 2022-09-09 08:07:24 -04:00
Ilija Lazoroski e6b0e43580 UT: Fix Powershell unit tests to accept list of servers 2022-09-09 08:07:24 -04:00
Ilija Lazoroski 42de7140f3 Agent: Modify exploiters to use list of servers 2022-09-09 08:07:24 -04:00
Ilija Lazoroski 95ea5e481e Agent: Accept list of servers in HostExploiter 2022-09-09 08:07:24 -04:00
Ilija Lazoroski e4d49f5a12 Agent: Add servers list to ExploiterWrapper 2022-09-09 08:07:24 -04:00
Mike Salvatore d009bc458c Island: Import TypeAlias from typing_extensions in node.py 2022-09-07 11:15:07 -04:00
Mike Salvatore fa8a72dc86 Island: Remove unused import from node.py 2022-09-07 11:13:06 -04:00
Mike Salvatore 0310c737d7 UT: Remove unused imports from test_node.py 2022-09-07 11:12:30 -04:00
Mike Salvatore 588b740970
Merge pull request #2253 from guardicore/2217-remove-marshmallow 
2217 remove marshmallow
 2022-09-07 10:57:29 -04:00
Mike Salvatore 68bc73d86a Merge branch 'i-node-repository' into develop 2022-09-07 10:25:00 -04:00
Mike Salvatore 4e4e4cf97d Island: Export INodeRepository from monkey_island.cc.repository 2022-09-07 10:22:54 -04:00
Mike Salvatore 5f874356b1 Island: Remove INetworkMapRepository 
Replaced by monkey_island.cc.models.Node and INodeRepository
 2022-09-07 10:22:54 -04:00
Mike Salvatore 8c69780f4e Island: Add INodeRepository 2022-09-07 10:22:54 -04:00
Mike Salvatore 35ecdb11ab Island: Add docstrings to Node model 2022-09-07 10:22:52 -04:00
Mike Salvatore 094a0b1a8d Island: Use Mapping for tracking node connections 2022-09-07 10:21:51 -04:00
VakarisZ 6891c82a46
Merge pull request #2252 from guardicore/2217-remove-unused-code 
2217 remove unused code
 2022-09-07 16:58:42 +03:00
vakaris_zilius f0b50b254e Island: Refactor simulation to use pydantic 2022-09-07 13:48:19 +00:00
Ilija Lazoroski 6fe501195b Island: Remove marshmallow-enum from Pipfile 2022-09-07 15:33:09 +02:00
Ilija Lazoroski 6fb77694ef Island: Remove marshmallow from Pipfile 2022-09-07 15:31:51 +02:00
Ilija Lazoroski 62982459b0 Agent: Remove marshmallow-enum from Pipfile 2022-09-07 15:30:17 +02:00
Ilija Lazoroski 8aad9701cd Agent: Remove marshmallow for Pipfile 2022-09-07 15:28:18 +02:00
vakaris_zilius 895de8c720 Common: Delete IJSONSerializable.py 
This interface is no longer used (replaced by pydantic objects)
 2022-09-07 13:19:39 +00:00
vakaris_zilius b7e6435ced UI: Delete InternalConfig.js 
This is no longer used, advanced tab only contains a couple of fields now
 2022-09-07 13:17:01 +00:00
vakaris_zilius c73fe7a3a9 Island: Remove unused CustomJSONEncoder 
This is replaced by APIEncoder in representations.py
 2022-09-07 13:16:57 +00:00