From 2ac8954b13da428bf1fdff63893e2d9714f72c18 Mon Sep 17 00:00:00 2001 From: jbergknoff-10e Date: Thu, 3 May 2018 14:09:56 -0500 Subject: [PATCH 1/2] Accept paths to user-controlled SSL cert --- moto/server.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/moto/server.py b/moto/server.py index e9f4c0904..7862dfe9a 100644 --- a/moto/server.py +++ b/moto/server.py @@ -186,9 +186,18 @@ def main(argv=sys.argv[1:]): parser.add_argument( '-s', '--ssl', action='store_true', - help='Enable SSL encrypted connection (use https://... URL)', + help='Enable SSL encrypted connection with auto-generated certificate (use https://... URL)', default=False ) + parser.add_argument( + '-c', '--ssl-cert', type=str, + help='Path to SSL certificate', + default=None) + parser.add_argument( + '-k', '--ssl-key', type=str, + help='Path to SSL private key', + default=None) + args = parser.parse_args(argv) @@ -197,9 +206,15 @@ def main(argv=sys.argv[1:]): create_backend_app, service=args.service) main_app.debug = True + ssl_context = None + if args.ssl_key and args.ssl_cert: + ssl_context = (args.ssl_cert, args.ssl_key) + elif args.ssl: + ssl_context = 'adhoc' + run_simple(args.host, args.port, main_app, threaded=True, use_reloader=args.reload, - ssl_context='adhoc' if args.ssl else None) + ssl_context=ssl_context) if __name__ == '__main__': From 86fed8ba27a489d09a6c590dcdd76053c2357dd6 Mon Sep 17 00:00:00 2001 From: jbergknoff-10e Date: Fri, 4 May 2018 16:42:16 -0500 Subject: [PATCH 2/2] lint --- moto/server.py | 1 - 1 file changed, 1 deletion(-) diff --git a/moto/server.py b/moto/server.py index 7862dfe9a..d76b5601c 100644 --- a/moto/server.py +++ b/moto/server.py @@ -198,7 +198,6 @@ def main(argv=sys.argv[1:]): help='Path to SSL private key', default=None) - args = parser.parse_args(argv) # Wrap the main application