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

Fixed collision where HTTP auto upgraded to HTTPS

This commit is contained in:
daniel goldberg 2016-08-25 16:27:29 +03:00
parent bee9fc23ea
commit dd8738a4f1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chaos_monkey/network/httpfinger.py
View File

@ -27,11 +27,12 @@ class HTTPFinger(HostFinger):
https = "https://" + host.ip_addr + ":" + port[1] https = "https://" + host.ip_addr + ":" + port[1]
# try http, we don't optimise for 443 # try http, we don't optimise for 443
for url in (http, https): for url in (https, http): # start with https and downgrade
try: try:
with closing(get(url, verify=False, timeout=1, stream=True)) as req: with closing(get(url, verify=False, timeout=1, stream=True)) as req:
server = req.headers.get('Server') server = req.headers.get('Server')
host.services['tcp-' + port[1]] = server ssl = True if 'https://' in url else False
host.services['tcp-' + port[1]] = (server,ssl)
break # https will be the same on the same port break # https will be the same on the same port
except Timeout: except Timeout:
pass pass