Skip to content

Commit

Permalink
Add support for existing SSL certificates
Browse files Browse the repository at this point in the history
As per sc0tfree#32, added logic to ensure that both --cert and --key arguments are supplied.
  • Loading branch information
pantsmanuk committed Apr 5, 2022
1 parent 28a1ac1 commit 894f5ab
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions updog/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ def parse_arguments():
parser.add_argument('-p', '--port', type=int, default=9090,
help='Port to serve [Default=9090]')
parser.add_argument('--password', type=str, default='', help='Use a password to access the page. (No username)')
parser.add_argument('--ssl', action='store_true', help='Use an encrypted connection')
parser.add_argument('--ssl', action='store_true', help='Use an encrypted connection (temporary cert/key)')
parser.add_argument('--cert', action='store_true', help='Use an encrypted connection (existing cert)')
parser.add_argument('--key', action='store_true', help='Use an encrypted connection (existing key)')
parser.add_argument('--version', action='version', version='%(prog)s v'+VERSION)

args = parser.parse_args()
Expand All @@ -46,6 +48,14 @@ def parse_arguments():
def main():
args = parse_arguments()

ssl_context = None
if args.ssl:
if (args.cert and args.key is None) or (args.cert is None and args.key):
error('Both --cert and --key must be supplied!')
elif args.cert and args.key:
ssl_context = (args.cert, args.key)
ssl_context = 'adhoc'

app = Flask(__name__)
auth = HTTPBasicAuth()

Expand Down Expand Up @@ -173,10 +183,6 @@ def handler(signal, frame):
error('Exiting!')
signal.signal(signal.SIGINT, handler)

ssl_context = None
if args.ssl:
ssl_context = 'adhoc'

run_simple("0.0.0.0", int(args.port), app, ssl_context=ssl_context)


Expand Down

0 comments on commit 894f5ab

Please sign in to comment.