29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
From 65fac156eb7d6d2e95bff8ea458753ca5fc5f6d4 Mon Sep 17 00:00:00 2001
|
|
From: Calum Lind <calumlind+deluge@gmail.com>
|
|
Date: Thu, 15 Jun 2017 11:22:10 +0100
|
|
Subject: [#3064|WebUI] Fix server not sending TLS intermediate certs
|
|
|
|
* Sending of cert chain was unintentionallly removed in commit c1902e43 (#2792).
|
|
---
|
|
deluge/ui/web/server.py | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
|
|
index 4f1f1ba..43e2ade 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)
|
|
--
|
|
cgit v1.1
|
|
|