LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not check certificate expiration if OpenSSL cannot be imported

Browse source
This commit is contained in:
ThomasV 2013-10-03 07:44:04 +02:00
parent c8328ee5fc
commit 5086fd6b27
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/interface.py
View file

@ -46,6 +46,18 @@ def check_cert(host, cert):
print_msg(m) print_msg(m)
def cert_has_expired(cert_path):
try:
import OpenSSL
except:
print_error("Warning: cannot import OpenSSL")
return False
from OpenSSL import crypto as c
with open(cert_path) as f:
cert = f.read()
_cert = c.load_certificate(c.FILETYPE_PEM, cert)
return _cert.has_expired()
def check_certificates(): def check_certificates():
config = SimpleConfig() config = SimpleConfig()
@ -343,16 +355,11 @@ class Interface(threading.Thread):
if is_new: if is_new:
os.rename(temporary_path, cert_path + '.rej') os.rename(temporary_path, cert_path + '.rej')
else: else:
from OpenSSL import crypto as c if cert_has_expired(cert_path):
with open(cert_path) as f:
cert = f.read()
_cert = c.load_certificate(c.FILETYPE_PEM, cert)
if _cert.has_expired():
print_error("certificate has expired:", cert_path) print_error("certificate has expired:", cert_path)
os.unlink(cert_path) os.unlink(cert_path)
else: else:
print_msg("wrong certificate", self.host) print_msg("wrong certificate", self.host)
return return
except: except:
print_error("wrap_socket failed", self.host) print_error("wrap_socket failed", self.host)
@ -363,7 +370,6 @@ class Interface(threading.Thread):
print_error("saving certificate for", self.host) print_error("saving certificate for", self.host)
os.rename(temporary_path, cert_path) os.rename(temporary_path, cert_path)
s.settimeout(60) s.settimeout(60)
self.s = s self.s = s
self.is_connected = True self.is_connected = True