mirror of
https://github.com/certbot/certbot.git
synced 2026-06-07 15:52:08 -04:00
Changes per pylint.
This commit is contained in:
Adam Woodbeck
parent
6794a57e26
commit
13f1286e66
2 changed files with 81 additions and 59 deletions
|
|
@ -13,11 +13,90 @@ from letsencrypt.client import logger
|
|||
BASENAME = os.path.basename(sys.argv[0])
|
||||
|
||||
|
||||
def main():
|
||||
"""Command line argument parsing and main script execution."""
|
||||
if not os.geteuid() == 0:
|
||||
sys.exit(
|
||||
"{0}Root is required to run letsencrypt. Please use sudo.{0}"
|
||||
.format(os.linesep))
|
||||
|
||||
parser = argparse.ArgumentParser(
|
||||
description="An ACME client that can update Apache configurations.")
|
||||
|
||||
parser.add_argument("-d", "--domains", dest="domains", metavar="DOMAIN",
|
||||
nargs="+")
|
||||
parser.add_argument("-s", "--server", dest="server",
|
||||
help="The ACME CA server address.")
|
||||
parser.add_argument("-p", "--privkey", dest="privkey", type=file,
|
||||
help="Path to the private key file for certificate "
|
||||
"generation.")
|
||||
parser.add_argument("-c", "--csr", dest="csr", type=file,
|
||||
help="Path to the certificate signing request file "
|
||||
"corresponding to the private key file. The "
|
||||
"private key file argument is required if this "
|
||||
"argument is specified.")
|
||||
parser.add_argument("-b", "--rollback", dest="rollback", type=int,
|
||||
default=0,
|
||||
help="Revert configuration <ROLLBACK> number of "
|
||||
"checkpoints.")
|
||||
parser.add_argument("-k", "--revoke", dest="revoke", action="store_true",
|
||||
help="Revoke a certificate.")
|
||||
parser.add_argument("-v", "--view-checkpoints", dest="view_checkpoints",
|
||||
action="store_true",
|
||||
help="View checkpoints and associated configuration "
|
||||
"changes.")
|
||||
parser.add_argument("-r", "--redirect", dest="redirect",
|
||||
action="store_const", const=True,
|
||||
help="Automatically redirect all HTTP traffic to HTTPS "
|
||||
"for the newly authenticated vhost.")
|
||||
parser.add_argument("-n", "--no-redirect", dest="redirect",
|
||||
action="store_const", const=False,
|
||||
help="Skip the HTTPS redirect question, allowing both "
|
||||
"HTTP and HTTPS.")
|
||||
parser.add_argument("-e", "--agree-eula", dest="eula", action="store_true",
|
||||
help="Skip the end user license agreement screen.")
|
||||
parser.add_argument("-t", "--text", dest="curses", action="store_false",
|
||||
help="Use the text output instead of the curses UI.")
|
||||
parser.add_argument("--test", dest="test", action="store_true",
|
||||
help="Run in test mode.")
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
# Enforce --privkey is set along with --csr.
|
||||
if args.csr and not args.privkey:
|
||||
parser.print_usage()
|
||||
parser.error("private key file (--privkey) must be specified along{}"
|
||||
"with the certificate signing request file (--csr)"
|
||||
.format(os.linesep))
|
||||
|
||||
if args.curses:
|
||||
display.set_display(display.NcursesDisplay())
|
||||
else:
|
||||
display.set_display(display.FileDisplay(sys.stdout))
|
||||
|
||||
if args.rollback > 0:
|
||||
rollback(args.rollback)
|
||||
sys.exit()
|
||||
|
||||
if args.view_checkpoints:
|
||||
view_checkpoints()
|
||||
sys.exit()
|
||||
|
||||
server = args.server is None and CONFIG.ACME_SERVER or args.server
|
||||
|
||||
acme = client.Client(server, args.csr, args.privkey, args.curses)
|
||||
if args.revoke:
|
||||
acme.list_certs_keys()
|
||||
else:
|
||||
acme.authenticate(args.domains, args.redirect, args.eula)
|
||||
|
||||
|
||||
def rollback(checkpoints):
|
||||
"""Revert configuration the specified number of checkpoints.
|
||||
|
||||
:param checkpoints: Number of checkpoints to revert.
|
||||
:type checkpoints: int
|
||||
|
||||
"""
|
||||
logger.setLogger(logger.FileLogger(sys.stdout))
|
||||
logger.setLogLevel(logger.INFO)
|
||||
|
|
@ -35,61 +114,4 @@ def view_checkpoints():
|
|||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if not os.geteuid() == 0:
|
||||
sys.exit("{0}Root is required to run letsencrypt. Please use sudo.{0}".format(os.linesep))
|
||||
|
||||
parser = argparse.ArgumentParser(description='An ACME client that can update Apache configurations.')
|
||||
|
||||
parser.add_argument('-d', '--domains', dest='domains', metavar='DOMAIN', nargs='+')
|
||||
parser.add_argument('-s', '--server', dest='server',
|
||||
help='The ACME CA server address.')
|
||||
parser.add_argument('-p', '--privkey', dest='privkey', type=file,
|
||||
help='Path to the private key file for certificate generation.')
|
||||
parser.add_argument('-c', '--csr', dest='csr', type=file,
|
||||
help='Path to the certificate signing request file corresponding to the private key file. '
|
||||
'The private key file argument is required if this argument is specified.')
|
||||
parser.add_argument('-b', '--rollback', dest='rollback', type=int, default=0,
|
||||
help='Revert configuration <ROLLBACK> number of checkpoints.')
|
||||
parser.add_argument('-k', '--revoke', dest='revoke', action='store_true',
|
||||
help='Revoke a certificate.')
|
||||
parser.add_argument('-v', '--view-checkpoints', dest='view_checkpoints', action='store_true',
|
||||
help='View checkpoints and associated configuration changes.')
|
||||
parser.add_argument('-r', '--redirect', dest='redirect', action='store_const', const=True,
|
||||
help='Automatically redirect all HTTP traffic to HTTPS for the newly authenticated vhost.')
|
||||
parser.add_argument('-n', '--no-redirect', dest='redirect', action='store_const', const=False,
|
||||
help='Skip the HTTPS redirect question, allowing both HTTP and HTTPS.')
|
||||
parser.add_argument('-e', '--agree-eula', dest='eula', action='store_true',
|
||||
help='Skip the end user license agreement screen.')
|
||||
parser.add_argument('-t', '--text', dest='curses', action='store_false',
|
||||
help='Use the text output instead of the curses UI.')
|
||||
parser.add_argument('--test', dest='test', action='store_true',
|
||||
help='Run in test mode.')
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
# Enforce --privkey is set along with --csr.
|
||||
if args.csr and not args.privkey:
|
||||
parser.print_usage()
|
||||
parser.error("private key file (--privkey) must be specified along{}"
|
||||
"with the certificate signing request file (--csr)".format(os.linesep))
|
||||
|
||||
if args.curses:
|
||||
display.set_display(display.NcursesDisplay())
|
||||
else:
|
||||
display.set_display(display.FileDisplay(sys.stdout))
|
||||
|
||||
if args.rollback > 0:
|
||||
rollback(args.rollback)
|
||||
sys.exit()
|
||||
|
||||
if args.view_checkpoints:
|
||||
view_checkpoints()
|
||||
sys.exit()
|
||||
|
||||
server = args.server is None and CONFIG.ACME_SERVER or args.server
|
||||
|
||||
c = client.Client(args.server, args.csr, args.privkey, args.curses)
|
||||
if args.revoke:
|
||||
c.list_certs_keys()
|
||||
else:
|
||||
c.authenticate(args.domains, args.redirect, args.eula)
|
||||
main()
|
||||
|
|
|
|||
2
setup.py
2
setup.py
|
|
@ -3,13 +3,13 @@ from setuptools import setup
|
|||
|
||||
|
||||
install_requires = [
|
||||
'argparse',
|
||||
'jsonschema',
|
||||
'M2Crypto',
|
||||
'pycrypto',
|
||||
'python-augeas',
|
||||
'python2-pythondialog',
|
||||
'requests',
|
||||
'argparse',
|
||||
]
|
||||
|
||||
testing_extras = [
|
||||
|
|
|
|||
Loading…
Reference in a new issue