From 9209525c5e88e4314711359b4e9fa42d6958403d Mon Sep 17 00:00:00 2001 From: NavaL Date: Fri, 28 Oct 2016 17:18:59 +0200 Subject: removing obsolete Leap_password_checker #795 --- service/pixelated/application.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'service/pixelated/application.py') diff --git a/service/pixelated/application.py b/service/pixelated/application.py index d393b656..fbcc42c0 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -24,7 +24,7 @@ from leap.soledad.common.errors import InvalidAuthTokenError from twisted.logger import Logger from twisted.conch import manhole_tap from twisted.cred import portal -from twisted.cred.checkers import AllowAnonymousAccess, FilePasswordDB +from twisted.cred.checkers import AllowAnonymousAccess from twisted.internet import defer from twisted.internet import reactor from twisted.internet import ssl @@ -36,7 +36,7 @@ from pixelated.config import services from pixelated.config.leap import initialize_leap_single_user, init_monkeypatches, initialize_leap_provider from pixelated.config.services import ServicesFactory, SingleUserServicesFactory from pixelated.config.site import PixelatedSite -from pixelated.resources.auth import LeapPasswordChecker, PixelatedRealm, PixelatedAuthSessionWrapper, SessionChecker +from pixelated.resources.auth import PixelatedRealm, PixelatedAuthSessionWrapper, SessionChecker from pixelated.resources.login_resource import LoginResource from pixelated.resources.root_resource import RootResource @@ -152,12 +152,11 @@ def _setup_multi_user(args, root_resource, services_factory): return protected_resource -def set_up_protected_resources(root_resource, provider, services_factory, checker=None, banner=None, authenticator=None): - checker = checker or LeapPasswordChecker(provider) +def set_up_protected_resources(root_resource, provider, services_factory, banner=None, authenticator=None): session_checker = SessionChecker(services_factory) realm = PixelatedRealm() - _portal = portal.Portal(realm, [checker, session_checker, AllowAnonymousAccess()]) + _portal = portal.Portal(realm, [session_checker, AllowAnonymousAccess()]) anonymous_resource = LoginResource(services_factory, provider, disclaimer_banner=banner, authenticator=authenticator) protected_resource = PixelatedAuthSessionWrapper(_portal, root_resource, anonymous_resource, []) -- cgit v1.2.3