summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoald de Vries <rdevries@thoughtworks.com>2016-10-05 17:18:35 -0300
committerRoald de Vries <rdevries@thoughtworks.com>2016-10-05 17:18:35 -0300
commit7c42ffabe06f11bca3a0458ab34ee9d8ec3cc74b (patch)
tree8d1b1f9d9608c9a958b26a681bbdcbdd36c04314
parent8fa81ff3b2cf0422098395ec9918d5b547fbbca5 (diff)
Revert "remove pixelated realm's init parameters"
This reverts commit 8fa81ff3b2cf0422098395ec9918d5b547fbbca5.
-rw-r--r--service/pixelated/application.py2
-rw-r--r--service/pixelated/resources/auth.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/service/pixelated/application.py b/service/pixelated/application.py
index 7e83299a..15155386 100644
--- a/service/pixelated/application.py
+++ b/service/pixelated/application.py
@@ -174,7 +174,7 @@ def set_up_protected_resources(root_resource, provider, services_factory, checke
session_checker = SessionChecker(services_factory)
anonymous_resource = LoginResource(services_factory, disclaimer_banner=banner)
- realm = PixelatedRealm()
+ realm = PixelatedRealm(root_resource, anonymous_resource)
_portal = portal.Portal(realm, [checker, session_checker, AllowAnonymousAccess()])
protected_resource = PixelatedAuthSessionWrapper(_portal, root_resource, anonymous_resource, [])
diff --git a/service/pixelated/resources/auth.py b/service/pixelated/resources/auth.py
index a9297b30..66aac4e5 100644
--- a/service/pixelated/resources/auth.py
+++ b/service/pixelated/resources/auth.py
@@ -88,6 +88,10 @@ class SessionChecker(object):
class PixelatedRealm(object):
implements(portal.IRealm)
+ def __init__(self, root_resource, anonymous_resource):
+ self._root_resource = root_resource
+ self._anonymous_resource = anonymous_resource
+
def requestAvatar(self, avatarId, mind, *interfaces):
if IResource in interfaces:
return IResource, avatarId, lambda: None