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

1537 send log to server #1584

Merged
merged 4 commits into from
Nov 15, 2021
Merged

1537 send log to server #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c43cfe4
Agent: Always send log to server
ilija-lazoroski Nov 12, 2021
00f4f19
Island: Remove checkbox to send log to server
ilija-lazoroski Nov 12, 2021
bbe0177
Changelog: Removed checkbox to send log to server
ilija-lazoroski Nov 12, 2021
6e65bb4
UT: Remove send log to server
ilija-lazoroski Nov 12, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
- Sambacry exploiter. #1567
- "Kill file" option in the config. #1536
- Netstat collector, because network connection information wasn't used anywhere. #1535
- Checkbox to disable/enable sending log to server. #1537

### Fixed
- A bug in network map page that caused delay of telemetry log loading. #1545
Expand Down
1 change: 0 additions & 1 deletion monkey/infection_monkey/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ def as_dict(self):
dropper_log_path_linux = "/tmp/user-1562"
monkey_log_path_windows = "%temp%\\~df1563.tmp"
monkey_log_path_linux = "/tmp/user-1563"
send_log_to_server = True

###########################
# dropper config
Expand Down
1 change: 0 additions & 1 deletion monkey/infection_monkey/example.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
"max_iterations": 3,
"monkey_log_path_windows": "%temp%\\~df1563.tmp",
"monkey_log_path_linux": "/tmp/user-1563",
"send_log_to_server": true,
"ms08_067_exploit_attempts": 5,
"user_to_add": "Monkey_IUSER_SUPPORT",
"ping_scan_timeout": 10000,
Expand Down
3 changes: 1 addition & 2 deletions monkey/infection_monkey/monkey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,7 @@ def cleanup(self):
).send() # Signal the server (before closing the tunnel)
InfectionMonkey.close_tunnel()
firewall.close()
if WormConfiguration.send_log_to_server:
self.send_log()
self.send_log()
self._singleton.unlock()

InfectionMonkey.self_delete()
Expand Down
7 changes: 0 additions & 7 deletions monkey/monkey_island/cc/services/config_schema/internal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,6 @@
"default": "%temp%\\~df1563.tmp",
"description": "The fullpath of the monkey log file on Windows",
},
"send_log_to_server": {
"title": "Send log to server",
"type": "boolean",
"default": True,
"description": "Determines whether the monkey sends its log to the Monkey "
"Island server",
},
},
},
"exploits": {
Expand Down
3 changes: 1 addition & 2 deletions monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@
"dropper_log_path_linux": "/tmp/user-1562",
"dropper_log_path_windows": "%temp%\\~df1562.tmp",
"monkey_log_path_linux": "/tmp/user-1563",
"monkey_log_path_windows": "%temp%\\~df1563.tmp",
"send_log_to_server": true
"monkey_log_path_windows": "%temp%\\~df1563.tmp"
},
"exploits": {
"exploit_lm_hash_list": [],
Expand Down