p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into hotfix/various-exploit-fixes

This commit is contained in:
Itay Mizeretz 2017-10-24 15:10:14 +03:00
parent 68643ce343 9f2e3a8db0
commit 8c14136213
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chaos_monkey/network/info.py
View File

@ -138,12 +138,14 @@ def get_ips_from_interfaces():
res = [] res = []
ifs = get_host_subnets() ifs = get_host_subnets()
for net_interface in ifs: for net_interface in ifs:
host_addr = ipaddress.ip_address(net_interface['addr']) address_str = unicode(net_interface['addr'])
ip_interface = ipaddress.ip_interface(u"%s/%s" % (net_interface['addr'], net_interface['netmask'])) netmask_str = unicode(net_interface['netmask'])
host_address = ipaddress.ip_address(address_str)
ip_interface = ipaddress.ip_interface(u"%s/%s" % (address_str, netmask_str))
# limit subnet scans to class C only # limit subnet scans to class C only
if ip_interface.network.num_addresses > 255: if ip_interface.network.num_addresses > 255:
ip_interface = ipaddress.ip_interface(u"%s/24" % net_interface['addr']) ip_interface = ipaddress.ip_interface(u"%s/24" % address_str)
addrs = [str(addr) for addr in ip_interface.network.hosts() if addr != host_addr] addrs = [str(addr) for addr in ip_interface.network.hosts() if addr != host_address]
res.extend(addrs) res.extend(addrs)
return res return res

2
monkey_island/deb-package/DEBIAN/postinst
View File

@ -22,6 +22,8 @@ if [ -d "/etc/systemd/network" ]; then
cp ${MONKEY_FOLDER}/ubuntu/systemd/*.service /lib/systemd/system/ cp ${MONKEY_FOLDER}/ubuntu/systemd/*.service /lib/systemd/system/
chmod +x ${MONKEY_FOLDER}/ubuntu/systemd/start_server.sh chmod +x ${MONKEY_FOLDER}/ubuntu/systemd/start_server.sh
systemctl daemon-reload systemctl daemon-reload
systemctl enable monkey-mongo
systemctl enable monkey-island
fi fi
${MONKEY_FOLDER}/create_certificate.sh ${MONKEY_FOLDER}/create_certificate.sh

1
monkey_island/linux/ubuntu/systemd/monkey-island.service
View File

@ -1,5 +1,6 @@
[Unit] [Unit]
Description=Monkey Island Service Description=Monkey Island Service
Wants=monkey-mongo.service
After=network.target After=network.target
[Service] [Service]