starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 00:22:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better error checking on private key and csr. Also, pull in file names instead of pointers.

Browse Source
This commit is contained in:
Adam Woodbeck
2014-11-27 08:12:40 -05:00
parent d548d7427f
commit da29a92729
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/scripts/main.py
+9 -5
View File
@@ -28,10 +28,10 @@ def main():
nargs="+") nargs="+")
parser.add_argument("-s", "--server", dest="server", parser.add_argument("-s", "--server", dest="server",
help="The ACME CA server address.") help="The ACME CA server address.")
parser.add_argument("-p", "--privkey", dest="privkey", type=file, parser.add_argument("-p", "--privkey", dest="privkey", type=str,
help="Path to the private key file for certificate " help="Path to the private key file for certificate "
"generation.") "generation.")
parser.add_argument("-c", "--csr", dest="csr", type=file, parser.add_argument("-c", "--csr", dest="csr", type=str,
help="Path to the certificate signing request file " help="Path to the certificate signing request file "
"corresponding to the private key file. The " "corresponding to the private key file. The "
"private key file argument is required if this " "private key file argument is required if this "
@@ -63,10 +63,14 @@ def main():
args = parser.parse_args() args = parser.parse_args()
# Enforce --privkey is set along with --csr. # Make sure each given file is readable.
for f in (args.privkey, args.csr):
if f and not os.access(f, os.R_OK):
parser.error("the file '{}' is not readable.".format(f))
# Enforce '--privkey' is set along with '--csr'.
if args.csr and not args.privkey: if args.csr and not args.privkey:
parser.print_usage() parser.error("private key file (--privkey) must be specified along{} "
parser.error("private key file (--privkey) must be specified along{}"
"with the certificate signing request file (--csr)" "with the certificate signing request file (--csr)"
.format(os.linesep)) .format(os.linesep))