Fixed bug when fetching ssl pages - certificate CN was sometimes causing the page to fail to fetch

breenmachine · breenmachine · commit 494e023a1256 · 2015-10-12T15:07:22.000-04:00
diff --git a/httpscreenshot.py b/httpscreenshot.py
@@ -322,27 +322,24 @@ def doGet(*args, **kwargs):
 	proxy = kwargs.pop('proxy',None)
 
 	kwargs['allow_redirects'] = False
-
 	session = requests.session()
 	if(proxy is not None):
 		session.proxies={'http':'socks5://'+proxy,'https':'socks5://'+proxy}
 	resp = session.get(url[0],**kwargs)
 
-
 	#If we have an https URL and we are configured to scrape hosts from the cert...
 	if(url[0].find('https') != -1 and url[1] == True):
 		#Pull hostnames from cert, add as additional URLs and flag as not to pull certs
 		host = urlparse(url[0]).hostname
 		port = urlparse(url[0]).port
 		if(port is None):
 			port = 443
-
-		cert     = ssl.get_server_certificate((host,port),ssl_version=ssl.PROTOCOL_SSLv23)
-		x509     = M2Crypto.X509.load_cert_string(cert)
-		subjText = x509.get_subject().as_text()
-		names    = re.findall("CN=([^\s]+)",subjText)
-
+		names = []
 		try:
+			cert     = ssl.get_server_certificate((host,port),ssl_version=ssl.PROTOCOL_SSLv23)
+			x509     = M2Crypto.X509.load_cert_string(cert)
+			subjText = x509.get_subject().as_text()
+			names    = re.findall("CN=([^\s]+)",subjText)
 			altNames = x509.get_ext('subjectAltName').get_value()
 			names.extend(re.findall("DNS:([^,]*)",altNames))
 		except:
