Accept paths to user-controlled SSL cert
This commit is contained in:
		
							parent
							
								
									cb364eedc6
								
							
						
					
					
						commit
						2ac8954b13
					
				@ -186,9 +186,18 @@ def main(argv=sys.argv[1:]):
 | 
				
			|||||||
    parser.add_argument(
 | 
					    parser.add_argument(
 | 
				
			||||||
        '-s', '--ssl',
 | 
					        '-s', '--ssl',
 | 
				
			||||||
        action='store_true',
 | 
					        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
 | 
					        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)
 | 
					    args = parser.parse_args(argv)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -197,9 +206,15 @@ def main(argv=sys.argv[1:]):
 | 
				
			|||||||
        create_backend_app, service=args.service)
 | 
					        create_backend_app, service=args.service)
 | 
				
			||||||
    main_app.debug = True
 | 
					    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,
 | 
					    run_simple(args.host, args.port, main_app,
 | 
				
			||||||
               threaded=True, use_reloader=args.reload,
 | 
					               threaded=True, use_reloader=args.reload,
 | 
				
			||||||
               ssl_context='adhoc' if args.ssl else None)
 | 
					               ssl_context=ssl_context)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if __name__ == '__main__':
 | 
					if __name__ == '__main__':
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user