upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-07 15:52:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Provide more user-friendly errors when opening file handles.

Browse source
This commit is contained in:
Adam Woodbeck 2014-11-28 11:41:03 -05:00
parent ddca02cb7b
commit 6254038ea3
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
letsencrypt/scripts/main.py
View file

@ -28,10 +28,10 @@ def main():
nargs="+")
parser.add_argument("-s", "--server", dest="server",
help="The ACME CA server address.")
parser.add_argument("-p", "--privkey", dest="privkey", type=file,
parser.add_argument("-p", "--privkey", dest="privkey", type=open_file,
help="Path to the private key file for certificate "
"generation.")
parser.add_argument("-c", "--csr", dest="csr", type=file,
parser.add_argument("-c", "--csr", dest="csr", type=open_file,
help="Path to the certificate signing request file "
"corresponding to the private key file. The "
"private key file argument is required if this "
@ -61,7 +61,10 @@ def main():
parser.add_argument("--test", dest="test", action="store_true",
help="Run in test mode.")
args = parser.parse_args()
try:
args = parser.parse_args()
except IOError as e:
parser.error(e)
# Enforce '--privkey' is set along with '--csr'.
if args.csr and not args.privkey:
@ -91,6 +94,26 @@ def main():
acme.authenticate(args.domains, args.redirect, args.eula)
def open_file(filename):
"""Returns a file object for the given filename.
:param filename: Filename
:type filename: str
:return: file object
:raise IOError: File does not exist or is not readable.
"""
if not os.path.exists(filename):
raise IOError("the file '{0}' is not found".format(filename))
if not os.access(filename, os.R_OK):
raise IOError("the file '{0}' is not readable".format(filename))
return file(filename)
def rollback(config, checkpoints):
"""Revert configuration the specified number of checkpoints.