third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-04-22 19:40:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

TLS: Optionally use TLS if you set non-empty CERT_FILE and KEY_FILE

Browse Source 
Whilst we do want to go TLS-less in the actual EDDN code, for ease of
setting up automated end to end functional testing, leave the
possibility of running with TLS termination as well.
This commit is contained in:
Athanasius 2022-03-13 13:46:37 +00:00
parent 80cae12a4c
commit 1166b814b5
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/apache-eddn.conf
View File

@ -151,12 +151,19 @@
</LimitExcept>
</LocationMatch>
<IfModule mod_proxy.c>
####################################
# Only uncomment the following if you are setting non-empty
# CERT_FILE, and KEY_FILE in the main EDDN config.json
####################################
# SSLProxyEngine On
# SSLProxyVerify none
####################################
ProxyPreserveHost On
ProxyRequests Off
<Location "/">
# Yes, plain HTTP, as the Gateway process knows nothing of
# TLS.
# Plain http if setting **empty** CERT_FILE and KEY_FILE in
# the EDDN config.json, else https.
ProxyPass "http://127.0.0.1:8081/"
</Location>
</IfModule>

4
docs/Running-this-software.md
View File

@ -523,7 +523,9 @@ proxying:
Internet -> existing server -> VM -> nginx -> EDDN scripts
If using Apache on a Debian server then you need some ProxyPass directives:
If using Apache on a Debian server then you need some ProxyPass directives.
These assume you using an empty CERT_FILE and KEY_FILE in the override
config.json. See `contrib/apache-eddn.conf` for how to use TLS instead:
<IfModule mod_proxy.c>
ProxyPreserveHost On

5
src/eddn/Gateway.py
View File

@ -445,6 +445,11 @@ def main() -> None:
'handler_class': EDDNWSGIHandler,
}
# Empty CERT_FILE or KEY_FILE means don't put them in
if Settings.CERT_FILE != "" and Settings.KEY_FILE != "":
argsd["certfile"] = Settings.CERT_FILE
argsd["keyfile"] = Settings.KEY_FILE
app.run(
**argsd
)

6
src/eddn/conf/Settings.py
View File

@ -15,6 +15,12 @@ class _Settings(object):
###############################################################################
# Local installation settings
###############################################################################
# If these are set to non-empty strings then you reverse proxt setup
# **MUST** pass TLS through properly, including to a https URL, not a
# plain http one.
CERT_FILE = "/etc/letsencrypt/live/eddn.edcd.io/fullchain.pem" # noqa: E221
KEY_FILE = "/etc/letsencrypt/live/eddn.edcd.io/privkey.pem" # noqa: E221
###############################################################################
# Relay settings