p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Outdated sort, byte/string mixups fixed

This commit is contained in:
VakarisZ 2019-09-24 11:47:29 +03:00
parent ea40620373
commit c40ec2adaf
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/infection_monkey/config.py
View File

@ -287,7 +287,7 @@ class Configuration(object):
:param sensitive_data: the data to hash.
:return: the hashed data.
"""
password_hashed = hashlib.sha512(sensitive_data).hexdigest()
password_hashed = hashlib.sha512(sensitive_data.encode()).hexdigest()
return password_hashed

4
monkey/infection_monkey/exploit/vsftpd.py
View File

@ -71,9 +71,9 @@ class VSFTPDExploiter(HostExploiter):
if self.socket_connect(ftp_socket, self.host.ip_addr, FTP_PORT):
ftp_socket.recv(RECV_128).decode('utf-8')
if self.socket_send_recv(ftp_socket, USERNAME + '\n'):
if self.socket_send_recv(ftp_socket, USERNAME + b'\n'):
time.sleep(FTP_TIME_BUFFER)
self.socket_send(ftp_socket, PASSWORD + '\n')
self.socket_send(ftp_socket, PASSWORD + b'\n')
ftp_socket.close()
LOG.info('Backdoor Enabled, Now we can run commands')
else:

3
monkey/infection_monkey/network/ping_scanner.py
View File

@ -55,7 +55,8 @@ class PingScanner(HostScanner, HostFinger):
PING_TIMEOUT_FLAG,
str(timeout), host.ip_addr],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
stderr=subprocess.PIPE,
text=True)
output = " ".join(sub_proc.communicate())
regex_result = self._ttl_regex.search(output)

10
monkey/monkey_island/cc/services/node.py
View File

@ -52,7 +52,7 @@ class NodeService:
exploit["origin"] = NodeService.get_monkey_label(NodeService.get_monkey_by_id(edge["from"]))
exploits.append(exploit)
exploits.sort(key=NodeService._cmp_exploits_by_timestamp)
exploits = sorted(exploits, key=lambda exploit: exploit['timestamp'])
new_node["exploits"] = exploits
new_node["accessible_from_nodes"] = accessible_from_nodes
@ -71,14 +71,6 @@ class NodeService:
domain_name = " (" + node["domain_name"] + ")"
return node["os"]["version"] + " : " + node["ip_addresses"][0] + domain_name
@staticmethod
def _cmp_exploits_by_timestamp(exploit_1, exploit_2):
if exploit_1["timestamp"] == exploit_2["timestamp"]:
return 0
if exploit_1["timestamp"] > exploit_2["timestamp"]:
return 1
return -1
@staticmethod
def get_monkey_os(monkey):
os = "unknown"