From 71cf8ea8469297494c9f010cb4fa607b9656500a Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Wed, 3 Jun 2015 17:36:25 -0300 Subject: Removed unused redirect to ssl and moved reactor listens one place up in the tree, to remove them from the app in the future --- service/pixelated/config/app_factory.py | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'service/pixelated') diff --git a/service/pixelated/config/app_factory.py b/service/pixelated/config/app_factory.py index c74a46f7..6db14885 100644 --- a/service/pixelated/config/app_factory.py +++ b/service/pixelated/config/app_factory.py @@ -134,13 +134,9 @@ def create_app(leap_home, leap_session, host, port, sslkey=None, sslcert=None): resource = RootResource() init_app(resource, leap_home, leap_session) if sslkey and sslcert: - listen_with_ssl(resource, host, port, sslkey, sslcert) + reactor.listenSSL(port, Site(resource), _ssl_options(sslkey, sslcert), interface=host) else: - listen_without_ssl(resource, host, port) - - -def listen_without_ssl(resource, host, port): - reactor.listenTCP(port, Site(resource), interface=host) + reactor.listenTCP(port, Site(resource), interface=host) def _ssl_options(sslkey, sslcert): @@ -156,18 +152,3 @@ def _ssl_options(sslkey, sslcert): method=SSL.TLSv1_2_METHOD, acceptableCiphers=acceptable) return options - - -def listen_with_ssl(resource, host, port, sslkey, sslcert): - reactor.listenSSL(port, Site(resource), _ssl_options(sslkey, sslcert), interface=host) - - -class RedirectToSSL(resource.Resource): - isLeaf = True - - def __init__(self, ssl_port): - self.ssl_port = ssl_port - - def render_GET(self, request): - host = request.getHost().host - return redirectTo("https://%s:%s" % (host, self.ssl_port), request) -- cgit v1.2.3