govynnus
/
AV-98
forked from solderpunk/AV-98
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass extra information to _handle_cert_request 

This fixes a bug introduced in f45630 when handling a certificate request was
factored out of _fetch_over_network.
Also make the options consistent in terms of grammar.
This commit is contained in:
Callum Brown 2020-09-22 17:05:23 +01:00
parent 265a69a6ed
commit 92da876795
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
av98.py
View File

@ -484,7 +484,7 @@ you'll be able to transparently follow links to Gopherspace!""")
# Client cert
elif status.startswith("6"):
self._handle_cert_request(meta)
self._handle_cert_request(meta, status, gi.host)
return self._fetch_over_network(gi)
# Invalid status
@ -700,7 +700,7 @@ you'll be able to transparently follow links to Gopherspace!""")
for _, filename in self.cache.values():
assert os.path.isfile(filename)
def _handle_cert_request(self, meta):
def _handle_cert_request(self, meta, status, host):
# Don't do client cert stuff in restricted mode, as in principle
# it could be used to fill up the disk by creating a whole lot of
@ -719,7 +719,7 @@ you'll be able to transparently follow links to Gopherspace!""")
print("The server did not accept your certificate.")
print("You may need to e.g. coordinate with the admin to get your certificate fingerprint whitelisted.")
else:
print("The site {} is requesting a client certificate.".format(gi.host))
print("The site {} is requesting a client certificate.".format(host))
print("This will allow the site to recognise you across requests.")
# Give the user choices
@ -727,8 +727,8 @@ you'll be able to transparently follow links to Gopherspace!""")
print("1. Give up.")
print("2. Generate a new transient certificate.")
print("3. Generate a new persistent certificate.")
print("4. Load a previously generated persistent.")
print("5. Load certificate from an external file.")
print("4. Load a previously generated certificate.")
print("5. Load a certificate from an external file.")
choice = input("> ").strip()
if choice == "2":
self._generate_transient_cert_cert()