Unverified Commit 03d37f24 authored by Dan Clark's avatar Dan Clark Committed by GitHub
Browse files

[Fix] Add args for mTLS support (#3430)


Co-authored-by: default avatardeclark1 <daniel.clark@ibm.com>
parent a7c87168
...@@ -8,6 +8,7 @@ change `vllm/entrypoints/openai/api_server.py` instead. ...@@ -8,6 +8,7 @@ change `vllm/entrypoints/openai/api_server.py` instead.
import argparse import argparse
import json import json
import ssl
from typing import AsyncGenerator from typing import AsyncGenerator
from fastapi import FastAPI, Request from fastapi import FastAPI, Request
...@@ -86,10 +87,12 @@ if __name__ == "__main__": ...@@ -86,10 +87,12 @@ if __name__ == "__main__":
type=str, type=str,
default=None, default=None,
help="The CA certificates file") help="The CA certificates file")
parser.add_argument("--ssl-cert-reqs", parser.add_argument(
"--ssl-cert-reqs",
type=int, type=int,
default=0, default=int(ssl.CERT_NONE),
help="Whether client certificate is required") help="Whether client certificate is required (see stdlib ssl module's)"
)
parser.add_argument( parser.add_argument(
"--root-path", "--root-path",
type=str, type=str,
......
...@@ -5,6 +5,7 @@ from contextlib import asynccontextmanager ...@@ -5,6 +5,7 @@ from contextlib import asynccontextmanager
import os import os
import importlib import importlib
import inspect import inspect
import ssl
from prometheus_client import make_asgi_app from prometheus_client import make_asgi_app
import fastapi import fastapi
...@@ -124,6 +125,16 @@ def parse_args(): ...@@ -124,6 +125,16 @@ def parse_args():
type=str, type=str,
default=None, default=None,
help="The file path to the SSL cert file") help="The file path to the SSL cert file")
parser.add_argument("--ssl-ca-certs",
type=str,
default=None,
help="The CA certificates file")
parser.add_argument(
"--ssl-cert-reqs",
type=int,
default=int(ssl.CERT_NONE),
help="Whether client certificate is required (see stdlib ssl module's)"
)
parser.add_argument( parser.add_argument(
"--root-path", "--root-path",
type=str, type=str,
...@@ -262,4 +273,6 @@ if __name__ == "__main__": ...@@ -262,4 +273,6 @@ if __name__ == "__main__":
log_level=args.uvicorn_log_level, log_level=args.uvicorn_log_level,
timeout_keep_alive=TIMEOUT_KEEP_ALIVE, timeout_keep_alive=TIMEOUT_KEEP_ALIVE,
ssl_keyfile=args.ssl_keyfile, ssl_keyfile=args.ssl_keyfile,
ssl_certfile=args.ssl_certfile) ssl_certfile=args.ssl_certfile,
ssl_ca_certs=args.ssl_ca_certs,
ssl_cert_reqs=args.ssl_cert_reqs)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment