From d8ef677ab15996e013ec71615c8a184ef558ded9 Mon Sep 17 00:00:00 2001 From: Solderpunk Date: Sun, 10 May 2020 14:26:47 +0200 Subject: [PATCH] Make sure supplied filenames exist. --- av98.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/av98.py b/av98.py index f17cd01..f6e1eac 100755 --- a/av98.py +++ b/av98.py @@ -715,9 +715,21 @@ Slow internet connection? Use 'set timeout' to be more patient.""") self._deactivate_client_cert() else: print("Loading client certificate file, in PEM format (blank line to cancel)") - certfile = input("Certfile path: ") + certfile = input("Certfile path: ").strip() + if not certfile: + print("Aborting.") + return + elif not os.path.exists(certfile): + print("Certificate file {} does not exist.".format(certfile)) + return print("Loading private key file, in PEM format (blank line to cancel)") - keyfile = input("Keyfile path: ") + keyfile = input("Keyfile path: ").strip() + if not keyfile: + print("Aborting.") + return + elif not os.path.exists(keyfile): + print("Private key file {} does not exist.".format(keyfile)) + return self._activate_client_cert(certfile, keyfile) @restricted