summaryrefslogtreecommitdiff
path: root/service/pixelated/application.py
diff options
context:
space:
mode:
authorNavaL <ayoyo@thoughtworks.com>2016-10-28 17:18:59 +0200
committerNavaL <ayoyo@thoughtworks.com>2016-10-28 18:05:39 +0200
commit9209525c5e88e4314711359b4e9fa42d6958403d (patch)
treea630187bac51920c4214247772fd5bad67980825 /service/pixelated/application.py
parent701d2baa3a2e923e1718ef5b9cacc78713cb9649 (diff)
removing obsolete Leap_password_checker #795
Diffstat (limited to 'service/pixelated/application.py')
-rw-r--r--service/pixelated/application.py9
1 files changed, 4 insertions, 5 deletions
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, [])