solderpunk
/
AV-98
9
21
Fork 15
Code Issues 4 Pull Requests 4 Releases Wiki Activity

Cache certificates to disk in the expectation of more advanced cert wrangling in future.

This commit is contained in:
Solderpunk 2020-05-17 18:35:35 +02:00
parent 68e55d245a
commit ca1a0a62e6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
av98.py
View File

@ -684,6 +684,9 @@ Slow internet connection? Use 'set timeout' to be more patient.""")
VALUES (?, ?, ?, ?, ?, ?)""", VALUES (?, ?, ?, ?, ?, ?)""",
(host, address, fingerprint, now, now, 1)) (host, address, fingerprint, now, now, 1))
self.db_conn.commit() self.db_conn.commit()
certdir = os.path.join(self.config_dir, "cert_cache")
with open(os.path.join(certdir, fingerprint+".crt"), "wb") as fp:
fp.write(cert)
else: else:
raise Exception("TOFU Failure!") raise Exception("TOFU Failure!")
@ -694,6 +697,11 @@ Slow internet connection? Use 'set timeout' to be more patient.""")
VALUES (?, ?, ?, ?, ?, ?)""", VALUES (?, ?, ?, ?, ?, ?)""",
(host, address, fingerprint, now, now, 1)) (host, address, fingerprint, now, now, 1))
self.db_conn.commit() self.db_conn.commit()
certdir = os.path.join(self.config_dir, "cert_cache")
if not os.path.exists(certdir):
os.makedirs(certdir)
with open(os.path.join(certdir, fingerprint+".crt"), "wb") as fp:
fp.write(cert)
def _get_handler_cmd(self, mimetype): def _get_handler_cmd(self, mimetype):
# Now look for a handler for this mimetype # Now look for a handler for this mimetype
@ -834,7 +842,7 @@ Slow internet connection? Use 'set timeout' to be more patient.""")
if not name.strip(): if not name.strip():
print("Aborting.") print("Aborting.")
return return
certdir = os.path.join(self.config_dir, "certs") certdir = os.path.join(self.config_dir, "client_certs")
self._generate_client_cert(self, certdir, name) self._generate_client_cert(self, certdir, name)
def _generate_client_cert(self, certdir, basename, transient=False): def _generate_client_cert(self, certdir, basename, transient=False):
@ -849,7 +857,7 @@ Slow internet connection? Use 'set timeout' to be more patient.""")
self._activate_client_cert(certfile, keyfile) self._activate_client_cert(certfile, keyfile)
def _choose_client_cert(self): def _choose_client_cert(self):
certdir = os.path.join(self.config_dir, "certs") certdir = os.path.join(self.config_dir, "client_certs")
certs = glob.glob(os.path.join(certdir, "*.crt")) certs = glob.glob(os.path.join(certdir, "*.crt"))
certdir = {} certdir = {}
for n, cert in enumerate(certs): for n, cert in enumerate(certs):