diff options
author | Calum Lind <calumlind+deluge@gmail.com> | 2017-06-15 11:22:10 +0100 |
---|---|---|
committer | Calum Lind <calumlind+deluge@gmail.com> | 2017-06-15 13:59:05 +0100 |
commit | 65fac156eb7d6d2e95bff8ea458753ca5fc5f6d4 (patch) | |
tree | 8e239f8d79c2698941408d5abc93f02184e8c9bf | |
parent | 956f2ad57497ed5e30d3f2b7747a5780bd44f4a1 (diff) | |
download | deluge-65fac156eb7d6d2e95bff8ea458753ca5fc5f6d4.tar.gz deluge-65fac156eb7d6d2e95bff8ea458753ca5fc5f6d4.tar.bz2 deluge-65fac156eb7d6d2e95bff8ea458753ca5fc5f6d4.zip |
[#3064|WebUI] Fix server not sending TLS intermediate certs
* Sending of cert chain was unintentionallly removed in commit c1902e43 (#2792).
-rw-r--r-- | deluge/ui/web/server.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index 4f1f1bab2..43e2ade9e 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -687,7 +687,9 @@ class DelugeWeb(component.Component): with open(configmanager.get_config_dir(self.pkey)) as pkey: private_key = KeyPair.load(pkey.read(), FILETYPE_PEM).original options = CertificateOptions(privateKey=private_key, certificate=certificate, method=SSL.SSLv23_METHOD) - options.getContext().set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3) + ctx = options.getContext() + ctx.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3) + ctx.use_certificate_chain_file(configmanager.get_config_dir(self.cert)) self.socket = reactor.listenSSL(self.port, self.site, options, interface=self.interface) log.info("Serving on %s:%s view at https://%s:%s", self.interface, self.port, self.interface, self.port) |