Skip to content

Commit

Permalink
fix: make SSL_CLIENT_CERT_FILE optional
Browse files Browse the repository at this point in the history
  • Loading branch information
SaintShit committed Oct 27, 2023
1 parent ba756b5 commit dcfc412
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion config.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@

SSL_CERT_FILE = config("SSL_CERT_FILE", default="/var/lib/marzban-node/ssl_cert.pem")
SSL_KEY_FILE = config("SSL_KEY_FILE", default="/var/lib/marzban-node/ssl_key.pem")
SSL_CLIENT_CERT_FILE = config("SSL_CLIENT_CERT_FILE", default="/var/lib/marzban-node/ssl_client_cert.pem")
SSL_CLIENT_CERT_FILE = config("SSL_CLIENT_CERT_FILE", default="")

DEBUG = config("DEBUG", cast=bool, default=False)
5 changes: 5 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,10 @@ services:
restart: always
network_mode: host

environment:
SSL_CERT_FILE: "/var/lib/marzban-node/ssl_cert.pem"
SSL_KEY_FILE: "/var/lib/marzban-node/ssl_key.pem"
# SSL_CLIENT_CERT_FILE: "/var/lib/marzban-node/ssl_client_cert.pem"

volumes:
- /var/lib/marzban-node:/var/lib/marzban-node
8 changes: 6 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,17 @@ def generate_ssl_files():
os.path.isfile(SSL_KEY_FILE))):
generate_ssl_files()

if not os.path.isfile(SSL_CLIENT_CERT_FILE):
if not SSL_CLIENT_CERT_FILE:
logger.warning(
"You are running node without SSL_CLIENT_CERT_FILE, be aware that everyone can connect to this node and this isn't secure!")

if SSL_CLIENT_CERT_FILE and not os.path.isfile(SSL_CLIENT_CERT_FILE):
logger.error("Client's certificate file specified on SSL_CLIENT_CERT_FILE is missing")
exit(0)

authenticator = SSLAuthenticator(keyfile=SSL_KEY_FILE,
certfile=SSL_CERT_FILE,
ca_certs=SSL_CLIENT_CERT_FILE)
ca_certs=SSL_CLIENT_CERT_FILE or None)
thread = ThreadedServer(XrayService(),
port=SERVICE_PORT,
authenticator=authenticator)
Expand Down

0 comments on commit dcfc412

Please sign in to comment.