diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-03-02 00:41:39 -0400 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-03-02 00:41:39 -0400 |
| commit | 13b4a2a7af44589d61200d615273bd9385921a70 (patch) | |
| tree | 517a230aa09ed68a512ca25f8a7fa6445ff71a6c | |
| parent | 76283a15aeccdd8b7eb233c9946b800865e99c5e (diff) | |
allow to notify multiple hooks
| -rw-r--r-- | src/leap/bonafide/service.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/leap/bonafide/service.py b/src/leap/bonafide/service.py index 2548928..166127b 100644 --- a/src/leap/bonafide/service.py +++ b/src/leap/bonafide/service.py @@ -18,8 +18,8 @@ """ Bonafide Service. """ - import os +from collections import defaultdict from leap.bonafide._protocol import BonafideProtocol @@ -35,19 +35,21 @@ class BonafideService(service.Service): def __init__(self, basedir='~/.config/leap'): self._bonafide = BonafideProtocol() self._basedir = os.path.expanduser(basedir) - self.service_hooks = {} + self.service_hooks = defaultdict(list) # XXX this is a quick hack to get a ref # to the latest authenticated user. self._active_user = None def register_hook(self, kind, trigger): - self.service_hooks[kind] = trigger + log.msg("Registering hook %s->%s" % (kind, trigger)) + self.service_hooks[kind].append(trigger) - def get_hooked_service(self, kind): + def get_hooked_services(self, kind): hooks = self.service_hooks if kind in hooks: - return self.get_sibling_service(hooks[kind]) + names = hooks[kind] + return [self.get_sibling_service(name) for name in names] def get_sibling_service(self, kind): return self.parent.getServiceNamed(kind) @@ -62,9 +64,9 @@ class BonafideService(service.Service): def notify_passphrase_entry(username, password): this_hook = 'on_passphrase_entry' - hooked_service = self.get_hooked_service(this_hook) - if hooked_service: - hooked_service.notify_hook( + hooked_services = self.get_hooked_services(this_hook) + for service in hooked_services: + service.notify_hook( this_hook, username=username, password=password) def notify_bonafide_auth_hook(result): @@ -74,9 +76,9 @@ class BonafideService(service.Service): this_hook = 'on_bonafide_auth' token, uuid = result - hooked_service = self.get_hooked_service(this_hook) - if hooked_service: - hooked_service.notify_hook( + hooked_services = self.get_hooked_services(this_hook) + for service in hooked_services: + service.notify_hook( this_hook, username=username, token=token, uuid=uuid, password=password) @@ -93,8 +95,8 @@ class BonafideService(service.Service): d = self._bonafide.do_authenticate(username, password) d.addCallback(notify_bonafide_auth_hook) - d.addCallback(lambda response: '[ SRP TOKEN: %s ] [ UUID: %s ]' % - (response[0], response[1])) + d.addCallback(lambda response: { + 'srp_token': response[0], 'uuid': response[1]}) return d def do_signup(self, username, password): |