Ark/deluge-streaming
1
0
Fork 0
mirror of https://github.com/JohnDoee/deluge-streaming/ synced 2026-07-01 07:31:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

added support for new ssl version

Browse Source
This commit is contained in:
Anders Jensen
2020-07-31 16:16:57 +02:00
parent bffef417f8
commit d0e9780d76
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
streaming/core.py
View File

@@ -56,7 +56,7 @@ from deluge._libtorrent import lt
from deluge.core.rpcserver import export
from deluge.plugins.pluginbase import CorePluginBase
from twisted.internet import reactor, defer, task
from twisted.internet import reactor, defer, task, error
from twisted.web import server, client
from twisted.web.resource import Resource as TwistedResource
@@ -620,9 +620,11 @@ class ServerContextFactory(object):
def getContext(self):
from OpenSSL import SSL
method = getattr(SSL, 'TLSv1_1_METHOD', None)
if method is None:
method = getattr(SSL, 'SSLv23_METHOD', None)
methods_names = ['TLSv1_2_METHOD', 'TLSv1_1_METHOD', 'SSLv23_METHOD']
for method_name in methods_names:
method = getattr(SSL, method_name, None)
if method is not None:
break
ctx = SSL.Context(method)
ctx.use_certificate_file(self._cert_file)
@@ -743,13 +745,19 @@ class Core(CorePluginBase):
try:
self.listening = reactor.listenSSL(self.config['port'], self.site, context, interface=self.config['ip'])
except:
try:
self.listening = reactor.listenSSL(self.config['port'], self.site, context, interface='0.0.0.0')
except error.CannotListenError:
logger.warning("Unable to listen to anything")
self.base_url += 's'
else:
try:
self.listening = reactor.listenTCP(self.config['port'], self.site, interface=self.config['ip'])
except:
try:
self.listening = reactor.listenTCP(self.config['port'], self.site, interface='0.0.0.0')
except error.CannotListenError:
logger.warning("Unable to listen to anything")
port = self.config['port']
ip = self.config['ip']
@@ -820,9 +828,6 @@ class Core(CorePluginBase):
plugin_manager = component.get("CorePluginManager")
return 'WebUi' in plugin_manager.get_enabled_plugins()
def check_config(self):
pass
@export
@defer.inlineCallbacks
def set_config(self, config):